Revert "[dev-v2.10] rancher-cis-benchmark 105.1.0+7.1.1 add" (#4830)

rancher · Dec 10, 2024 · 620946e · 620946e
1 parent 53688b8
commit 620946e
Show file tree

Hide file tree

Showing 52 changed files with 59 additions and 20 deletions.
diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.0.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.0.tgz
diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.1.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.1.tgz
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-105.1.0+up7.1.0.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-105.1.0+up7.1.0.tgz
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-105.1.0+up7.1.1.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-105.1.0+up7.1.1.tgz
diff --git a/...-benchmark-crd/105.1.0+up7.1.1/Chart.yaml → ...-benchmark-crd/105.1.0+up7.1.0/Chart.yaml b/...-benchmark-crd/105.1.0+up7.1.1/Chart.yaml → ...-benchmark-crd/105.1.0+up7.1.0/Chart.yaml
@@ -7,4 +7,4 @@ apiVersion: v1
 description: Installs the CRDs for rancher-cis-benchmark.
 name: rancher-cis-benchmark-crd
 type: application
-version: 105.1.0+up7.1.1
+version: 105.1.0+up7.1.0
diff --git a/...s-benchmark-crd/105.1.0+up7.1.1/README.md → ...s-benchmark-crd/105.1.0+up7.1.0/README.md b/...s-benchmark-crd/105.1.0+up7.1.1/README.md → ...s-benchmark-crd/105.1.0+up7.1.0/README.md
diff --git a/...05.1.0+up7.1.1/templates/clusterscan.yaml → ...05.1.0+up7.1.0/templates/clusterscan.yaml b/...05.1.0+up7.1.1/templates/clusterscan.yaml → ...05.1.0+up7.1.0/templates/clusterscan.yaml
diff --git a/...7.1.1/templates/clusterscanbenchmark.yaml → ...7.1.0/templates/clusterscanbenchmark.yaml b/...7.1.1/templates/clusterscanbenchmark.yaml → ...7.1.0/templates/clusterscanbenchmark.yaml
diff --git a/...up7.1.1/templates/clusterscanprofile.yaml → ...up7.1.0/templates/clusterscanprofile.yaml b/...up7.1.1/templates/clusterscanprofile.yaml → ...up7.1.0/templates/clusterscanprofile.yaml
diff --git a/...+up7.1.1/templates/clusterscanreport.yaml → ...+up7.1.0/templates/clusterscanreport.yaml b/...+up7.1.1/templates/clusterscanreport.yaml → ...+up7.1.0/templates/clusterscanreport.yaml
diff --git a/...-cis-benchmark/105.1.0+up7.1.1/Chart.yaml → ...-cis-benchmark/105.1.0+up7.1.0/Chart.yaml b/...-cis-benchmark/105.1.0+up7.1.1/Chart.yaml → ...-cis-benchmark/105.1.0+up7.1.0/Chart.yaml
@@ -12,11 +12,11 @@ annotations:
   catalog.cattle.io/type: cluster-tool
   catalog.cattle.io/ui-component: rancher-cis-benchmark
 apiVersion: v1
-appVersion: v7.1.1
+appVersion: v7.1.0
 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: 105.1.0+up7.1.1
+version: 105.1.0+up7.1.0
diff --git a/...r-cis-benchmark/105.1.0+up7.1.1/README.md → ...r-cis-benchmark/105.1.0+up7.1.0/README.md b/...r-cis-benchmark/105.1.0+up7.1.1/README.md → ...r-cis-benchmark/105.1.0+up7.1.0/README.md
diff --git a/...s-benchmark/105.1.0+up7.1.1/app-readme.md → ...s-benchmark/105.1.0+up7.1.0/app-readme.md b/...s-benchmark/105.1.0+up7.1.1/app-readme.md → ...s-benchmark/105.1.0+up7.1.0/app-readme.md
@@ -18,13 +18,15 @@ This chart installs the following components:
 
 | Source | Kubernetes distribution | scan profile                                                                                                       | Kubernetes versions |
 |--------|-------------------------|--------------------------------------------------------------------------------------------------------------------|---------------------|
-| CIS    | any                     | [cis-1.8](https://github.com/aquasecurity/kube-bench/tree/main/cfg/cis-1.8)                                                         | v1.26+               |
+| CIS    | any                     | [cis-1.9](https://github.com/aquasecurity/kube-bench/tree/main/cfg/cis-1.9)                                                         | v1.27+              |
+| CIS    | any                     | [cis-1.8](https://github.com/aquasecurity/kube-bench/tree/main/cfg/cis-1.8)                                                         | v1.26               |
 | CIS    | rke                     | [rke-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke-cis-1.8-permissive)  | rke1-v1.26+         |
 | CIS    | rke                     | [rke-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke-cis-1.8-hardened)                  | rke1-v1.26+         |
 | CIS    | rke2                    | [rke2-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke2-cis-1.8-permissive) | rke2-v1.26+         |
 | CIS    | rke2                    | [rke2-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke2-cis-1.8-hardened)                 | rke2-v1.26+         |
-| CIS    | k3s                     | [k3s-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-permissive)  | k3s-v1.26+           |
-| CIS    | k3s                     | [k3s-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-hardened)                  | k3s-v1.26+           |
+| CIS    | k3s                     | [k3s-cis-1.9](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.9)                                | k3s-v1.27+          |
+| CIS    | k3s                     | [k3s-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-permissive)  | k3s-v1.26           |
+| CIS    | k3s                     | [k3s-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-hardened)                  | k3s-v1.26           |
 | CIS    | eks                     | [eks-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.2.0)                                                       | eks                 |
 | CIS    | aks                     | [aks-1.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/aks-1.0)                                                         | aks                 |
 | CIS    | gke                     | [gke-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/gke-1.2.0)                                                       | gke-1.20            |

diff --git a/...rk/105.1.0+up7.1.1/templates/_helpers.tpl → ...rk/105.1.0+up7.1.0/templates/_helpers.tpl b/...rk/105.1.0+up7.1.1/templates/_helpers.tpl → ...rk/105.1.0+up7.1.0/templates/_helpers.tpl
diff --git a/...5.1.0+up7.1.1/templates/alertingrule.yaml → ...5.1.0+up7.1.0/templates/alertingrule.yaml b/...5.1.0+up7.1.1/templates/alertingrule.yaml → ...5.1.0+up7.1.0/templates/alertingrule.yaml
diff --git a/...+up7.1.1/templates/benchmark-aks-1.0.yaml → ...+up7.1.0/templates/benchmark-aks-1.0.yaml b/...+up7.1.1/templates/benchmark-aks-1.0.yaml → ...+up7.1.0/templates/benchmark-aks-1.0.yaml
diff --git a/...+up7.1.1/templates/benchmark-cis-1.8.yaml → ...+up7.1.0/templates/benchmark-cis-1.8.yaml b/...+up7.1.1/templates/benchmark-cis-1.8.yaml → ...+up7.1.0/templates/benchmark-cis-1.8.yaml
@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: ""
   minKubernetesVersion: "1.26.0"
+  maxKubernetesVersion: "1.26.x"
diff --git a/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/benchmark-cis-1.9.yaml b/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/benchmark-cis-1.9.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.9
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.27.0"
diff --git a/...p7.1.1/templates/benchmark-eks-1.2.0.yaml → ...p7.1.0/templates/benchmark-eks-1.2.0.yaml b/...p7.1.1/templates/benchmark-eks-1.2.0.yaml → ...p7.1.0/templates/benchmark-eks-1.2.0.yaml
diff --git a/...p7.1.1/templates/benchmark-gke-1.2.0.yaml → ...p7.1.0/templates/benchmark-gke-1.2.0.yaml b/...p7.1.1/templates/benchmark-gke-1.2.0.yaml → ...p7.1.0/templates/benchmark-gke-1.2.0.yaml
diff --git a/...p7.1.1/templates/benchmark-gke-1.6.0.yaml → ...p7.1.0/templates/benchmark-gke-1.6.0.yaml b/...p7.1.1/templates/benchmark-gke-1.6.0.yaml → ...p7.1.0/templates/benchmark-gke-1.6.0.yaml
diff --git a/...lates/benchmark-k3s-cis-1.8-hardened.yaml → ...lates/benchmark-k3s-cis-1.8-hardened.yaml b/...lates/benchmark-k3s-cis-1.8-hardened.yaml → ...lates/benchmark-k3s-cis-1.8-hardened.yaml
@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: k3s
   minKubernetesVersion: "1.26.0"
+  maxKubernetesVersion: "1.26.x"
diff --git a/...tes/benchmark-k3s-cis-1.8-permissive.yaml → ...tes/benchmark-k3s-cis-1.8-permissive.yaml b/...tes/benchmark-k3s-cis-1.8-permissive.yaml → ...tes/benchmark-k3s-cis-1.8-permissive.yaml
@@ -6,3 +6,4 @@ metadata:
 spec:
   clusterProvider: k3s
   minKubernetesVersion: "1.26.0"
+  maxKubernetesVersion: "1.26.x"
diff --git a/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/benchmark-k3s-cis-1.9.yaml b/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/benchmark-k3s-cis-1.9.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.9
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.27.0"
diff --git a/...lates/benchmark-rke-cis-1.8-hardened.yaml → ...lates/benchmark-rke-cis-1.8-hardened.yaml b/...lates/benchmark-rke-cis-1.8-hardened.yaml → ...lates/benchmark-rke-cis-1.8-hardened.yaml
diff --git a/...tes/benchmark-rke-cis-1.8-permissive.yaml → ...tes/benchmark-rke-cis-1.8-permissive.yaml b/...tes/benchmark-rke-cis-1.8-permissive.yaml → ...tes/benchmark-rke-cis-1.8-permissive.yaml
diff --git a/...ates/benchmark-rke2-cis-1.8-hardened.yaml → ...ates/benchmark-rke2-cis-1.8-hardened.yaml b/...ates/benchmark-rke2-cis-1.8-hardened.yaml → ...ates/benchmark-rke2-cis-1.8-hardened.yaml
diff --git a/...es/benchmark-rke2-cis-1.8-permissive.yaml → ...es/benchmark-rke2-cis-1.8-permissive.yaml b/...es/benchmark-rke2-cis-1.8-permissive.yaml → ...es/benchmark-rke2-cis-1.8-permissive.yaml
diff --git a/.../105.1.0+up7.1.1/templates/cis-roles.yaml → .../105.1.0+up7.1.0/templates/cis-roles.yaml b/.../105.1.0+up7.1.1/templates/cis-roles.yaml → .../105.1.0+up7.1.0/templates/cis-roles.yaml
diff --git a/.../105.1.0+up7.1.1/templates/configmap.yaml → .../105.1.0+up7.1.0/templates/configmap.yaml b/.../105.1.0+up7.1.1/templates/configmap.yaml → .../105.1.0+up7.1.0/templates/configmap.yaml
@@ -14,5 +14,5 @@ data:
   eks: "eks-profile"
   gke: "gke-profile-1.6.0"
   aks: "aks-profile"
-  k3s: "k3s-cis-1.8-profile-permissive"
-  default: "cis-1.8-profile"
+  k3s: "k3s-cis-1.9-profile"
+  default: "cis-1.9-profile"
diff --git a/...105.1.0+up7.1.1/templates/deployment.yaml → ...105.1.0+up7.1.0/templates/deployment.yaml b/...105.1.0+up7.1.1/templates/deployment.yaml → ...105.1.0+up7.1.0/templates/deployment.yaml
diff --git a/...1/templates/network_policy_allow_all.yaml → ...0/templates/network_policy_allow_all.yaml b/...1/templates/network_policy_allow_all.yaml → ...0/templates/network_policy_allow_all.yaml
diff --git a/...mplates/patch_default_serviceaccount.yaml → ...mplates/patch_default_serviceaccount.yaml b/...mplates/patch_default_serviceaccount.yaml → ...mplates/patch_default_serviceaccount.yaml
diff --git a/...hmark/105.1.0+up7.1.1/templates/rbac.yaml → ...hmark/105.1.0+up7.1.0/templates/rbac.yaml b/...hmark/105.1.0+up7.1.1/templates/rbac.yaml → ...hmark/105.1.0+up7.1.0/templates/rbac.yaml
diff --git a/...p7.1.1/templates/scanprofile-cis-1.8.yaml → ...p7.1.0/templates/scanprofile-cis-1.8.yaml b/...p7.1.1/templates/scanprofile-cis-1.8.yaml → ...p7.1.0/templates/scanprofile-cis-1.8.yaml
diff --git a/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/scanprofile-cis-1.9.yaml b/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/scanprofile-cis-1.9.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: cis-1.9-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: cis-1.9
diff --git a/...ates/scanprofile-k3s-cis-1.8-hardened.yml → ...ates/scanprofile-k3s-cis-1.8-hardened.yml b/...ates/scanprofile-k3s-cis-1.8-hardened.yml → ...ates/scanprofile-k3s-cis-1.8-hardened.yml
diff --git a/...es/scanprofile-k3s-cis-1.8-permissive.yml → ...es/scanprofile-k3s-cis-1.8-permissive.yml b/...es/scanprofile-k3s-cis-1.8-permissive.yml → ...es/scanprofile-k3s-cis-1.8-permissive.yml
diff --git a/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/scanprofile-k3s-cis-1.9.yaml b/charts/rancher-cis-benchmark/105.1.0+up7.1.0/templates/scanprofile-k3s-cis-1.9.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.9-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.9
diff --git a/...mplates/scanprofile-rke-1.8-hardened.yaml → ...mplates/scanprofile-rke-1.8-hardened.yaml b/...mplates/scanprofile-rke-1.8-hardened.yaml → ...mplates/scanprofile-rke-1.8-hardened.yaml
diff --git a/...lates/scanprofile-rke-1.8-permissive.yaml → ...lates/scanprofile-rke-1.8-permissive.yaml b/...lates/scanprofile-rke-1.8-permissive.yaml → ...lates/scanprofile-rke-1.8-permissive.yaml
diff --git a/...tes/scanprofile-rke2-cis-1.8-hardened.yml → ...tes/scanprofile-rke2-cis-1.8-hardened.yml b/...tes/scanprofile-rke2-cis-1.8-hardened.yml → ...tes/scanprofile-rke2-cis-1.8-hardened.yml
diff --git a/...s/scanprofile-rke2-cis-1.8-permissive.yml → ...s/scanprofile-rke2-cis-1.8-permissive.yml b/...s/scanprofile-rke2-cis-1.8-permissive.yml → ...s/scanprofile-rke2-cis-1.8-permissive.yml
diff --git a/....1.0+up7.1.1/templates/scanprofileaks.yml → ....1.0+up7.1.0/templates/scanprofileaks.yml b/....1.0+up7.1.1/templates/scanprofileaks.yml → ....1.0+up7.1.0/templates/scanprofileaks.yml
diff --git a/....1.0+up7.1.1/templates/scanprofileeks.yml → ....1.0+up7.1.0/templates/scanprofileeks.yml b/....1.0+up7.1.1/templates/scanprofileeks.yml → ....1.0+up7.1.0/templates/scanprofileeks.yml
diff --git a/...p7.1.1/templates/scanprofilegke-1.6.0.yml → ...p7.1.0/templates/scanprofilegke-1.6.0.yml b/...p7.1.1/templates/scanprofilegke-1.6.0.yml → ...p7.1.0/templates/scanprofilegke-1.6.0.yml
diff --git a/....1.0+up7.1.1/templates/scanprofilegke.yml → ....1.0+up7.1.0/templates/scanprofilegke.yml b/....1.0+up7.1.1/templates/scanprofilegke.yml → ....1.0+up7.1.0/templates/scanprofilegke.yml
diff --git a/...1.0+up7.1.1/templates/serviceaccount.yaml → ...1.0+up7.1.0/templates/serviceaccount.yaml b/...1.0+up7.1.1/templates/serviceaccount.yaml → ...1.0+up7.1.0/templates/serviceaccount.yaml
diff --git a/...7.1.1/templates/validate-install-crd.yaml → ...7.1.0/templates/validate-install-crd.yaml b/...7.1.1/templates/validate-install-crd.yaml → ...7.1.0/templates/validate-install-crd.yaml
diff --git a/...cis-benchmark/105.1.0+up7.1.1/values.yaml → ...cis-benchmark/105.1.0+up7.1.0/values.yaml b/...cis-benchmark/105.1.0+up7.1.1/values.yaml → ...cis-benchmark/105.1.0+up7.1.0/values.yaml
@@ -5,7 +5,7 @@
 image:
   cisoperator:
     repository: rancher/cis-operator
-    tag: v1.3.4
+    tag: v1.3.3
   securityScan:
     repository: rancher/security-scan
     tag: v0.5.2

diff --git a/index.yaml b/index.yaml
@@ -10416,18 +10416,18 @@ entries:
       catalog.cattle.io/type: cluster-tool
       catalog.cattle.io/ui-component: rancher-cis-benchmark
     apiVersion: v1
-    appVersion: v7.1.1
-    created: "2024-12-09T22:28:58.096922932+05:30"
+    appVersion: v7.1.0
+    created: "2024-12-05T13:50:46.295552662-03:00"
     description: The cis-operator enables running CIS benchmark security scans on
       a kubernetes cluster
-    digest: 5f7de6f9f8644b95fd3827e67fced6788d3cc315182e99d74b62432ac5b84a32
+    digest: fc6612c0bbcef883967a647a306d80f15ac5cec97d1ec2295853aefb33fd50f5
     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-105.1.0+up7.1.1.tgz
-    version: 105.1.0+up7.1.1
+    - assets/rancher-cis-benchmark/rancher-cis-benchmark-105.1.0+up7.1.0.tgz
+    version: 105.1.0+up7.1.0
   - annotations:
       catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
       catalog.cattle.io/certified: rancher
@@ -11186,14 +11186,14 @@ entries:
       catalog.cattle.io/namespace: cis-operator-system
       catalog.cattle.io/release-name: rancher-cis-benchmark-crd
     apiVersion: v1
-    created: "2024-12-09T22:28:58.143624757+05:30"
+    created: "2024-12-05T13:50:46.332853878-03:00"
     description: Installs the CRDs for rancher-cis-benchmark.
-    digest: 6292c5ab8e39f0902804612ad34b4e48e5d1e93c5f9715805daeb1082983b5cc
+    digest: 764039c94e4f25bd97e46a02edf57a19da551af63b61028150d3b5a5a17c3fdf
     name: rancher-cis-benchmark-crd
     type: application
     urls:
-    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.1.tgz
-    version: 105.1.0+up7.1.1
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-105.1.0+up7.1.0.tgz
+    version: 105.1.0+up7.1.0
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

diff --git a/release.yaml b/release.yaml
@@ -18,9 +18,9 @@ rancher-aks-operator:
 rancher-aks-operator-crd:
   - 105.1.0+up1.10.1-rc.2
 rancher-cis-benchmark:
-  - 105.1.0+up7.1.1
+  - 105.1.0+up7.1.0
 rancher-cis-benchmark-crd:
-  - 105.1.0+up7.1.1
+  - 105.1.0+up7.1.0
 rancher-csp-adapter:
   - 105.0.0+up5.0.1
 rancher-eks-operator: