Merge pull request #1937 from doflamingo721/cis-eks-fix

Bump security-scan image version in CIS-benchmark

charts/rancher-cis-benchmark-crd/2.0.5-rc2/Chart.yaml

@@ -7,4 +7,4 @@ apiVersion: v1
 description: Installs the CRDs for rancher-cis-benchmark.
 name: rancher-cis-benchmark-crd
 type: application
-version: 2.0.5-rc1
+version: 2.0.5-rc2

charts/rancher-cis-benchmark/2.0.5-rc2/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

charts/rancher-cis-benchmark/2.0.5-rc2/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"

charts/rancher-cis-benchmark/2.0.5-rc2/templates/scanprofileeks.yml

@@ -6,4 +6,4 @@ metadata:
   annotations:
     clusterscanprofile.cis.cattle.io/builtin: "true"
 spec:
-  benchmarkVersion: eks-1.0
+  benchmarkVersion: eks-1.0.1

charts/rancher-cis-benchmark/2.0.5-rc2/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

index.yaml

@@ -2480,28 +2480,28 @@ entries:
       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
-    created: "2022-06-03T18:54:28.416733785+05:30"
+    created: "2022-06-23T19:16:31.151561355+05:30"
     description: The cis-operator enables running CIS benchmark security scans on
       a kubernetes cluster
-    digest: 9231bd471d503588fa89924bcf2a27c4df1f8bf0079e2cabae63a9141441925b
+    digest: 54e7f86cbcb73c8168e62908428f301ae0b85fadc6e1a497d76ed5bfaa7556b3
     icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
     keywords:
     - security
     name: rancher-cis-benchmark
     urls:
-    - assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.5-rc1.tgz
+    - assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.5-rc2.tgz
-    version: 2.0.5-rc1
+    version: 2.0.5-rc2
   - annotations:
       catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
       catalog.cattle.io/certified: rancher
@@ -2771,14 +2771,14 @@ entries:
       catalog.cattle.io/namespace: cis-operator-system
       catalog.cattle.io/release-name: rancher-cis-benchmark-crd
     apiVersion: v1
-    created: "2022-06-03T18:54:28.418324636+05:30"
+    created: "2022-06-23T19:16:31.157730516+05:30"
     description: Installs the CRDs for rancher-cis-benchmark.
-    digest: de4e68740a96c6ffb274850cde401dfb499fa998030e384f5cddeec1dab16e22
+    digest: ef8be19aeb29bad889d6326c4cd1f25ae123accc563469a3eb16516a9c0a54af
     name: rancher-cis-benchmark-crd
     type: application
     urls:
-    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.5-rc1.tgz
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.5-rc2.tgz
-    version: 2.0.5-rc1
+    version: 2.0.5-rc2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

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

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"

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
+  benchmarkVersion: eks-1.0.1

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

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:

release.yaml

@@ -19,6 +19,6 @@ rancher-aks-operator-crd:
 rancher-csp-adapter:
 - 1.0.0+up1.0.0-rc1
 rancher-cis-benchmark:
-- 2.0.5-rc1
+- 2.0.5-rc2
 rancher-cis-benchmark-crd:
-- 2.0.5-rc1
+- 2.0.5-rc2