Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge back 5.6.2 into main #161

Merged
merged 16 commits into from
Jun 28, 2023
Merged

Merge back 5.6.2 into main #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fc7ef60
POC version of resolver auto-scaling
davidf146 May 14, 2023
7cc197c
Updated intial POC version
davidf146 May 15, 2023
e7f45ad
CR: updated nodesToReplicasRation to int32
davidf146 May 16, 2023
fb0bdaa
Propagate apiReader to ResolverDeploymentK8sObject
davidf146 May 17, 2023
87b3ae2
Added client reader mock
davidf146 May 17, 2023
ea4e607
Updated variable nodesCount-->replicasCount
davidf146 May 21, 2023
e05bc8d
CNS-2921: openshift DeploymentConfig watcher permissions
Jun 6, 2023
070985b
CNS-2966: openshift Route watcher permissions
Jun 8, 2023
9e4a56b
support openshift DeploymentConfig & Route in enforcer webhooks
Jun 12, 2023
f11aa21
rbac changes in kustomize
Jun 15, 2023
011237f
Merge pull request #156 from octarinesec/openshift-support-5-6-2
kkadosh-vmware Jun 15, 2023
ebedca5
Allow the runtime resolver to list and watch core/v1/ReplicationContr…
rosti Jun 2, 2023
9fd9747
Merge pull request #157 from octarinesec/cherry-pick-pr153
rosti Jun 16, 2023
e808267
Cherry-pick of CNS-1284-Add CRI-O support to the cluster scanner (434…
ltsonov-cb Jun 15, 2023
4e29baa
Merge pull request #158 from octarinesec/CNS-1284-crio-cherrypick
yonatan-shorani Jun 18, 2023
593d4e9
Merge branch '5.6.2' into temp-5.6.2-merge
ltsonov-cb Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cbcontainers/state/components/enforcer_mutating_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ func (obj *EnforcerMutatingWebhookK8sObject) getResourcesList() []string {
"cronjobs",
"ingresses",
"customresourcedefinitions",
"deploymentconfigs",
"routes",
}
}

Expand Down
2 changes: 2 additions & 0 deletions cbcontainers/state/components/enforcer_validating_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ func (obj *EnforcerValidatingWebhookK8sObject) getResourcesList() []string {
"cronjobs",
"ingresses",
"customresourcedefinitions",
"deploymentconfigs",
"routes",
}
}

Expand Down
4 changes: 4 additions & 0 deletions charts/cbcontainers-agent/cbcontainers-agent-chart/templates/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ rules:
- networking.k8s.io
- rbac
- rbac.authorization.k8s.io
- apps.openshift.io
- route.openshift.io
resources:
- clusterrolebindings
- cronjobs
Expand All @@ -97,6 +99,8 @@ rules:
- rolebindings
- services
- statefulsets
- deploymentconfigs
- routes
verbs:
- watch
---
Expand Down
4 changes: 4 additions & 0 deletions config/rbac/dataplane_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ rules:
- networking.k8s.io
- rbac
- rbac.authorization.k8s.io
- apps.openshift.io
- route.openshift.io
resources:
- clusterrolebindings
- cronjobs
Expand All @@ -111,5 +113,7 @@ rules:
- rolebindings
- services
- statefulsets
- deploymentconfigs
- routes
verbs:
- watch