(dev-v2.6-archive) Fix/issue 32301 (#1247)

* cis 1.0.6 1.22 fixes

* make charts

(partially cherry picked from commit 0e089425ab)

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

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.0.5
 description: The cis-operator enables running CIS benchmark security scans on a kubernetes cluster
 name: rancher-cis-benchmark
-version: 1.0.5
+version: 1.0.6
 icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
 keywords:
   - security

packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml

@@ -1,44 +1,46 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusterscans.cis.cattle.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.lastRunScanProfileName
-    name: ClusterScanProfile
-    type: string
-  - JSONPath: .status.summary.total
-    name: Total
-    type: string
-  - JSONPath: .status.summary.pass
-    name: Pass
-    type: string
-  - JSONPath: .status.summary.fail
-    name: Fail
-    type: string
-  - JSONPath: .status.summary.skip
-    name: Skip
-    type: string
-  - JSONPath: .status.summary.warn
-    name: Warn
-    type: string
-  - JSONPath: .status.summary.notApplicable
-    name: Not Applicable
-    type: string
-  - JSONPath: .status.lastRunTimestamp
-    name: LastRunTimestamp
-    type: string
-  - JSONPath: .spec.scheduledScanConfig.cronSchedule
-    name: CronSchedule
-    type: string
   group: cis.cattle.io
   names:
     kind: ClusterScan
     plural: clusterscans
   scope: Cluster
-  subresources:
-    status: {}
-  validation:
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .status.lastRunScanProfileName
+      name: ClusterScanProfile
+      type: string
+    - jsonPath: .status.summary.total
+      name: Total
+      type: string
+    - jsonPath: .status.summary.pass
+      name: Pass
+      type: string
+    - jsonPath: .status.summary.fail
+      name: Fail
+      type: string
+    - jsonPath: .status.summary.skip
+      name: Skip
+      type: string
+    - jsonPath: .status.summary.warn
+      name: Warn
+      type: string
+    - jsonPath: .status.summary.notApplicable
+      name: Not Applicable
+      type: string
+    - jsonPath: .status.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.scheduledScanConfig.cronSchedule
+      name: CronSchedule
+      type: string
+    schema:
       openAPIV3Schema:
         properties:
           spec:
@@ -142,8 +144,3 @@ spec:
                 type: object
             type: object
         type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true

packages/rancher-cis-benchmark/charts/crds/clusterscanbenchmark.yaml

@@ -1,32 +1,36 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusterscanbenchmarks.cis.cattle.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.clusterProvider
-    name: ClusterProvider
-    type: string
-  - JSONPath: .spec.minKubernetesVersion
-    name: MinKubernetesVersion
-    type: string
-  - JSONPath: .spec.maxKubernetesVersion
-    name: MaxKubernetesVersion
-    type: string
-  - JSONPath: .spec.customBenchmarkConfigMapName
-    name: customBenchmarkConfigMapName
-    type: string
-  - JSONPath: .spec.customBenchmarkConfigMapNamespace
-    name: customBenchmarkConfigMapNamespace
-    type: string
   group: cis.cattle.io
   names:
     kind: ClusterScanBenchmark
     plural: clusterscanbenchmarks
   scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.clusterProvider
+      name: ClusterProvider
+      type: string
+    - jsonPath: .spec.minKubernetesVersion
+      name: MinKubernetesVersion
+      type: string
+    - jsonPath: .spec.maxKubernetesVersion
+      name: MaxKubernetesVersion
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapName
+      name: customBenchmarkConfigMapName
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapNamespace
+      name: customBenchmarkConfigMapNamespace
+      type: string
     subresources:
       status: {}
-  validation:
+    schema:
       openAPIV3Schema:
         properties:
           spec:
@@ -48,8 +52,3 @@ spec:
                 type: string
             type: object
         type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true

packages/rancher-cis-benchmark/charts/crds/clusterscanprofile.yaml

@@ -1,20 +1,20 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusterscanprofiles.cis.cattle.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.benchmarkVersion
-    name: BenchmarkVersion
-    type: string
   group: cis.cattle.io
   names:
     kind: ClusterScanProfile
     plural: clusterscanprofiles
   scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
     subresources:
       status: {}
-  validation:
+    schema:
       openAPIV3Schema:
         properties:
           spec:
@@ -30,8 +30,7 @@ spec:
                 type: array
             type: object
         type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string

packages/rancher-cis-benchmark/charts/crds/clusterscanreport.yaml

@@ -1,23 +1,27 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusterscanreports.cis.cattle.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.lastRunTimestamp
-    name: LastRunTimestamp
-    type: string
-  - JSONPath: .spec.benchmarkVersion
-    name: BenchmarkVersion
-    type: string
   group: cis.cattle.io
   names:
     kind: ClusterScanReport
     plural: clusterscanreports
   scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string
     subresources:
       status: {}
-  validation:
+    schema:
       openAPIV3Schema:
         properties:
           spec:
@@ -33,8 +37,3 @@ spec:
                 type: string
             type: object
         type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true

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

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
@@ -13,7 +13,7 @@ rules:
   verbs:
   - '*'
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:

packages/rancher-cis-benchmark/templates/crd-template/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.0.5
+version: 1.0.6
 description: Installs the CRDs for rancher-cis-benchmark.
 name: rancher-cis-benchmark-crd
 type: application