|
@@ -180,11 +180,9 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
|
|
|
|
|
|
|
|
if (!config) {
|
|
if (!config) {
|
|
|
let values = {};
|
|
let values = {};
|
|
|
-
|
|
|
|
|
- console.log("newest image", this.state.newestImage);
|
|
|
|
|
let imageUrl = this.state.newestImage;
|
|
let imageUrl = this.state.newestImage;
|
|
|
let tag = null;
|
|
let tag = null;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (imageUrl.includes(":")) {
|
|
if (imageUrl.includes(":")) {
|
|
|
let splits = imageUrl.split(":");
|
|
let splits = imageUrl.split(":");
|
|
|
imageUrl = splits[0];
|
|
imageUrl = splits[0];
|
|
@@ -198,8 +196,6 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
|
|
|
_.set(values, "image.tag", tag);
|
|
_.set(values, "image.tag", tag);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- console.log("values before yaml", values)
|
|
|
|
|
-
|
|
|
|
|
conf = yaml.dump({
|
|
conf = yaml.dump({
|
|
|
...this.state.currentChart.config,
|
|
...this.state.currentChart.config,
|
|
|
...values,
|
|
...values,
|
|
@@ -212,10 +208,9 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
|
|
|
_.set(values, key, config[key]);
|
|
_.set(values, key, config[key]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- console.log("newest image", this.state.newestImage);
|
|
|
|
|
let imageUrl = this.state.newestImage;
|
|
let imageUrl = this.state.newestImage;
|
|
|
let tag = null;
|
|
let tag = null;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (imageUrl.includes(":")) {
|
|
if (imageUrl.includes(":")) {
|
|
|
let splits = imageUrl.split(":");
|
|
let splits = imageUrl.split(":");
|
|
|
imageUrl = splits[0];
|
|
imageUrl = splits[0];
|
|
@@ -229,14 +224,11 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
|
|
|
_.set(values, "image.tag", tag);
|
|
_.set(values, "image.tag", tag);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- console.log("values before yaml", values)
|
|
|
|
|
-
|
|
|
|
|
// Weave in preexisting values and convert to yaml
|
|
// Weave in preexisting values and convert to yaml
|
|
|
conf = yaml.dump({
|
|
conf = yaml.dump({
|
|
|
...(this.state.currentChart.config as Object),
|
|
...(this.state.currentChart.config as Object),
|
|
|
...values,
|
|
...values,
|
|
|
});
|
|
});
|
|
|
- console.log("yaml converted", values)
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
api
|
|
api
|
|
@@ -295,7 +287,11 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
|
|
|
return date2.getTime() - date1.getTime();
|
|
return date2.getTime() - date1.getTime();
|
|
|
});
|
|
});
|
|
|
let newestImage = jobs[0]?.spec?.template?.spec?.containers[0]?.image;
|
|
let newestImage = jobs[0]?.spec?.template?.spec?.containers[0]?.image;
|
|
|
- if (newestImage && newestImage !== "porterdev/hello-porter-job" && newestImage !== "porterdev/hello-porter-job:latest") {
|
|
|
|
|
|
|
+ if (
|
|
|
|
|
+ newestImage &&
|
|
|
|
|
+ newestImage !== "porterdev/hello-porter-job" &&
|
|
|
|
|
+ newestImage !== "porterdev/hello-porter-job:latest"
|
|
|
|
|
+ ) {
|
|
|
this.setState({ jobs, newestImage, imageIsPlaceholder: false });
|
|
this.setState({ jobs, newestImage, imageIsPlaceholder: false });
|
|
|
} else {
|
|
} else {
|
|
|
this.setState({ jobs });
|
|
this.setState({ jobs });
|