From 6929fe59ab1156de69297fb48bd8ae10393033a7 Mon Sep 17 00:00:00 2001 From: Vaishnav Gaikwad Date: Fri, 10 Jun 2022 16:09:31 +0530 Subject: [PATCH] Bump security-scan version New security-scan image has the eks-version fix --- packages/rancher-cis-benchmark/charts/Chart.yaml | 8 ++++---- .../{benchmark-eks-1.0.yaml => benchmark-eks-1.0.1.yaml} | 2 +- .../charts/templates/scanprofileeks.yml | 2 +- packages/rancher-cis-benchmark/charts/values.yaml | 4 ++-- packages/rancher-cis-benchmark/package.yaml | 2 +- release.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename packages/rancher-cis-benchmark/charts/templates/{benchmark-eks-1.0.yaml => benchmark-eks-1.0.1.yaml} (88%) diff --git a/packages/rancher-cis-benchmark/charts/Chart.yaml b/packages/rancher-cis-benchmark/charts/Chart.yaml index 4a59dd32a..3049f3475 100644 --- a/packages/rancher-cis-benchmark/charts/Chart.yaml +++ b/packages/rancher-cis-benchmark/charts/Chart.yaml @@ -2,21 +2,21 @@ annotations: catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: CIS Benchmark - catalog.cattle.io/kube-version: '>=1.16.0-0' + catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.24.0-0' catalog.cattle.io/namespace: cis-operator-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux,windows catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1 - catalog.cattle.io/rancher-version: '>= 2.6.0-0' + catalog.cattle.io/rancher-version: '>= 2.6.0-0 < 2.7.0-0' catalog.cattle.io/release-name: rancher-cis-benchmark catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: rancher-cis-benchmark apiVersion: v1 -appVersion: v2.0.5-rc1 +appVersion: v2.0.5-rc2 description: The cis-operator enables running CIS benchmark security scans on a kubernetes cluster icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg keywords: - security name: rancher-cis-benchmark -version: 2.0.5-rc1 +version: 2.0.5-rc2 diff --git a/packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.yaml b/packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.1.yaml similarity index 88% rename from packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.yaml rename to packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.1.yaml index bd2e32cd3..d1ba9d295 100644 --- a/packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.yaml +++ b/packages/rancher-cis-benchmark/charts/templates/benchmark-eks-1.0.1.yaml @@ -2,7 +2,7 @@ apiVersion: cis.cattle.io/v1 kind: ClusterScanBenchmark metadata: - name: eks-1.0 + name: eks-1.0.1 spec: clusterProvider: eks minKubernetesVersion: "1.15.0" diff --git a/packages/rancher-cis-benchmark/charts/templates/scanprofileeks.yml b/packages/rancher-cis-benchmark/charts/templates/scanprofileeks.yml index 49c7e0246..3b4e34437 100644 --- a/packages/rancher-cis-benchmark/charts/templates/scanprofileeks.yml +++ b/packages/rancher-cis-benchmark/charts/templates/scanprofileeks.yml @@ -6,4 +6,4 @@ metadata: annotations: clusterscanprofile.cis.cattle.io/builtin: "true" spec: - benchmarkVersion: eks-1.0 \ No newline at end of file + benchmarkVersion: eks-1.0.1 \ No newline at end of file diff --git a/packages/rancher-cis-benchmark/charts/values.yaml b/packages/rancher-cis-benchmark/charts/values.yaml index ebe721f3e..8030e6330 100644 --- a/packages/rancher-cis-benchmark/charts/values.yaml +++ b/packages/rancher-cis-benchmark/charts/values.yaml @@ -5,10 +5,10 @@ image: cisoperator: repository: rancher/cis-operator - tag: v1.0.8 + tag: v1.0.9 securityScan: repository: rancher/security-scan - tag: v0.2.7 + tag: v0.2.8-rc1 sonobuoy: repository: rancher/mirrored-sonobuoy-sonobuoy tag: v0.53.2 diff --git a/packages/rancher-cis-benchmark/package.yaml b/packages/rancher-cis-benchmark/package.yaml index ff8f9e251..8104ee8af 100644 --- a/packages/rancher-cis-benchmark/package.yaml +++ b/packages/rancher-cis-benchmark/package.yaml @@ -1,5 +1,5 @@ url: local -version: 2.0.5-rc1 +version: 2.0.5-rc2 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/release.yaml b/release.yaml index 26f48cac1..25a56fa8e 100644 --- a/release.yaml +++ b/release.yaml @@ -20,6 +20,6 @@ rancher-csp-adapter: - 0.1.0+up0.1.0-rc8 - 0.1.0+up0.1.0-rc7 rancher-cis-benchmark: -- 2.0.5-rc1 +- 2.0.5-rc2 rancher-cis-benchmark-crd: -- 2.0.5-rc1 +- 2.0.5-rc2