1.2.1 RedHat Release

SeldonIO · Jul 4, 2020 · bb12768 · bb12768
1 parent 0e0b560
commit bb12768
Show file tree

Hide file tree

Showing 11 changed files with 11,451 additions and 12 deletions.
diff --git a/marketplaces/redhat/scan-images.py b/marketplaces/redhat/scan-images.py
@@ -48,10 +48,11 @@ def scan_images(debug=False):
         if err == None:
             print("updated {path}".format(**locals()))
         else:
-            errStr = str(err["stderr"])
-            if errStr.index("The image tag you are pushing already exists.") > 0:
-                print(f"Warning: Image already exists for {path}.")
-            else:
+            try:
+                errStr = str(err["stderr"])
+                if errStr.index("The image tag you are pushing already exists.") > 0:
+                    print(f"Warning: Image already exists for {path}.")
+            except ValueError:
                 print("error updating {path}".format(**locals()))
                 print(err)
 

diff --git a/operator/seldon-operator/Makefile b/operator/seldon-operator/Makefile
@@ -30,12 +30,15 @@ update_csv: clean_csv_${VERSION} deploy/olm-catalog/seldon-operator/${VERSION}/s
 # TESTS
 #
 
+#
+# Tested with 0.18.2 (0.18.1 fails)
+#
+
 scorecard:
 	operator-sdk scorecard -o text --bundle deploy/olm-catalog/seldon-operator --kubeconfig ~/.kube/config
 
 #
 # REQUIRED operator-courier 2.1.7
-# master version of code is broken as of June 2020
 #
 
 operator-courier_ui_validate:

diff --git a/...eldon-operator/bundle/certified/1.2.1/machinelearning.seldon.io_seldondeployment_crd.yaml b/...eldon-operator/bundle/certified/1.2.1/machinelearning.seldon.io_seldondeployment_crd.yaml
diff --git a/.../seldon-operator/bundle/certified/1.2.1/seldon-operator.v1.2.1.clusterserviceversion.yaml b/.../seldon-operator/bundle/certified/1.2.1/seldon-operator.v1.2.1.clusterserviceversion.yaml
diff --git a/operator/seldon-operator/bundle/certified/seldon-operator.package.yaml b/operator/seldon-operator/bundle/certified/seldon-operator.package.yaml
@@ -1,5 +1,5 @@
 channels:
-- currentCSV: seldon-operator.v1.2.0
+- currentCSV: seldon-operator.v1.2.1
   name: alpha
 defaultChannel: alpha
 packageName: seldon-operator-certified
diff --git a/...loy/olm-catalog/seldon-operator/1.2.1/machinelearning.seldon.io_seldondeployment_crd.yaml b/...loy/olm-catalog/seldon-operator/1.2.1/machinelearning.seldon.io_seldondeployment_crd.yaml
diff --git a/...eploy/olm-catalog/seldon-operator/1.2.1/seldon-operator.v1.2.1.clusterserviceversion.yaml b/...eploy/olm-catalog/seldon-operator/1.2.1/seldon-operator.v1.2.1.clusterserviceversion.yaml
diff --git a/operator/seldon-operator/deploy/olm-catalog/seldon-operator/seldon-operator.package.yaml b/operator/seldon-operator/deploy/olm-catalog/seldon-operator/seldon-operator.package.yaml
@@ -1,5 +1,5 @@
 channels:
-- currentCSV: seldon-operator.v1.2.0
+- currentCSV: seldon-operator.v1.2.1
   name: alpha
 defaultChannel: alpha
 packageName: seldon-operator
diff --git a/operator/seldon-operator/deploy/operator.yaml b/operator/seldon-operator/deploy/operator.yaml
@@ -78,7 +78,7 @@ spec:
         - name: AMBASSADOR_SINGLE_NAMESPACE
           value: 'false'
         - name: ENGINE_CONTAINER_IMAGE_AND_VERSION
-          value: docker.io/seldonio/engine:1.2.1-dev
+          value: docker.io/seldonio/engine:1.2.1
         - name: ENGINE_CONTAINER_IMAGE_PULL_POLICY
           value: IfNotPresent
         - name: ENGINE_CONTAINER_SERVICE_ACCOUNT_NAME
@@ -108,7 +108,7 @@ spec:
         - name: USE_EXECUTOR
           value: 'true'
         - name: EXECUTOR_CONTAINER_IMAGE_AND_VERSION
-          value: seldonio/seldon-core-executor:1.2.1-dev
+          value: seldonio/seldon-core-executor:1.2.1
         - name: EXECUTOR_CONTAINER_IMAGE_PULL_POLICY
           value: IfNotPresent
         - name: EXECUTOR_PROMETHEUS_PATH
@@ -125,7 +125,7 @@ spec:
           value: http://default-broker
         - name: DEFAULT_USER_ID
           value: ''
-        image: seldonio/seldon-core-operator:1.2.1-dev
+        image: seldonio/seldon-core-operator:1.2.1
         name: manager
         ports:
         - containerPort: 8443

diff --git a/operator/seldon-operator/testing/openshift/operator-group.yaml b/operator/seldon-operator/testing/openshift/operator-group.yaml
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha2
 kind: OperatorGroup
 metadata:
   name: seldon-operatorgroup
-  namespace: istio-test
+  namespace: seldon-system
 spec:
   targetNamespaces:
-  - istio-test
+  - seldon-system
diff --git a/operator/seldon-operator/testing/openshift/operator-subscription-istio-110-certified.yaml b/operator/seldon-operator/testing/openshift/operator-subscription-istio-110-certified.yaml
@@ -0,0 +1,14 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: seldon-operator-subsription
+  namespace: openshift-operators
+spec:
+  channel: alpha
+  name: seldon-operator-certified
+  source: seldon-operators
+  sourceNamespace: openshift-marketplace  
+  config:
+    env:
+    - name: ISTIO_ENABLED
+      value: "true"