Merge branch 'dev-v2.9' into fix-grafana-image-renderer-template

rancher · Oct 17, 2024 · 6c45909 · 6c45909
2 parents cb290a9 + 01396eb
commit 6c45909
Show file tree

Hide file tree

Showing 63 changed files with 21 additions and 21 deletions.
diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0-rc.1.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0-rc.1.tgz
diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0.tgz
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-6.3.0-rc.1.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-6.3.0-rc.1.tgz
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-6.3.0.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-6.3.0.tgz
diff --git a/...r-cis-benchmark-crd/6.3.0-rc.1/Chart.yaml → ...ancher-cis-benchmark-crd/6.3.0/Chart.yaml b/...r-cis-benchmark-crd/6.3.0-rc.1/Chart.yaml → ...ancher-cis-benchmark-crd/6.3.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: 6.3.0-rc.1
+version: 6.3.0
diff --git a/...er-cis-benchmark-crd/6.3.0-rc.1/README.md → ...rancher-cis-benchmark-crd/6.3.0/README.md b/...er-cis-benchmark-crd/6.3.0-rc.1/README.md → ...rancher-cis-benchmark-crd/6.3.0/README.md
diff --git a/...crd/6.3.0-rc.1/templates/clusterscan.yaml → ...mark-crd/6.3.0/templates/clusterscan.yaml b/...crd/6.3.0-rc.1/templates/clusterscan.yaml → ...mark-crd/6.3.0/templates/clusterscan.yaml
diff --git a/...-rc.1/templates/clusterscanbenchmark.yaml → ...6.3.0/templates/clusterscanbenchmark.yaml b/...-rc.1/templates/clusterscanbenchmark.yaml → ...6.3.0/templates/clusterscanbenchmark.yaml
diff --git a/....0-rc.1/templates/clusterscanprofile.yaml → ...d/6.3.0/templates/clusterscanprofile.yaml b/....0-rc.1/templates/clusterscanprofile.yaml → ...d/6.3.0/templates/clusterscanprofile.yaml
diff --git a/...3.0-rc.1/templates/clusterscanreport.yaml → ...rd/6.3.0/templates/clusterscanreport.yaml b/...3.0-rc.1/templates/clusterscanreport.yaml → ...rd/6.3.0/templates/clusterscanreport.yaml
diff --git a/...ncher-cis-benchmark/6.3.0-rc.1/Chart.yaml → ...ts/rancher-cis-benchmark/6.3.0/Chart.yaml b/...ncher-cis-benchmark/6.3.0-rc.1/Chart.yaml → ...ts/rancher-cis-benchmark/6.3.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: v6.3.0-rc.1
+appVersion: v6.3.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: 6.3.0-rc.1
+version: 6.3.0
diff --git a/...ancher-cis-benchmark/6.3.0-rc.1/README.md → charts/rancher-cis-benchmark/6.3.0/README.md b/...ancher-cis-benchmark/6.3.0-rc.1/README.md → charts/rancher-cis-benchmark/6.3.0/README.md
diff --git a/...er-cis-benchmark/6.3.0-rc.1/app-readme.md → ...rancher-cis-benchmark/6.3.0/app-readme.md b/...er-cis-benchmark/6.3.0-rc.1/app-readme.md → ...rancher-cis-benchmark/6.3.0/app-readme.md
diff --git a/...nchmark/6.3.0-rc.1/templates/_helpers.tpl → ...is-benchmark/6.3.0/templates/_helpers.tpl b/...nchmark/6.3.0-rc.1/templates/_helpers.tpl → ...is-benchmark/6.3.0/templates/_helpers.tpl
diff --git a/...rk/6.3.0-rc.1/templates/alertingrule.yaml → ...nchmark/6.3.0/templates/alertingrule.yaml b/...rk/6.3.0-rc.1/templates/alertingrule.yaml → ...nchmark/6.3.0/templates/alertingrule.yaml
diff --git a/...3.0-rc.1/templates/benchmark-aks-1.0.yaml → ...rk/6.3.0/templates/benchmark-aks-1.0.yaml b/...3.0-rc.1/templates/benchmark-aks-1.0.yaml → ...rk/6.3.0/templates/benchmark-aks-1.0.yaml
diff --git a/...3.0-rc.1/templates/benchmark-cis-1.7.yaml → ...rk/6.3.0/templates/benchmark-cis-1.7.yaml b/...3.0-rc.1/templates/benchmark-cis-1.7.yaml → ...rk/6.3.0/templates/benchmark-cis-1.7.yaml
diff --git a/...3.0-rc.1/templates/benchmark-cis-1.8.yaml → ...rk/6.3.0/templates/benchmark-cis-1.8.yaml b/...3.0-rc.1/templates/benchmark-cis-1.8.yaml → ...rk/6.3.0/templates/benchmark-cis-1.8.yaml
diff --git a/...0-rc.1/templates/benchmark-eks-1.2.0.yaml → .../6.3.0/templates/benchmark-eks-1.2.0.yaml b/...0-rc.1/templates/benchmark-eks-1.2.0.yaml → .../6.3.0/templates/benchmark-eks-1.2.0.yaml
diff --git a/...0-rc.1/templates/benchmark-gke-1.2.0.yaml → .../6.3.0/templates/benchmark-gke-1.2.0.yaml b/...0-rc.1/templates/benchmark-gke-1.2.0.yaml → .../6.3.0/templates/benchmark-gke-1.2.0.yaml
diff --git a/...lates/benchmark-k3s-cis-1.7-hardened.yaml → ...lates/benchmark-k3s-cis-1.7-hardened.yaml b/...lates/benchmark-k3s-cis-1.7-hardened.yaml → ...lates/benchmark-k3s-cis-1.7-hardened.yaml
diff --git a/...tes/benchmark-k3s-cis-1.7-permissive.yaml → ...tes/benchmark-k3s-cis-1.7-permissive.yaml b/...tes/benchmark-k3s-cis-1.7-permissive.yaml → ...tes/benchmark-k3s-cis-1.7-permissive.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
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
diff --git a/...lates/benchmark-rke-cis-1.7-hardened.yaml → ...lates/benchmark-rke-cis-1.7-hardened.yaml b/...lates/benchmark-rke-cis-1.7-hardened.yaml → ...lates/benchmark-rke-cis-1.7-hardened.yaml
diff --git a/...tes/benchmark-rke-cis-1.7-permissive.yaml → ...tes/benchmark-rke-cis-1.7-permissive.yaml b/...tes/benchmark-rke-cis-1.7-permissive.yaml → ...tes/benchmark-rke-cis-1.7-permissive.yaml
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.7-hardened.yaml → ...ates/benchmark-rke2-cis-1.7-hardened.yaml b/...ates/benchmark-rke2-cis-1.7-hardened.yaml → ...ates/benchmark-rke2-cis-1.7-hardened.yaml
diff --git a/...es/benchmark-rke2-cis-1.7-permissive.yaml → ...es/benchmark-rke2-cis-1.7-permissive.yaml b/...es/benchmark-rke2-cis-1.7-permissive.yaml → ...es/benchmark-rke2-cis-1.7-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/...hmark/6.3.0-rc.1/templates/cis-roles.yaml → ...-benchmark/6.3.0/templates/cis-roles.yaml b/...hmark/6.3.0-rc.1/templates/cis-roles.yaml → ...-benchmark/6.3.0/templates/cis-roles.yaml
diff --git a/...hmark/6.3.0-rc.1/templates/configmap.yaml → ...-benchmark/6.3.0/templates/configmap.yaml b/...hmark/6.3.0-rc.1/templates/configmap.yaml → ...-benchmark/6.3.0/templates/configmap.yaml
diff --git a/...mark/6.3.0-rc.1/templates/deployment.yaml → ...benchmark/6.3.0/templates/deployment.yaml b/...mark/6.3.0-rc.1/templates/deployment.yaml → ...benchmark/6.3.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/...-benchmark/6.3.0-rc.1/templates/rbac.yaml → ...r-cis-benchmark/6.3.0/templates/rbac.yaml b/...-benchmark/6.3.0-rc.1/templates/rbac.yaml → ...r-cis-benchmark/6.3.0/templates/rbac.yaml
diff --git a/...0-rc.1/templates/scanprofile-cis-1.7.yaml → .../6.3.0/templates/scanprofile-cis-1.7.yaml b/...0-rc.1/templates/scanprofile-cis-1.7.yaml → .../6.3.0/templates/scanprofile-cis-1.7.yaml
diff --git a/...0-rc.1/templates/scanprofile-cis-1.8.yaml → .../6.3.0/templates/scanprofile-cis-1.8.yaml b/...0-rc.1/templates/scanprofile-cis-1.8.yaml → .../6.3.0/templates/scanprofile-cis-1.8.yaml
diff --git a/...ates/scanprofile-k3s-cis-1.7-hardened.yml → ...ates/scanprofile-k3s-cis-1.7-hardened.yml b/...ates/scanprofile-k3s-cis-1.7-hardened.yml → ...ates/scanprofile-k3s-cis-1.7-hardened.yml
diff --git a/...es/scanprofile-k3s-cis-1.7-permissive.yml → ...es/scanprofile-k3s-cis-1.7-permissive.yml b/...es/scanprofile-k3s-cis-1.7-permissive.yml → ...es/scanprofile-k3s-cis-1.7-permissive.yml
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/...mplates/scanprofile-rke-1.7-hardened.yaml → ...mplates/scanprofile-rke-1.7-hardened.yaml b/...mplates/scanprofile-rke-1.7-hardened.yaml → ...mplates/scanprofile-rke-1.7-hardened.yaml
diff --git a/...lates/scanprofile-rke-1.7-permissive.yaml → ...lates/scanprofile-rke-1.7-permissive.yaml b/...lates/scanprofile-rke-1.7-permissive.yaml → ...lates/scanprofile-rke-1.7-permissive.yaml
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.7-hardened.yml → ...tes/scanprofile-rke2-cis-1.7-hardened.yml b/...tes/scanprofile-rke2-cis-1.7-hardened.yml → ...tes/scanprofile-rke2-cis-1.7-hardened.yml
diff --git a/...s/scanprofile-rke2-cis-1.7-permissive.yml → ...s/scanprofile-rke2-cis-1.7-permissive.yml b/...s/scanprofile-rke2-cis-1.7-permissive.yml → ...s/scanprofile-rke2-cis-1.7-permissive.yml
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/...k/6.3.0-rc.1/templates/scanprofileaks.yml → ...chmark/6.3.0/templates/scanprofileaks.yml b/...k/6.3.0-rc.1/templates/scanprofileaks.yml → ...chmark/6.3.0/templates/scanprofileaks.yml
diff --git a/...k/6.3.0-rc.1/templates/scanprofileeks.yml → ...chmark/6.3.0/templates/scanprofileeks.yml b/...k/6.3.0-rc.1/templates/scanprofileeks.yml → ...chmark/6.3.0/templates/scanprofileeks.yml
diff --git a/...k/6.3.0-rc.1/templates/scanprofilegke.yml → ...chmark/6.3.0/templates/scanprofilegke.yml b/...k/6.3.0-rc.1/templates/scanprofilegke.yml → ...chmark/6.3.0/templates/scanprofilegke.yml
diff --git a/.../6.3.0-rc.1/templates/serviceaccount.yaml → ...hmark/6.3.0/templates/serviceaccount.yaml b/.../6.3.0-rc.1/templates/serviceaccount.yaml → ...hmark/6.3.0/templates/serviceaccount.yaml
diff --git a/...-rc.1/templates/validate-install-crd.yaml → ...6.3.0/templates/validate-install-crd.yaml b/...-rc.1/templates/validate-install-crd.yaml → ...6.3.0/templates/validate-install-crd.yaml
diff --git a/...cher-cis-benchmark/6.3.0-rc.1/values.yaml → ...s/rancher-cis-benchmark/6.3.0/values.yaml b/...cher-cis-benchmark/6.3.0-rc.1/values.yaml → ...s/rancher-cis-benchmark/6.3.0/values.yaml
@@ -5,10 +5,10 @@
 image:
   cisoperator:
     repository: rancher/cis-operator
