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

Update MutatingWebhookConfiguration: Switch from objectSelector to AdmissionWebhookMatchConditions #2241

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update MutatingWebhookConfiguration: Switch from objectSelector to AdmissionWebhookMatchConditions #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion manifests/v1beta1/components/controller/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ spec:
metadata:
labels:
katib.kubeflow.org/component: controller
katib.kubeflow.org/metrics-collector-injection: disabled
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8080"
Expand Down
13 changes: 3 additions & 10 deletions manifests/v1beta1/components/webhook/webhooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,9 @@ webhooks:
namespaceSelector:
matchLabels:
katib.kubeflow.org/metrics-collector-injection: enabled
# Once the AdmissionWebhookMatchConditions feature gate is enabled by default, we should switch to control based on userInfo.
# REF:
# - AdmissionWebhookMatchConditions: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-matchconditions
# - Tracking issue: https://github.com/kubeflow/katib/issues/2206
objectSelector:
matchExpressions:
- key: katib.kubeflow.org/metrics-collector-injection
operator: NotIn
values:
- disabled
matchConditions:
- name: 'exclude-katib-controller'
expression: 'request.userInfo.username != "system:serviceaccount:kubeflow:katib-controller"'
rules:
- apiGroups:
- ""
Expand Down
Loading