Merge pull request #161 from octarinesec/temp-5.6.2-merge

Merge back 5.6.2 into main
octarinesec · Jun 28, 2023 · 6db1c85 · 6db1c85
2 parents 18a48f6 + 593d4e9
commit 6db1c85
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/cbcontainers/state/components/enforcer_mutating_webhook.go b/cbcontainers/state/components/enforcer_mutating_webhook.go
@@ -206,6 +206,8 @@ func (obj *EnforcerMutatingWebhookK8sObject) getResourcesList() []string {
 		"cronjobs",
 		"ingresses",
 		"customresourcedefinitions",
+		"deploymentconfigs",
+		"routes",
 	}
 }
 

diff --git a/cbcontainers/state/components/enforcer_validating_webhook.go b/cbcontainers/state/components/enforcer_validating_webhook.go
@@ -216,6 +216,8 @@ func (obj *EnforcerValidatingWebhookK8sObject) getResourcesList() []string {
 		"cronjobs",
 		"ingresses",
 		"customresourcedefinitions",
+		"deploymentconfigs",
+		"routes",
 	}
 }
 

diff --git a/charts/cbcontainers-agent/cbcontainers-agent-chart/templates/rbac.yaml b/charts/cbcontainers-agent/cbcontainers-agent-chart/templates/rbac.yaml
@@ -81,6 +81,8 @@ rules:
       - networking.k8s.io
       - rbac
       - rbac.authorization.k8s.io
+      - apps.openshift.io
+      - route.openshift.io
     resources:
       - clusterrolebindings
       - cronjobs
@@ -97,6 +99,8 @@ rules:
       - rolebindings
       - services
       - statefulsets
+      - deploymentconfigs
+      - routes
     verbs:
       - watch
 ---

diff --git a/config/rbac/dataplane_roles.yaml b/config/rbac/dataplane_roles.yaml
@@ -95,6 +95,8 @@ rules:
       - networking.k8s.io
       - rbac
       - rbac.authorization.k8s.io
+      - apps.openshift.io
+      - route.openshift.io
     resources:
       - clusterrolebindings
       - cronjobs
@@ -111,5 +113,7 @@ rules:
       - rolebindings
       - services
       - statefulsets
+      - deploymentconfigs
+      - routes
     verbs:
       - watch