-    tag: v1.0.16-rc.1
+    tag: v1.0.16
   securityScan:
     repository: rancher/security-scan
-    tag: v0.2.18-rc.1
+    tag: v0.2.18
   sonobuoy:
     repository: rancher/mirrored-sonobuoy-sonobuoy
     tag: v0.57.2

diff --git a/index.yaml b/index.yaml
@@ -12152,18 +12152,18 @@ entries:
       catalog.cattle.io/type: cluster-tool
       catalog.cattle.io/ui-component: rancher-cis-benchmark
     apiVersion: v1
-    appVersion: v6.3.0-rc.1
-    created: "2024-09-30T16:19:07.511576489+05:30"
+    appVersion: v6.3.0
+    created: "2024-10-14T17:27:30.631446002+05:30"
     description: The cis-operator enables running CIS benchmark security scans on
       a kubernetes cluster
-    digest: 7e59febe5b4765abb7727d4047aada5f55b2a160200d354df192cfafab5b8237
+    digest: 5cad14d53ef411eb7d62faeba657fbfa8b3677b9fc7801c1db4650730bb46ec4
     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-6.3.0-rc.1.tgz
-    version: 6.3.0-rc.1
+    - assets/rancher-cis-benchmark/rancher-cis-benchmark-6.3.0.tgz
+    version: 6.3.0
   - annotations:
       catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
       catalog.cattle.io/certified: rancher
