update version in benchmark,remove 1.5 scanprofile

packages/rancher-cis-benchmark/charts/Chart.yaml

@@ -7,7 +7,7 @@ annotations:
   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 < 2.7.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
   catalog.cattle.io/release-name: rancher-cis-benchmark
   catalog.cattle.io/type: cluster-tool
   catalog.cattle.io/ui-component: rancher-cis-benchmark

packages/rancher-cis-benchmark/charts/templates/benchmark-cis-1.20.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: ""
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-cis-1.23.yaml

@@ -5,4 +5,4 @@ metadata:
   name: cis-1.23
 spec:
   clusterProvider: ""
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-cis-1.5.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: ""
   minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-cis-1.6.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: ""
   minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.20-hardened.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: k3s
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.20-permissive.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: k3s
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.23-hardened.yaml

@@ -5,4 +5,4 @@ metadata:
   name: k3s-cis-1.23-hardened
 spec:
   clusterProvider: k3s
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.23-permissive.yaml

@@ -5,4 +5,4 @@ metadata:
   name: k3s-cis-1.23-permissive
 spec:
   clusterProvider: k3s
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.6-hardened.yaml

@@ -5,4 +5,5 @@ metadata:
   name: k3s-cis-1.6-hardened
 spec:
   clusterProvider: k3s
-  minKubernetesVersion: "1.20.5"
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-k3s-cis-1.6-permissive.yaml

@@ -5,4 +5,5 @@ metadata:
   name: k3s-cis-1.6-permissive
 spec:
   clusterProvider: k3s
-  minKubernetesVersion: "1.20.5"
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.20-hardened.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.20-permissive.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.23-hardened.yaml

@@ -5,4 +5,4 @@ metadata:
   name: rke-cis-1.23-hardened
 spec:
   clusterProvider: rke
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.23-permissive.yaml

@@ -5,4 +5,4 @@ metadata:
   name: rke-cis-1.23-permissive
 spec:
   clusterProvider: rke
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.5-hardened.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.5-permissive.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.6-hardened.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke-cis-1.6-permissive.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke
   minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.20-hardened.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke2
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.20-permissive.yaml

@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: rke2
   minKubernetesVersion: "1.19.0"
+  maxKubernetesVersion: "1.21.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.23-hardened.yaml

@@ -5,4 +5,4 @@ metadata:
   name: rke2-cis-1.23-hardened
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.23-permissive.yaml

@@ -5,4 +5,4 @@ metadata:
   name: rke2-cis-1.23-permissive
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.21.0"
+  minKubernetesVersion: "1.22.0"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.5-hardened.yaml

@@ -5,4 +5,5 @@ metadata:
   name: rke2-cis-1.5-hardened
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.18.0"
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.5-permissive.yaml

@@ -5,4 +5,5 @@ metadata:
   name: rke2-cis-1.5-permissive
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.18.0"
+  minKubernetesVersion: "1.15.0"
+  maxKubernetesVersion: "1.15.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.6-hardened.yaml

@@ -5,4 +5,5 @@ metadata:
   name: rke2-cis-1.6-hardened
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.20.5"
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/benchmark-rke2-cis-1.6-permissive.yaml

@@ -5,4 +5,5 @@ metadata:
   name: rke2-cis-1.6-permissive
 spec:
   clusterProvider: rke2
-  minKubernetesVersion: "1.20.5"
+  minKubernetesVersion: "1.16.0"
+  maxKubernetesVersion: "1.18.x"

packages/rancher-cis-benchmark/charts/templates/scanprofile-cis-1.5.yml

@@ -1,9 +0,0 @@
----
-apiVersion: cis.cattle.io/v1
-kind: ClusterScanProfile
-metadata:
-  name: cis-1.5-profile
-  annotations:
-    clusterscanprofile.cis.cattle.io/builtin: "true"
-spec:
-  benchmarkVersion: cis-1.5

packages/rancher-cis-benchmark/charts/templates/scanprofile-rke-1.5-hardened.yml

@@ -1,9 +0,0 @@
----
-apiVersion: cis.cattle.io/v1
-kind: ClusterScanProfile
-metadata:
-  name: rke-profile-hardened-1.5
-  annotations:
-    clusterscanprofile.cis.cattle.io/builtin: "true"
-spec:
-  benchmarkVersion: rke-cis-1.5-hardened

packages/rancher-cis-benchmark/charts/templates/scanprofile-rke-1.5-permissive.yml

@@ -1,9 +0,0 @@
----
-apiVersion: cis.cattle.io/v1
-kind: ClusterScanProfile
-metadata:
-  name: rke-profile-permissive-1.5
-  annotations:
-    clusterscanprofile.cis.cattle.io/builtin: "true"
-spec:
-  benchmarkVersion: rke-cis-1.5-permissive

packages/rancher-cis-benchmark/charts/templates/scanprofile-rke2-cis-1.5-hardened.yml

@@ -1,9 +0,0 @@
----
-apiVersion: cis.cattle.io/v1
-kind: ClusterScanProfile
-metadata:
-  name: rke2-cis-1.5-profile-hardened
-  annotations:
-    clusterscanprofile.cis.cattle.io/builtin: "true"
-spec:
-  benchmarkVersion: rke2-cis-1.5-hardened

packages/rancher-cis-benchmark/charts/templates/scanprofile-rke2-cis-1.5-permissive.yml

@@ -1,9 +0,0 @@
----
-apiVersion: cis.cattle.io/v1
-kind: ClusterScanProfile
-metadata:
-  name: rke2-cis-1.5-profile-permissive
-  annotations:
-    clusterscanprofile.cis.cattle.io/builtin: "true"
-spec:
-  benchmarkVersion: rke2-cis-1.5-permissive

packages/rancher-cis-benchmark/charts/values.yaml

@@ -8,7 +8,7 @@ image:
     tag: v1.0.9
   securityScan:
     repository: rancher/security-scan
-    tag: v0.2.8
+    tag: v0.2.9-rc1
   sonobuoy:
     repository: rancher/mirrored-sonobuoy-sonobuoy
     tag: v0.56.7

packages/rancher-cis-benchmark/package.yaml

@@ -1,6 +1,5 @@
 url: local
-version: 3.0.0
+version: 3.0.0-rc1
-doNotRelease: true
 additionalCharts:
   - workingDir: charts-crd
     crdOptions:

release.yaml

@@ -14,3 +14,7 @@ rancher-backup-crd:
 - 2.1.4-rc1
 rancher-webhook:
   - 1.0.6+up0.2.7-rc4
+rancher-cis-benchmark:
+  - 3.0.0-rc1
+rancher-cis-benchmark-crd:
+  - 3.0.0-rc1