Просмотр исходного кода

Merge pull request #657 from porter-dev/0.3.0-job-fe-upgrades

0.3.0 job fe upgrades
jusrhee 5 лет назад
Родитель
Сommit
d774664a5c

+ 23 - 1
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -83,7 +83,7 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
       )
       .then((res) => {
         let image = res.data?.config?.image?.repository;
-        if (image === "porterdev/hello-porter-job") {
+        if (image === "porterdev/hello-porter-job" && !this.state.newestImage) {
           this.setState(
             {
               currentChart: res.data,
@@ -179,8 +179,30 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
     let conf: string;
 
     if (!config) {
+      let values = {};
+
+      console.log("newest image", this.state.newestImage);
+      let imageUrl = this.state.newestImage;
+      let tag = null;
+  
+      if (imageUrl.includes(":")) {
+        let splits = imageUrl.split(":");
+        imageUrl = splits[0];
+        tag = splits[1];
+      } else if (!tag) {
+        tag = "latest";
+      }
+
+      if (imageUrl) {
+        _.set(values, "image.repository", imageUrl);
+        _.set(values, "image.tag", tag);
+      }
+
+      console.log("values before yaml", values)
+
       conf = yaml.dump({
         ...this.state.currentChart.config,
+        ...values,
       });
     } else {
       // Convert dotted keys to nested objects