Skip to content

Commit ad16420

Browse files
committed
CARRY: Enable validation webhooks
1 parent 194193c commit ad16420

File tree

5 files changed

+28
-13
lines changed

5 files changed

+28
-13
lines changed

cmd/training-operator.v1/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const (
5353
// EnvKubeflowNamespace is an environment variable for namespace when deployed on kubernetes
5454
EnvKubeflowNamespace = "KUBEFLOW_NAMESPACE"
5555

56-
webhookConfigurationName = "validator.training-operator.kubeflow.org"
56+
webhookConfigurationName = "kubeflow-validator.training-operator.kubeflow.org"
5757
)
5858

5959
var (

manifests/base/webhook/patch.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
- op: replace
22
path: /webhooks/0/clientConfig/service/name
3-
value: training-operator
3+
value: kubeflow-training-operator
44
- op: replace
55
path: /webhooks/1/clientConfig/service/name
6-
value: training-operator
6+
value: kubeflow-training-operator
77
- op: replace
88
path: /webhooks/2/clientConfig/service/name
9-
value: training-operator
9+
value: kubeflow-training-operator
1010
- op: replace
1111
path: /webhooks/3/clientConfig/service/name
12-
value: training-operator
12+
value: kubeflow-training-operator
1313
- op: replace
1414
path: /webhooks/4/clientConfig/service/name
15-
value: training-operator
15+
value: kubeflow-training-operator
1616
- op: replace
1717
path: /metadata/name
1818
value: validator.training-operator.kubeflow.org

manifests/rhoai/kustomization.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,21 @@ resources:
4444
- kubeflow-training-roles.yaml
4545
- monitor.yaml
4646

47+
secretGenerator:
48+
- name: training-operator-webhook-cert
49+
options:
50+
disableNameSuffixHash: true
51+
4752
patches:
4853
# Mount the controller config file for loading manager configurations
4954
# through a ComponentConfig type
5055
- path: manager_config_patch.yaml
5156
- path: manager_metrics_patch.yaml
52-
- path: manager_delete_metrics_service_patch.yaml
57+
- patch: |-
58+
- op: remove
59+
path: /spec/ports/0
60+
target:
61+
group: ""
62+
version: v1
63+
kind: Service
64+
name: training-operator

manifests/rhoai/manager_config_patch.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,12 @@ spec:
1212
- "--zap-log-level=2"
1313
- --pytorch-init-container-image
1414
- $(image)
15+
- "--webhook-secret-name"
16+
- "kubeflow-training-operator-webhook-cert"
17+
- "--webhook-service-name"
18+
- "kubeflow-training-operator"
19+
volumes:
20+
- name: cert
21+
secret:
22+
defaultMode: 420
23+
secretName: kubeflow-training-operator-webhook-cert

manifests/rhoai/manager_delete_metrics_service_patch.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)