resolve conflict

kyverno · Sep 11, 2020 · 6a0a513 · 6a0a513
2 parents a45cb75 + 0bd1a10
commit 6a0a513
Show file tree

Hide file tree

Showing 20 changed files with 368 additions and 244 deletions.
diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: kyverno
-version: 1.1.10
-appVersion: v1.1.10
+version: 1.1.11
+appVersion: v1.1.11
 icon: https://github.com/nirmata/kyverno/blob/master/documentation/images/Kyverno_Horizontal.png
 description: Kubernetes Native Policy Management
 keywords:

diff --git a/charts/kyverno/templates/clusterrole.yaml b/charts/kyverno/templates/clusterrole.yaml
@@ -131,6 +131,7 @@ rules:
   - limitranges
   - clusterroles
   - rolebindings
+  - namespaces
   - clusterrolebindings
   {{- range .Values.generatecontrollerExtraResources }}
   - {{ . }}
@@ -139,6 +140,7 @@ rules:
   - create
   - update
   - delete
+  - list
   - get
 # dynamic watches on trigger resources for generate rules
 # re-evaluate the policy if the resource is updated

diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
@@ -211,6 +211,7 @@ func main() {
 		pInformer.Kyverno().V1().Policies(),
 		pInformer.Kyverno().V1().ClusterPolicyViolations(),
 		pInformer.Kyverno().V1().PolicyViolations(),
+		pInformer.Kyverno().V1().GenerateRequests(),
 		configData,
 		eventGenerator,
 		pvgen,