@@ -12926,14 +12926,14 @@ entries:
       catalog.cattle.io/namespace: cis-operator-system
       catalog.cattle.io/release-name: rancher-cis-benchmark-crd
     apiVersion: v1
-    created: "2024-09-30T16:19:07.522384496+05:30"
+    created: "2024-10-14T17:27:30.646562934+05:30"
     description: Installs the CRDs for rancher-cis-benchmark.
-    digest: e831bebd97bc96825a7bc624ec5a8b385c13addf020bad3d80c4df90b62056b2
+    digest: ba986d43d7490886d7757e3adc8a5fabfdbd7db9c01ae40c4f67eeb75599cb1f
     name: rancher-cis-benchmark-crd
     type: application
     urls:
-    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0-rc.1.tgz
-    version: 6.3.0-rc.1
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-6.3.0.tgz
+    version: 6.3.0
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

diff --git a/packages/rancher-cis-benchmark/charts/Chart.yaml b/packages/rancher-cis-benchmark/charts/Chart.yaml
@@ -12,11 +12,11 @@ annotations:
   catalog.cattle.io/type: cluster-tool
   catalog.cattle.io/ui-component: rancher-cis-benchmark
 apiVersion: v1
-appVersion: v6.3.0-rc.1
+appVersion: v6.3.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: 6.3.0-rc.1
+version: 6.3.0
diff --git 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.16-rc.1
+    tag: v1.0.16
   securityScan:
     repository: rancher/security-scan
-    tag: v0.2.18-rc.1
+    tag: v0.2.18
   sonobuoy:
     repository: rancher/mirrored-sonobuoy-sonobuoy
     tag: v0.57.2

diff --git a/packages/rancher-cis-benchmark/package.yaml b/packages/rancher-cis-benchmark/package.yaml
@@ -1,5 +1,5 @@
 url: local
-version: 6.3.0-rc.1
+version: 6.3.0
 additionalCharts:
   - workingDir: charts-crd
     crdOptions:

diff --git a/release.yaml b/release.yaml
@@ -34,9 +34,9 @@ neuvector:
 neuvector-crd:
   - 103.0.6+up2.8.0
 rancher-cis-benchmark:
-  - 6.3.0-rc.1
+  - 6.3.0
 rancher-cis-benchmark-crd:
-  - 6.3.0-rc.1
+  - 6.3.0
 rancher-logging:
   - 104.1.2-rc.1+up4.8.0
 rancher-logging-crd: