Merge pull request #720 from cliveseldon/kustomize_status

Update kustomize
SeldonIO · Jul 23, 2019 · b4690a3 · b4690a3
2 parents 383deb6 + 7152d95
commit b4690a3
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 88 deletions.
diff --git a/kustomize/seldon-core-operator/Makefile b/kustomize/seldon-core-operator/Makefile
@@ -2,6 +2,8 @@
 
 base:
 	helm convert ../../helm-charts/seldon-core-operator --skip-transformers=image,secret,namePrefix,labels --destination base --namespace seldon-system
+	# Convert seems to lose subresources so we add the crd explicitly
+	cp ../../helm-charts/seldon-core-operator/templates/crd.yaml base/seldondeployments.machinelearning.seldon.io-crd.yaml
 
 overlays/reporting:
 	helm convert ../../helm-charts/seldon-core-operator --skip-transformers=image,secret,namePrefix,labels,configMap --destination overlays/reporting --namespace seldon-system --set usageMetrics.enabled=true
@@ -20,6 +22,7 @@ clean:
 
 .PHONY: deploy-base
 deploy-base:
+	kubectl create namespace seldon-system || echo "seldon-system namespace exists" 
 	kustomize build base | kubectl apply -f -
 
 .PHONY: undeploy-base

diff --git a/kustomize/seldon-core-operator/base/Kube-descriptor.yaml b/kustomize/seldon-core-operator/base/Kube-descriptor.yaml
@@ -6,4 +6,4 @@ keywords:
 name: seldon-core-operator
 sources:
 - https://github.com/SeldonIO/seldon-core
-version: 0.3.1-SNAPSHOT
+version: 0.3.2-SNAPSHOT
diff --git a/kustomize/seldon-core-operator/base/seldon-core-operator-sa.yaml b/kustomize/seldon-core-operator/base/seldon-core-operator-sa.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-core-operator
   namespace: seldon-system
diff --git a/kustomize/seldon-core-operator/base/seldon-operator-controller-manager-service-svc.yaml b/kustomize/seldon-core-operator/base/seldon-operator-controller-manager-service-svc.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: seldon-core-operator
     control-plane: seldon-controller-manager
     controller-tools.k8s.io: "1.0"
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-operator-controller-manager-service
   namespace: seldon-system
 spec:

diff --git a/kustomize/seldon-core-operator/base/seldon-operator-controller-manager-statefulset.yaml b/kustomize/seldon-core-operator/base/seldon-operator-controller-manager-statefulset.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: seldon-core-operator
     control-plane: seldon-controller-manager
     controller-tools.k8s.io: "1.0"
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-operator-controller-manager
   namespace: seldon-system
 spec:
@@ -43,7 +43,7 @@ spec:
         - name: AMBASSADOR_SINGLE_NAMESPACE
           value: "false"
         - name: ENGINE_CONTAINER_IMAGE_AND_VERSION
-          value: docker.io/seldonio/engine:0.3.1-SNAPSHOT
+          value: docker.io/seldonio/engine:0.3.2-SNAPSHOT
         - name: ENGINE_CONTAINER_IMAGE_PULL_POLICY
           value: IfNotPresent
         - name: ENGINE_CONTAINER_SERVICE_ACCOUNT_NAME
@@ -62,7 +62,7 @@ spec:
           value: "false"
         - name: ISTIO_GATEWAY
           value: seldon-gateway
-        image: docker.io/seldonio/seldon-core-operator:0.3.1-SNAPSHOT
+        image: docker.io/seldonio/seldon-core-operator:0.3.2-SNAPSHOT
         imagePullPolicy: Always
         name: manager
         ports:

diff --git a/kustomize/seldon-core-operator/base/seldon-operator-manager-role-clusterrole.yaml b/kustomize/seldon-core-operator/base/seldon-operator-manager-role-clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-operator-manager-role
 rules:
 - apiGroups:

diff --git a/kustomize/seldon-core-operator/base/seldon-operator-manager-rolebinding-crb.yaml b/kustomize/seldon-core-operator/base/seldon-operator-manager-rolebinding-crb.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-operator-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/kustomize/seldon-core-operator/base/seldondeployments.machinelearning.seldon.io-crd.yaml b/kustomize/seldon-core-operator/base/seldondeployments.machinelearning.seldon.io-crd.yaml
@@ -11,6 +11,8 @@ spec:
     - sdep
     singular: seldondeployment
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       properties:
@@ -210,79 +212,6 @@ spec:
                             generation:
                               format: int64
                               type: integer
