Merge pull request #1408 from cliveseldon/1385_webhook_names

Ensure unique names for webhooks
SeldonIO · Feb 13, 2020 · b363510 · b363510
1 parent 32f4b0e
commit b363510
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 19 deletions.
diff --git a/helm-charts/seldon-core-operator/templates/webhook.yaml b/helm-charts/seldon-core-operator/templates/webhook.yaml
@@ -37,7 +37,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /validate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1.vseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:
@@ -81,7 +81,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /validate-machinelearning-seldon-io-v1alpha2-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1alpha2.vseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:
@@ -125,7 +125,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /validate-machinelearning-seldon-io-v1alpha3-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1alpha3.vseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:
@@ -184,7 +184,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /mutate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1.mseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:
@@ -228,7 +228,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /mutate-machinelearning-seldon-io-v1alpha2-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1alpha2.mseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:
@@ -272,7 +272,7 @@ webhooks:
       namespace: '{{ .Release.Namespace }}'
       path: /mutate-machinelearning-seldon-io-v1alpha3-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1alpha3.mseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.GitVersion }}
 {{- if not .Values.singleNamespace }}
   namespaceSelector:

diff --git a/notebooks/resources/model.yaml b/notebooks/resources/model.yaml
@@ -1,4 +1,4 @@
-apiVersion: machinelearning.seldon.io/v1alpha2
+apiVersion: machinelearning.seldon.io/v1
 kind: SeldonDeployment
 metadata:
   name: seldon-model

diff --git a/notebooks/resources/model_v1alpha2.yaml b/notebooks/resources/model_v1alpha2.yaml
@@ -0,0 +1,20 @@
+apiVersion: machinelearning.seldon.io/v1alpha2
+kind: SeldonDeployment
+metadata:
+  name: seldon-model
+spec:
+  name: test-deployment
+  predictors:
+  - componentSpecs:
+    - spec:
+        containers:
+        - image: seldonio/mock_classifier_rest:1.3
+          name: classifier
+    graph:
+      children: []
+      endpoint:
+        type: REST
+      name: classifier
+      type: MODEL
+    name: example
+    replicas: 1
diff --git a/notebooks/resources/model_v1alpha3.yaml b/notebooks/resources/model_v1alpha3.yaml
@@ -0,0 +1,20 @@
+apiVersion: machinelearning.seldon.io/v1alpha3
+kind: SeldonDeployment
+metadata:
+  name: seldon-model
+spec:
+  name: test-deployment
+  predictors:
+  - componentSpecs:
+    - spec:
+        containers:
+        - image: seldonio/mock_classifier_rest:1.3
+          name: classifier
+    graph:
+      children: []
+      endpoint:
+        type: REST
+      name: classifier
+      type: MODEL
+    name: example
+    replicas: 1
diff --git a/operator/apis/machinelearning/v1/seldondeployment_webhook.go b/operator/apis/machinelearning/v1/seldondeployment_webhook.go
@@ -478,7 +478,7 @@ func (r *SeldonDeploymentSpec) ValidateSeldonDeployment() error {
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 
-// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1,name=mseldondeployment.kb.io
+// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1,name=v1.mseldondeployment.kb.io
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *SeldonDeployment) Default() {
@@ -491,7 +491,7 @@ func (r *SeldonDeployment) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1,name=vseldondeployment.kb.io
+// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1,name=v1.vseldondeployment.kb.io
 
 var _ webhook.Validator = &SeldonDeployment{}
 

diff --git a/operator/apis/machinelearning/v1alpha2/seldondeployment_webhook.go b/operator/apis/machinelearning/v1alpha2/seldondeployment_webhook.go
@@ -39,7 +39,7 @@ func (r *SeldonDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 var _ webhook.Defaulter = &SeldonDeployment{}
 
-// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1alpha2-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1alpha2,name=mseldondeployment.kb.io
+// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1alpha2-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1alpha2,name=v1alpha2.mseldondeployment.kb.io
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *SeldonDeployment) Default() {
@@ -52,7 +52,7 @@ func (r *SeldonDeployment) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1alpha2-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1alpha2,name=vseldondeployment.kb.io
+// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1alpha2-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1alpha2,name=v1alpha2.vseldondeployment.kb.io
 
 var _ webhook.Validator = &SeldonDeployment{}
 

diff --git a/operator/apis/machinelearning/v1alpha3/seldondeployment_webhook.go b/operator/apis/machinelearning/v1alpha3/seldondeployment_webhook.go
@@ -39,7 +39,7 @@ func (r *SeldonDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 var _ webhook.Defaulter = &SeldonDeployment{}
 
-// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1alpha3-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1alpha3,name=mseldondeployment.kb.io
+// +kubebuilder:webhook:path=/mutate-machinelearning-seldon-io-v1alpha3-seldondeployment,mutating=true,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,verbs=create;update,versions=v1alpha3,name=v1alpha3.mseldondeployment.kb.io
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *SeldonDeployment) Default() {
@@ -52,7 +52,7 @@ func (r *SeldonDeployment) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1alpha3-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1alpha3,name=vseldondeployment.kb.io
+// +kubebuilder:webhook:verbs=create;update,path=/validate-machinelearning-seldon-io-v1alpha3-seldondeployment,mutating=false,failurePolicy=fail,groups=machinelearning.seldon.io,resources=seldondeployments,versions=v1alpha3,name=v1alpha3.vseldondeployment.kb.io
 
 var _ webhook.Validator = &SeldonDeployment{}
 

diff --git a/operator/config/webhook/manifests.yaml b/operator/config/webhook/manifests.yaml
@@ -13,7 +13,7 @@ webhooks:
       namespace: system
       path: /mutate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1.mseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -31,7 +31,7 @@ webhooks:
       namespace: system
       path: /mutate-machinelearning-seldon-io-v1alpha2-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1alpha2.mseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -49,7 +49,7 @@ webhooks:
       namespace: system
       path: /mutate-machinelearning-seldon-io-v1alpha3-seldondeployment
   failurePolicy: Fail
-  name: mseldondeployment.kb.io
+  name: v1alpha3.mseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -75,7 +75,7 @@ webhooks:
       namespace: system
       path: /validate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1.vseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -93,7 +93,7 @@ webhooks:
       namespace: system
       path: /validate-machinelearning-seldon-io-v1alpha2-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1alpha2.vseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -111,7 +111,7 @@ webhooks:
       namespace: system
       path: /validate-machinelearning-seldon-io-v1alpha3-seldondeployment
   failurePolicy: Fail
-  name: vseldondeployment.kb.io
+  name: v1alpha3.vseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io