Prechádzať zdrojové kódy

fix for retrieving controllers for a chart deployed on a different namespace, show default tabs when there is no form.yaml in the chart

sunguroku 5 rokov pred
rodič
commit
8cd2847ea5

+ 10 - 4
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx

@@ -108,11 +108,15 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
               resolve(null);
             } else {
               let { form } = res.data;
+              console.log(form)
               resolve(form);
             }
           });
         }
       };
+
+      // resolve with empty data if there is no form.yaml in the files
+      resolve(null)
     });
   }
 
@@ -163,7 +167,6 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
     } = this.state;
     let { currentChart, refreshChart, setSidebar, setCurrentView } = this.props;
     let chart = revisionPreview || currentChart;
-
     switch (currentTab) {
       case 'status': 
         return (
@@ -234,7 +237,6 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
 
   async updateTabs() {
     let formData = await this.getFormData();
-    console.log(formData);
     let tabOptions = [] as any[];
 
     // Generate form tabs if form.yaml exists
@@ -243,7 +245,7 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
         tabOptions.push({ value: '@' + tab.name, label: tab.label, sections: tab.sections });
       });
     }
-
+    console.log('1', tabOptions)
     // Append universal tabs
     tabOptions.push(
       { label: 'Status', value: 'status' },
@@ -251,6 +253,7 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
       { label: 'Chart Overview', value: 'graph' },
       { label: 'Settings', value: 'settings' },
     );
+    console.log('2', tabOptions)
 
     if (this.state.devOpsMode) {
       tabOptions.push(
@@ -259,12 +262,15 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
       );
     }
 
+    console.log('3', tabOptions)
+
     // Filter tabs if previewing an old revision
     if (this.state.revisionPreview) {
       let liveTabs = ['status', 'settings', 'deploy'];
       tabOptions = tabOptions.filter((tab: any) => !liveTabs.includes(tab.value));
     }
-    
+    console.log('4', tabOptions)
+
     this.setState({ tabOptions });
   }
 

+ 1 - 0
server/api/release_handler.go

@@ -297,6 +297,7 @@ func (app *App) HandleGetReleaseControllers(w http.ResponseWriter, r *http.Reque
 	// get current status of each controller
 	// TODO: refactor with type assertion
 	for _, c := range controllers {
+		c.Namespace = form.ReleaseForm.Form.Namespace
 		switch c.Kind {
 		case "Deployment":
 			rc, err := k8sAgent.GetDeployment(c)