Merge pull request #2167 from mantis-toboggan-md/release-2.5.4

rke default profile update
rancher · Jan 6, 2021 · 844ae9a · 844ae9a
2 parents 325b065 + 60031da
commit 844ae9a
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/edit/cis.cattle.io.clusterscan.vue b/edit/cis.cattle.io.clusterscan.vue
@@ -115,8 +115,20 @@ export default {
         const profiles = this.defaultConfigMap.data;
         const provider = this.currentCluster.status.provider;
 
-        const name = profiles[provider] || profiles.default;
+        let name = profiles[provider] || profiles.default;
 
+        if (name.includes(':')) {
+          const pairs = name.split('\n');
+          const clusterVersion = this.currentCluster.kubernetesVersion;
+
+          pairs.forEach((pair) => {
+            const version = (pair.match(/[<>=]+[-._a-zA-Z0-9]+/) || [])[0];
+
+            if (semver.satisfies(clusterVersion, version)) {
+              name = pair.replace(/[<>=]+[-._a-zA-Z0-9]+: /, '');
+            }
+          });
+        }
         if (name) {
           const profile = this.allProfiles.find(profile => profile.id === name);
           const benchmarkVersion = profile?.spec?.benchmarkVersion;