Merge pull request #2742 from mantis-toboggan-md/bugfix-monitoring-wi…

…ndows [2.5.8] monitoring - use global.cattle.windows.enabled instead of windowsExporter.enabled
rancher · Apr 26, 2021 · 392e901 · 392e901
2 parents 7ee04f9 + f4e53fe
commit 392e901
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/chart/monitoring/ClusterSelector.vue b/chart/monitoring/ClusterSelector.vue
@@ -82,7 +82,7 @@ const CLUSTER_TYPES = [
     group:      'rke',
     id:         'rke-windows',
     label:      'cluster.provider.rkeWindows',
-    configKeys: ['rkeControllerManager', 'rkeScheduler', 'rkeProxy', 'rkeEtcd', 'windowsExporter'],
+    configKeys: ['rkeControllerManager', 'rkeScheduler', 'rkeProxy', 'rkeEtcd'],
   },
 ];
 
@@ -165,6 +165,16 @@ export default {
         this.$set(this.value.prometheus.prometheusSpec.resources.limits, 'memory', '2500Mi');
         this.$set(this.value.prometheus.prometheusSpec.resources.requests, 'memory', '1750Mi');
       }
+
+      if (clusterType.id === 'rke-windows') {
+        if (!this.value.global.cattle.windows) {
+          this.$set(this.value.global.cattle, 'windows', { enabled: true });
+        } else {
+          this.value.global.cattle.windows.enabled = true;
+        }
+      } else if (oldClusterType && oldClusterType.id === 'rke-windows') {
+        delete this.value.global.cattle.windows;
+      }
     },
   },