Merge pull request #1245 from kyverno/schema_gen

Manage Kyverno CRDs by controller-gen
kyverno · Nov 16, 2020 · 8bb054f · 8bb054f
2 parents c9b6c1f + 63e11c2
commit 8bb054f
Show file tree

Hide file tree

Showing 82 changed files with 12,273 additions and 10,652 deletions.
diff --git a/Makefile b/Makefile
@@ -183,11 +183,12 @@ 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) 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) 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
+	$(CONTROLLER_GEN) crd paths=./pkg/api/policyreport/v1alpha1 output:dir=./definitions/crds
 
 # find or download controller-gen
 # download controller-gen if necessary
@@ -198,7 +199,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno/crds/crds.yaml
diff --git a/charts/kyverno/templates/clusterrole.yaml b/charts/kyverno/templates/clusterrole.yaml
@@ -7,7 +7,7 @@ rules:
 - apiGroups: ["kyverno.io"]
   resources:
   - policyviolations
-  verbs: ["get", "list", "watch"]
+  verbs: ["get", "list", "watch", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -84,10 +84,6 @@ rules:
   - policies/status
   - clusterpolicies
   - clusterpolicies/status
-  - clusterpolicyviolations
-  - clusterpolicyviolations/status
-  - policyviolations
-  - policyviolations/status
   - generaterequests
   - generaterequests/status
   verbs:

diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
@@ -204,8 +204,8 @@ func main() {
 	)
 
 	prgen = policyreport.NewReportGenerator(client,
-		pInformer.Policy().V1alpha1().ClusterPolicyReports(),
-		pInformer.Policy().V1alpha1().PolicyReports(),
+		pInformer.Wgpolicyk8s().V1alpha1().ClusterPolicyReports(),
+		pInformer.Wgpolicyk8s().V1alpha1().PolicyReports(),
 		pInformer.Kyverno().V1alpha1().ReportChangeRequests(),
 		pInformer.Kyverno().V1alpha1().ClusterReportChangeRequests(),
 		kubeInformer.Core().V1().Namespaces(),