-                            initializers:
-                              properties:
-                                pending:
-                                  items:
-                                    properties:
-                                      name:
-                                        type: string
-                                    required:
-                                    - name
-                                    type: object
-                                  type: array
-                                  x-kubernetes-patch-merge-key: name
-                                  x-kubernetes-patch-strategy: merge
-                                result:
-                                  properties:
-                                    apiVersion:
-                                      type: string
-                                    code:
-                                      format: int32
-                                      type: integer
-                                    details:
-                                      properties:
-                                        causes:
-                                          items:
-                                            properties:
-                                              field:
-                                                type: string
-                                              message:
-                                                type: string
-                                              reason:
-                                                type: string
-                                            type: object
-                                          type: array
-                                        group:
-                                          type: string
-                                        kind:
-                                          type: string
-                                        name:
-                                          type: string
-                                        retryAfterSeconds:
-                                          format: int32
-                                          type: integer
-                                        uid:
-                                          type: string
-                                      type: object
-                                    kind:
-                                      type: string
-                                    message:
-                                      type: string
-                                    metadata:
-                                      properties:
-                                        continue:
-                                          type: string
-                                        remainingItemCount:
-                                          format: int64
-                                          type: integer
-                                        resourceVersion:
-                                          type: string
-                                        selfLink:
-                                          type: string
-                                      type: object
-                                    reason:
-                                      type: string
-                                    status:
-                                      type: string
-                                  type: object
-                                  x-kubernetes-group-version-kind:
-                                  - group: ""
-                                    kind: Status
-                                    version: v1
-                              required:
-                              - pending
-                              type: object
                             labels:
                               additionalProperties:
                                 type: string
@@ -2099,6 +2028,7 @@ spec:
                               items:
                                 properties:
                                   children:
+                                    items: {}
                                     type: array
                                   endpoint:
                                     properties:
@@ -2118,6 +2048,9 @@ spec:
                                     - SIMPLE_ROUTER
                                     - RANDOM_ABTEST
                                     - AVERAGE_COMBINER
+                                    - SKLEARN_SERVER
+                                    - XGBOOST_SERVER
+                                    - TENSORFLOW_SERVER
                                     type: string
                                   methods:
                                     items:
@@ -2129,6 +2062,8 @@ spec:
                                       - SEND_FEEDBACK
                                       type: string
                                     type: array
+                                  modelUri:
+                                    type: string
                                   name:
                                     type: string
                                   type:
@@ -2159,6 +2094,9 @@ spec:
                               - SIMPLE_ROUTER
                               - RANDOM_ABTEST
                               - AVERAGE_COMBINER
+                              - SKLEARN_SERVER
+                              - XGBOOST_SERVER
+                              - TENSORFLOW_SERVER
                               type: string
                             methods:
                               items:
@@ -2200,6 +2138,9 @@ spec:
                         - SIMPLE_ROUTER
                         - RANDOM_ABTEST
                         - AVERAGE_COMBINER
+                        - SKLEARN_SERVER
+                        - XGBOOST_SERVER
+                        - TENSORFLOW_SERVER
                         type: string
                       methods:
                         items:
@@ -2297,3 +2238,4 @@ spec:
   - name: v1alpha2
     served: true
     storage: true
+
diff --git a/kustomize/seldon-core-operator/base/webhook-server-service-svc.yaml b/kustomize/seldon-core-operator/base/webhook-server-service-svc.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: seldon-core-operator
     control-plane: seldon-controller-manager
     controller-tools.k8s.io: "1.0"
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: webhook-server-service
   namespace: seldon-system
 spec:

diff --git a/kustomize/seldon-core-operator/overlays/reporting/Kube-descriptor.yaml b/kustomize/seldon-core-operator/overlays/reporting/Kube-descriptor.yaml
@@ -6,4 +6,4 @@ keywords:
 name: seldon-core-operator
 sources:
 - https://github.com/SeldonIO/seldon-core
-version: 0.3.1-SNAPSHOT
+version: 0.3.2-SNAPSHOT
diff --git a/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-config-cm.yaml b/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-config-cm.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 data:
-  spartakus_volunteer_extensions: '{"seldon-core-version":"0.3.1-SNAPSHOT"}'
+  spartakus_volunteer_extensions: '{"seldon-core-version":"0.3.2-SNAPSHOT"}'
 kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-spartakus-config
   namespace: kube-system
diff --git a/...omize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-clusterrole.yaml b/...omize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-spartakus-volunteer
 rules:
 - apiGroups:

diff --git a/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-crb.yaml b/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-crb.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-spartakus-volunteer
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-sa.yaml b/kustomize/seldon-core-operator/overlays/reporting/seldon-spartakus-volunteer-sa.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/instance: seldon-core-operator
     app.kubernetes.io/managed-by: Tiller
     app.kubernetes.io/name: seldon-core-operator
-    helm.sh/chart: seldon-core-operator-0.3.1-SNAPSHOT
+    helm.sh/chart: seldon-core-operator-0.3.2-SNAPSHOT
   name: seldon-spartakus-volunteer
   namespace: kube-system