Add versions v1 and v1alpha3 to CRD (#1229)

Add versions v1 and v1alpha3 to CRD
SeldonIO · Dec 13, 2019 · f1098b2 · f1098b2
2 parents 4166688 + 645a1e1
commit f1098b2
Show file tree

Hide file tree

Showing 32 changed files with 3,378 additions and 223 deletions.
diff --git a/...rator/templates/customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml b/...rator/templates/customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml
@@ -2939,11 +2939,17 @@ spec:
               type: string
           type: object
       type: object
-  version: v1alpha2
+  version: v1
   versions:
-  - name: v1alpha2
+  - name: v1
     served: true
     storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
+  - name: v1alpha3
+    served: true
+    storage: false
 status:
   acceptedNames:
     kind: ''

diff --git a/helm-charts/seldon-core-operator/templates/webhook.yaml b/helm-charts/seldon-core-operator/templates/webhook.yaml
@@ -21,7 +21,7 @@ webhooks:
     service:
       name: seldon-webhook-service
       namespace: '{{ .Release.Namespace }}'
-      path: /validate-machinelearning-seldon-io-v1alpha2-seldondeployment
+      path: /validate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
   name: vseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.Version }}
@@ -50,6 +50,24 @@ webhooks:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
 {{- end }}
+  rules:
+  - apiGroups:
+    - machinelearning.seldon.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - seldondeployments
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: seldon-webhook-service
+      namespace: seldon-system
+      path: /validate-machinelearning-seldon-io-v1alpha2-seldondeployment
+  failurePolicy: Fail
+  name: vseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -60,6 +78,38 @@ webhooks:
     - UPDATE
     resources:
     - seldondeployments
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: seldon-webhook-service
+      namespace: seldon-system
+      path: /validate-machinelearning-seldon-io-v1alpha3-seldondeployment
+  failurePolicy: Fail
+  name: vseldondeployment.kb.io
+  rules:
+  - apiGroups:
+    - machinelearning.seldon.io
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - seldondeployments
+---
+
+{{- if not .Values.certManager.enabled -}}
+apiVersion: v1
+data:
+  ca.crt: '{{ $ca.Cert | b64enc }}'
+  tls.crt: '{{ $cert.Cert | b64enc }}'
+  tls.key: '{{ $cert.Key | b64enc }}'
+kind: Secret
+metadata:
+  name: seldon-webhook-server-cert
+  namespace: '{{ .Release.Namespace }}'
+type: kubernetes.io/tls
+{{- end }}
 ---
 
 apiVersion: admissionregistration.k8s.io/v1beta1
@@ -80,7 +130,7 @@ webhooks:
     service:
       name: seldon-webhook-service
       namespace: '{{ .Release.Namespace }}'
-      path: /mutate-machinelearning-seldon-io-v1alpha2-seldondeployment
+      path: /mutate-machinelearning-seldon-io-v1-seldondeployment
   failurePolicy: Fail
   name: mseldondeployment.kb.io
 {{- if semverCompare ">=1.15.0" .Capabilities.KubeVersion.Version }}
@@ -109,6 +159,24 @@ webhooks:
     matchLabels:
       seldon.io/controller-id: {{ .Values.controllerId }}
 {{- end }}
+  rules:
+  - apiGroups:
+    - machinelearning.seldon.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - seldondeployments
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: seldon-webhook-service
+      namespace: seldon-system
+      path: /mutate-machinelearning-seldon-io-v1alpha2-seldondeployment
+  failurePolicy: Fail
+  name: mseldondeployment.kb.io
   rules:
   - apiGroups:
     - machinelearning.seldon.io
@@ -119,17 +187,21 @@ webhooks:
     - UPDATE
     resources:
     - seldondeployments
----
-
-{{- if not .Values.certManager.enabled -}}
-apiVersion: v1
-data:
-  ca.crt: '{{ $ca.Cert | b64enc }}'
-  tls.crt: '{{ $cert.Cert | b64enc }}'
-  tls.key: '{{ $cert.Key | b64enc }}'
-kind: Secret
-metadata:
-  name: seldon-webhook-server-cert
-  namespace: '{{ .Release.Namespace }}'
-type: kubernetes.io/tls
-{{- end }}
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: seldon-webhook-service
+      namespace: seldon-system
+      path: /mutate-machinelearning-seldon-io-v1alpha3-seldondeployment
+  failurePolicy: Fail
+  name: mseldondeployment.kb.io
+  rules:
+  - apiGroups:
+    - machinelearning.seldon.io
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - seldondeployments
diff --git a/helm-charts/seldon-single-model/templates/model.json b/helm-charts/seldon-single-model/templates/model.json
@@ -1,5 +1,5 @@
 {
-    "apiVersion": "machinelearning.seldon.io/v1alpha2",
+    "apiVersion": {{ .Values.apiVersion }},
     "kind": "SeldonDeployment",
     "metadata": {
         "labels": {{ .Values.sdepLabels | toJson }},

diff --git a/helm-charts/seldon-single-model/values.yaml b/helm-charts/seldon-single-model/values.yaml
@@ -1,4 +1,5 @@
 name: my-model
+apiVersion: machinelearning.seldon.io/v1
 model:
   image:
     name: seldonio/mock_classifier:1.0
@@ -26,12 +27,12 @@ engine:
 
 # Add oauth key and secret if using the default API Oauth Gateway for ingress
 oauth:
-  key: 
-  secret: 
+  key:
+  secret:
 
 sdepLabels:
   app: "seldon"
 
 predictorLabels:
   version: "v1"
-  fluentd: "true"
+  fluentd: "true"
diff --git a/operator/PROJECT b/operator/PROJECT
@@ -5,3 +5,9 @@ resources:
 - group: machinelearning
   version: v1alpha2
   kind: SeldonDeployment
+- group: machinelearning
+  version: v1alpha3
+  kind: SeldonDeployment
+- group: machinelearning
+  version: v1
+  kind: SeldonDeployment
diff --git a/operator/api/v1/groupversion_info.go b/operator/api/v1/groupversion_info.go
@@ -0,0 +1,36 @@
+/*
+Copyright 2019 The Seldon Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1 contains API Schema definitions for the machinelearning v1 API group
+// +kubebuilder:object:generate=true
+// +groupName=machinelearning.seldon.io
+package v1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects
+	GroupVersion = schema.GroupVersion{Group: "machinelearning.seldon.io", Version: "v1"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)