update types.go to generate schema

kyverno · Nov 13, 2020 · 047b2b8 · 047b2b8
1 parent 5c38aab
commit 047b2b8
Show file tree

Hide file tree

Showing 16 changed files with 4,401 additions and 239 deletions.
diff --git a/Makefile b/Makefile
@@ -183,11 +183,14 @@ release:
 	kustomize build ./definitions > ./definitions/install.yaml
 	kustomize build ./definitions > ./definitions/release/install.yaml
 
+kyverno-crd: controller-gen
+	$(CONTROLLER_GEN) crd paths=./pkg/api/kyverno/v1alpha1 output:dir=./definitions/crds
+	$(CONTROLLER_GEN) object paths=./pkg/api/kyverno/v1alpha1
+	$(CONTROLLER_GEN) crd paths=./pkg/api/kyverno/v1 output:dir=./definitions/crds
+
 report-crd: controller-gen
-	$(CONTROLLER_GEN) crd:trivialVersions=true paths=./pkg/api/policyreport/v1alpha1 output:dir=./definitions/crds
+	$(CONTROLLER_GEN) crd paths=./pkg/api/policyreport/v1alpha1 output:dir=./definitions/crds
 	$(CONTROLLER_GEN) object paths=./pkg/api/policyreport/v1alpha1
-	$(CONTROLLER_GEN) crd:trivialVersions=true paths=./pkg/api/kyverno/v1alpha1 output:dir=./definitions/crds
-	$(CONTROLLER_GEN) object paths=./pkg/api/kyverno/v1alpha1
 
 # find or download controller-gen
 # download controller-gen if necessary

diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno/crds/crds.yaml
diff --git a/definitions/crds/kustomization.yaml b/definitions/crds/kustomization.yaml
@@ -3,7 +3,10 @@ kind: Kustomization
 
 resources:
 - ./crds.yaml
-- ./wgpolicyk8s.io_clusterpolicyreports.yaml
-- ./wgpolicyk8s.io_policyreports.yaml
+- ./kyverno.io_clusterpolicies.yaml
+- ./kyverno.io_clusterreportchangerequests.yaml
+- ./kyverno.io_generaterequests.yaml
+- ./kyverno.io_policies.yaml
 - ./kyverno.io_reportchangerequests.yaml
-- ./kyverno.io_clusterreportchangerequests.yaml
+- ./wgpolicyk8s.io_clusterpolicyreports.yaml
+- ./wgpolicyk8s.io_policyreports.yaml
diff --git a/definitions/crds/kyverno.io_clusterpolicies.yaml b/definitions/crds/kyverno.io_clusterpolicies.yaml
diff --git a/definitions/crds/kyverno.io_clusterreportchangerequests.yaml b/definitions/crds/kyverno.io_clusterreportchangerequests.yaml
@@ -13,8 +13,10 @@ spec:
     kind: ClusterReportChangeRequest
     listKind: ClusterReportChangeRequestList
     plural: clusterreportchangerequests
+    shortNames:
+    - cpol
     singular: clusterreportchangerequest
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .scope.kind

diff --git a/definitions/crds/kyverno.io_generaterequests.yaml b/definitions/crds/kyverno.io_generaterequests.yaml
@@ -98,16 +98,16 @@ spec:
                   request
                 properties:
                   apiVersion:
-                    description: Specifies resource apiVersionm
+                    description: Specifies resource apiVersion.
                     type: string
                   kind:
-                    description: Specifies resource kind
+                    description: Specifies resource kind.
                     type: string
                   name:
-                    description: Specifies resource name
+                    description: Specifies resource name.
                     type: string
                   namespace:
-                    description: Specifies resource namespace
+                    description: Specifies resource namespace.
                     type: string
                 type: object
             required:
@@ -122,19 +122,19 @@ spec:
                 description: This will track the resources that are generated by the
                   generate Policy Will be used during clean up resources
                 items:
-                  description: ResourceSpec information to identify the resource
+                  description: ResourceSpec information to identify the resource.
                   properties:
                     apiVersion:
-                      description: Specifies resource apiVersionm
+                      description: Specifies resource apiVersion.
                       type: string
                     kind:
-                      description: Specifies resource kind
+                      description: Specifies resource kind.
                       type: string
                     name:
-                      description: Specifies resource name
+                      description: Specifies resource name.
                       type: string
                     namespace:
-                      description: Specifies resource namespace
+                      description: Specifies resource namespace.
                       type: string
                   type: object
                 type: array

diff --git a/definitions/crds/kyverno.io_policies.yaml b/definitions/crds/kyverno.io_policies.yaml
diff --git a/definitions/crds/wgpolicyk8s.io_clusterpolicyreports.yaml b/definitions/crds/wgpolicyk8s.io_clusterpolicyreports.yaml
@@ -16,7 +16,7 @@ spec:
     shortNames:
     - cpolr
     singular: clusterpolicyreport
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .scope.kind