From 60031da594ce6deb6607afe0310b7583e8efb643 Mon Sep 17 00:00:00 2001 From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com> Date: Tue, 29 Dec 2020 14:10:25 -0700 Subject: [PATCH] rke default profile update --- edit/cis.cattle.io.clusterscan.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/edit/cis.cattle.io.clusterscan.vue b/edit/cis.cattle.io.clusterscan.vue index 3d27b20b3f..66965d6536 100644 --- 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;