rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix kubernetesVersion references

This commit is contained in:
Vincent Fiduccia 2021-02-02 16:27:18 -07:00
parent e5797ded25
commit aa051feadd
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
edit/cis.cattle.io.clusterscan.vue
View File

@ -119,13 +119,17 @@ export default {
if (name.includes(':')) { if (name.includes(':')) {
const pairs = name.split('\n'); const pairs = name.split('\n');
const clusterVersion = this.currentCluster.kubernetesVersion; const clusterVersion = this.currentCluster.kubernetesVersionDisplay;
pairs.forEach((pair) => { pairs.forEach((pair) => {
const version = (pair.match(/[<>=]+[-._a-zA-Z0-9]+/) || [])[0]; const version = (pair.match(/[<>=]+[-._a-zA-Z0-9]+/) || [])[0];
if (semver.satisfies(clusterVersion, version)) { try {
name = pair.replace(/[<>=]+[-._a-zA-Z0-9]+: /, ''); if (semver.satisfies(clusterVersion, version)) {
name = pair.replace(/[<>=]+[-._a-zA-Z0-9]+: /, '');
}
} catch (e) {
// Ignore entries with invalid semver
} }
}); });
} }
@ -189,22 +193,27 @@ export default {
methods: { methods: {
validateBenchmark(benchmark, currentCluster) { validateBenchmark(benchmark, currentCluster) {
const clusterVersion = currentCluster.kubernetesVersion;
if (!!benchmark?.spec?.clusterProvider) { if (!!benchmark?.spec?.clusterProvider) {
if ( benchmark?.spec?.clusterProvider !== currentCluster.status.provider) { if ( benchmark?.spec?.clusterProvider !== currentCluster.status.provider) {
return false; return false;
} }
} }
if (benchmark?.spec?.minKubernetesVersion) {
if (semver.gt(benchmark?.spec?.minKubernetesVersion, clusterVersion)) { try {
return false; const clusterVersion = currentCluster.kubernetesVersionDisplay;
if (benchmark?.spec?.minKubernetesVersion) {
if (semver.gt(benchmark?.spec?.minKubernetesVersion, clusterVersion)) {
return false;
}
} }
} if (benchmark?.spec?.maxKubernetesVersion) {
if (benchmark?.spec?.maxKubernetesVersion) { if (semver.gt(clusterVersion, benchmark?.spec?.maxKubernetesVersion)) {
if (semver.gt(clusterVersion, benchmark?.spec?.maxKubernetesVersion)) { return false;
return false; }
} }
} catch (e) {
// Ignore error if something is invalid semver
} }
return true; return true;

32
edit/cis.cattle.io.clusterscanprofile.vue
View File

@ -74,23 +74,29 @@ export default {
// filter benchmarks by spec.clusterProvider and kubernetes min/max version // filter benchmarks by spec.clusterProvider and kubernetes min/max version
// include benchmarks with no clusterProvider defined // include benchmarks with no clusterProvider defined
validateBenchmark(benchmark) { validateBenchmark(benchmark) {
const clusterVersion = this.currentCluster.kubernetesVersion;
if (!!benchmark?.spec?.clusterProvider) { if (!!benchmark?.spec?.clusterProvider) {
return benchmark?.spec?.clusterProvider === this.provider; return benchmark?.spec?.clusterProvider === this.provider;
} }
if (benchmark?.spec?.minKubernetesVersion) {
if (semver.gt(benchmark?.spec?.minKubernetesVersion, clusterVersion)) {
return false;
}
}
if (benchmark?.spec?.maxKubernetesVersion) {
if (semver.gt(clusterVersion, benchmark?.spec?.maxKubernetesVersion)) {
return false;
}
}
return true; try {
const clusterVersion = this.currentCluster.kubernetesVersionDisplay;
if (benchmark?.spec?.minKubernetesVersion) {
if (semver.gt(benchmark?.spec?.minKubernetesVersion, clusterVersion)) {
return false;
}
}
if (benchmark?.spec?.maxKubernetesVersion) {
if (semver.gt(clusterVersion, benchmark?.spec?.maxKubernetesVersion)) {
return false;
}
}
return true;
} catch (e) {
// If a version doesn't parse, show it
return true;
}
} }
} }
}; };