chore: Upgrade CRD apiVersion from apiextensions.k8s.io/v1beta1 to ap…

…iextensions.k8s.io/v1 (#411) Resolves: #371 Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
aquasecurity · Feb 25, 2021 · 8325cb2 · 8325cb2
1 parent 001ee2c
commit 8325cb2
Show file tree

Hide file tree

Showing 16 changed files with 619 additions and 549 deletions.
diff --git a/deploy/crd/ciskubebenchreports.crd.yaml b/deploy/crd/ciskubebenchreports.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: ciskubebenchreports.aquasecurity.github.io
@@ -10,6 +10,33 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
+      additionalPrinterColumns:
+        - jsonPath: .report.scanner.name
+          type: string
+          name: Scanner
+        - jsonPath: .metadata.creationTimestamp
+          type: date
+          name: Age
+        - jsonPath: .report.summary.failCount
+          type: integer
+          name: Fail
+          priority: 1
+        - jsonPath: .report.summary.warnCount
+          type: integer
+          name: Warn
+          priority: 1
+        - jsonPath: .report.summary.infoCount
+          type: integer
+          name: Info
+          priority: 1
+        - jsonPath: .report.summary.passCount
+          type: integer
+          name: Pass
+          priority: 1
+      schema:
+        openAPIV3Schema:
+          x-kubernetes-preserve-unknown-fields: true
+          type: "object"
   scope: Cluster
   names:
     singular: ciskubebenchreport
@@ -20,26 +47,3 @@ spec:
       - all
     shortNames:
       - kubebench
-  additionalPrinterColumns:
-    - JSONPath: .report.scanner.name
-      type: string
-      name: Scanner
-    - JSONPath: .metadata.creationTimestamp
-      type: date
-      name: Age
-    - JSONPath: .report.summary.passCount
-      type: integer
-      name: Pass
-      priority: 1
-    - JSONPath: .report.summary.infoCount
-      type: integer
-      name: Info
-      priority: 1
-    - JSONPath: .report.summary.warnCount
-      type: integer
-      name: Warn
-      priority: 1
-    - JSONPath: .report.summary.failCount
-      type: integer
-      name: Fail
-      priority: 1
diff --git a/deploy/crd/configauditreports.crd.yaml b/deploy/crd/configauditreports.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: configauditreports.aquasecurity.github.io
@@ -10,6 +10,34 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
+      additionalPrinterColumns:
+        - jsonPath: .report.scanner.name
+          type: string
+          name: Scanner
+          description: The name of the config audit scanner
+        - jsonPath: .metadata.creationTimestamp
+          type: date
+          name: Age
+          description: The age of the report
+        - jsonPath: .report.summary.dangerCount
+          type: integer
+          name: Danger
+          priority: 1
+          description: The number of checks that failed with Danger status
+        - jsonPath: .report.summary.warningCount
+          type: integer
+          name: Warning
+          priority: 1
+          description: The number of checks that failed with Warning status
+        - jsonPath: .report.summary.passCount
+          type: integer
+          name: Pass
+          priority: 1
+          description: The number of checks that passed
+      schema:
+        openAPIV3Schema:
+          x-kubernetes-preserve-unknown-fields: true
+          type: object
   scope: Namespaced
   names:
     singular: configauditreport
@@ -20,27 +48,3 @@ spec:
       - all
     shortNames:
       - configaudit
-  additionalPrinterColumns:
-    - JSONPath: .report.scanner.name
-      type: string
-      name: Scanner
-      description: The name of the config audit scanner
-    - JSONPath: .metadata.creationTimestamp
-      type: date
-      name: Age
-      description: The age of the report
-    - JSONPath: .report.summary.passCount
-      type: integer
-      name: Pass
-      priority: 1
-      description: The number of checks that passed
-    - JSONPath: .report.summary.dangerCount
-      type: integer
-      name: Danger
-      priority: 1
-      description: The number of checks that failed with Danger status
-    - JSONPath: .report.summary.warningCount
-      type: integer
-      name: Warning
-      priority: 1
-      description: The number of checks that failed with Warning status
diff --git a/deploy/crd/kubehunterreports.crd.yaml b/deploy/crd/kubehunterreports.crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: kubehunterreports.aquasecurity.github.io
@@ -10,6 +10,29 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
+      additionalPrinterColumns:
+        - jsonPath: ".report.scanner.name"
+          name: "Scanner"
+          type: "string"
+        - jsonPath: ".metadata.creationTimestamp"
+          name: "Age"
+          type: "date"
+        - jsonPath: ".report.summary.highCount"
+          name: "High"
+          type: "integer"
+          priority: 1
+        - jsonPath: ".report.summary.mediumCount"
+          name: "Medium"
+          type: "integer"
+          priority: 1
+        - jsonPath: ".report.summary.lowCount"
+          name: "Low"
+          type: "integer"
+          priority: 1
+      schema:
+        openAPIV3Schema:
+          x-kubernetes-preserve-unknown-fields: true
+          type: "object"
   scope: Cluster
   names:
     singular: kubehunterreport