RedHat 1.6.0 release

SeldonIO · Feb 26, 2021 · 9539784 · 9539784
1 parent 8b4ce4a
commit 9539784
Show file tree

Hide file tree

Showing 34 changed files with 19,061 additions and 966 deletions.
diff --git a/operator/Dockerfile.redhat b/operator/Dockerfile.redhat
@@ -23,7 +23,7 @@ RUN go build -a -o manager main.go
 # Get MPL licensed dependencies
 RUN wget -O hashicorp-golang-lru.tar.gz https://github.com/hashicorp/golang-lru/archive/master.tar.gz
 RUN wget -O armon-consul-api.tar.gz https://github.com/armon/consul-api/archive/master.tar.gz
-RUN wget -O hasicorp-hcl.tar.gz https://github.com/hashicorp/hcl/archive/master.tar.gz
+RUN wget -O hasicorp-hcl.tar.gz https://github.com/hashicorp/hcl/archive/v2.8.2.tar.gz
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal
 LABEL name="Seldon Operator" \

diff --git a/operator/Makefile b/operator/Makefile
@@ -151,9 +151,6 @@ create-client: test
 docker-build: test generate-resources
 	docker build . -t ${IMG}
 
-# Build the docker image for Redhat
-docker-build-redhat: test generate-resources
-	docker build . -f Dockerfile.redhat -t ${IMG_REDHAT}
 
 
 # Push the docker image
@@ -164,14 +161,6 @@ docker-push:
 docker-push-redhat:
 	docker push ${IMG_REDHAT}
 
-# password can be found at: https://connect.redhat.com/project/1366481/view
-redhat-image-scan:
-	docker pull ${IMG_REDHAT}
-	source ~/.config/seldon/seldon-core/redhat-image-passwords.sh && \
-		echo $${rh_password_operator} | docker login -u unused scan.connect.redhat.com --password-stdin
-	docker tag ${IMG_REDHAT} scan.connect.redhat.com/ospid-7f50cebe-122b-495a-a143-41426dfcb6c9/${IMG_VERSION_REDHAT}
-	docker push scan.connect.redhat.com/ospid-7f50cebe-122b-495a-a143-41426dfcb6c9/${IMG_VERSION_REDHAT}
-
 kind-image-install: docker-build
 	kind load -v 3 docker-image ${IMG} --name ${KIND_NAME}
 
@@ -270,9 +259,11 @@ update_packagemanifests:
 	mv packagemanifests/${VERSION}/seldon-operator.clusterserviceversion.yaml packagemanifests/${VERSION}/seldon-operator.v${VERSION}.clusterserviceversion.yaml
 
 
-.PHONY: clear_replaces
-clear_replaces:
-	sed -i '/replaces:.*/d' packagemanifests/${VERSION}/seldon-operator.v${VERSION}.clusterserviceversion.yaml
+# Not sure why clearing of replaces was added
+#.PHONY: clear_replaces
+#clear_replaces:
+#	sed -i '/replaces:.*/d' packagemanifests/${VERSION}/seldon-operator.v${VERSION}.clusterserviceversion.yaml
+
 #
 # Tested with operator-courier 2.1.10
 #
@@ -288,16 +279,20 @@ create_push_bundle_image:
 validate_bundle_image:
 	operator-sdk bundle validate quay.io/seldon/seldon-operator:v${VERSION}
 
+
+# Only index up to 1.2.2 as we have removed "replaces" in 1.2.2 to stop chain there for testing
+.PHONY: opm_index
 opm_index:
-	opm index add -c docker --bundles quay.io/seldon/seldon-operator:v${VERSION} --tag quay.io/seldon/test-catalog:latest
+	opm index add -c docker --bundles quay.io/seldon/seldon-operator:v${VERSION},quay.io/seldon/seldon-operator:v1.5.0,quay.io/seldon/seldon-operator:v1.2.2
 
 
 opm_push:
 	docker push quay.io/seldon/test-catalog:latest
 
 
 .PHONY: update_openshift
-update_openshift: recreate_bundle  update_packagemanifests clear_replaces create_push_bundle_image validate_bundle_image opm_index opm_push
+#update_openshift: recreate_bundle  update_packagemanifests clear_replaces create_push_bundle_image validate_bundle_image opm_index opm_push
+update_openshift: recreate_bundle  update_packagemanifests create_push_bundle_image validate_bundle_image opm_index opm_push
 
 
 #
@@ -337,7 +332,7 @@ create_certified_bundle:
 	cd ${PKG_CERT} && opm alpha bundle generate -c stable -e stable -p seldon-operator-certified -d ./${VERSION}/ -u ./${VERSION}/
 	mv ${PKG_CERT}/bundle.Dockerfile ${PKG_CERT}/bundle-${VERSION}.Dockerfile
 	echo '' >> ${PKG_CERT}/bundle-${VERSION}.Dockerfile
-	echo 'LABEL com.redhat.openshift.versions="v4.5,v4.6"' >> ${PKG_CERT}/bundle-${VERSION}.Dockerfile
+	echo 'LABEL com.redhat.openshift.versions="v4.5,v4.6,v4.7"' >> ${PKG_CERT}/bundle-${VERSION}.Dockerfile
 	echo 'LABEL com.redhat.delivery.backport=true' >> ${PKG_CERT}/bundle-${VERSION}.Dockerfile
 	echo 'LABEL com.redhat.delivery.operator.bundle=true' >> ${PKG_CERT}/bundle-${VERSION}.Dockerfile
 	mv ${PKG_CERT}/${VERSION}/seldon-operator.clusterserviceversion.yaml ${PKG_CERT}/${VERSION}/seldon-operator.v${VERSION}.clusterserviceversion.yaml
@@ -358,13 +353,30 @@ validate_bundle_image_certified:
 	operator-sdk bundle validate quay.io/seldon/seldon-operator-certified:v${VERSION}
 
 
+# beware --mode semver seems to cause old versions to be shown in openshift. Not sure why. 
 opm_index_certified:
-	opm index add -c docker --bundles quay.io/seldon/seldon-operator-certified:v${VERSION},quay.io/seldon/seldon-operator-certified:v1.2.2,quay.io/seldon/seldon-operator-certified:v1.2.1,quay.io/seldon/seldon-operator-certified:v1.2.0,quay.io/seldon/seldon-operator-certified:v1.1.0,quay.io/seldon/seldon-operator-certified:v0.1.5 --mode semver --tag quay.io/seldon/test-catalog-certified:latest
+	opm index add -c docker --bundles quay.io/seldon/seldon-operator-certified:v${VERSION},quay.io/seldon/seldon-operator-certified:v1.5.0,quay.io/seldon/seldon-operator-certified:v1.2.2,quay.io/seldon/seldon-operator-certified:v1.2.1,quay.io/seldon/seldon-operator-certified:v1.2.0,quay.io/seldon/seldon-operator-certified:v1.1.0,quay.io/seldon/seldon-operator-certified:v0.1.5 --mode replaces --tag quay.io/seldon/test-catalog-certified:latest
 
 
 opm_push_certified:
 	docker push quay.io/seldon/test-catalog-certified:latest
 
+
+# Build the docker image for Redhat
+docker-build-redhat: test generate-resources
+	docker build . -f Dockerfile.redhat -t ${IMG_REDHAT}
+
+
+# password can be found at: https://connect.redhat.com/project/1366481/view
+redhat-image-scan:
+	docker pull ${IMG_REDHAT}
+	source ~/.config/seldon/seldon-core/redhat-image-passwords.sh && \
+		echo $${rh_password_operator} | docker login -u unused scan.connect.redhat.com --password-stdin
+	docker tag ${IMG_REDHAT} scan.connect.redhat.com/ospid-7f50cebe-122b-495a-a143-41426dfcb6c9/${IMG_VERSION_REDHAT}
+	docker push scan.connect.redhat.com/ospid-7f50cebe-122b-495a-a143-41426dfcb6c9/${IMG_VERSION_REDHAT}
+
+
+
 bundle_certified_push:
 	source ~/.config/seldon/seldon-core/redhat-image-passwords.sh && \
 		echo $${rh_password_operator_bundle} | docker login -u unused scan.connect.redhat.com --password-stdin
@@ -377,6 +389,8 @@ update_old_certified_packages:
 update_openshift_certified: update_old_certified_packages create_certified_bundle create_bundle_image_certified push_bundle_image_certified validate_bundle_image_certified opm_index_certified opm_push_certified 
 
 # Run last to prepare for future release
-PREV_VERSION=1.2.2
+PREV_VERSION=1.5.0
 update_config:
 	sed -i s#${PREV_VERSION}#${VERSION}# config/manifests/bases/seldon-operator.clusterserviceversion.yaml
+
+
diff --git a/operator/bundle/manifests/machinelearning.seldon.io_seldondeployments.yaml b/operator/bundle/manifests/machinelearning.seldon.io_seldondeployments.yaml
@@ -3950,6 +3950,12 @@ spec:
                                             properties:
                                               endpoint:
                                                 properties:
+                                                  grpcPort:
+                                                    format: int32
+                                                    type: integer
+                                                  httpPort:
+                                                    format: int32
+                                                    type: integer
                                                   service_host:
                                                     type: string
                                                   service_port:
@@ -3999,6 +4005,12 @@ spec:
                                           type: array
                                         endpoint:
                                           properties:
+                                            grpcPort:
+                                              format: int32
+                                              type: integer
+                                            httpPort:
+                                              format: int32
+                                              type: integer
                                             service_host:
                                               type: string
                                             service_port:
@@ -4048,6 +4060,12 @@ spec:
                                     type: array
                                   endpoint:
                                     properties:
+                                      grpcPort:
+                                        format: int32
+                                        type: integer
+                                      httpPort:
+                                        format: int32
+                                        type: integer
                                       service_host:
                                         type: string
                                       service_port:
@@ -4097,6 +4115,12 @@ spec:
                               type: array
                             endpoint:
                               properties:
+                                grpcPort:
+                                  format: int32
+                                  type: integer
+                                httpPort:
+                                  format: int32
+                                  type: integer
                                 service_host:
                                   type: string
                                 service_port:

diff --git a/operator/bundle/manifests/seldon-operator.clusterserviceversion.yaml b/operator/bundle/manifests/seldon-operator.clusterserviceversion.yaml
@@ -25,7 +25,7 @@ metadata:
                     "spec": {
                       "containers": [
                         {
-                          "image": "seldonio/mock_classifier:1.5.0",
+                          "image": "seldonio/mock_classifier:1.6.0",
                           "name": "classifier"
                         }
                       ]
@@ -48,14 +48,14 @@ metadata:
     capabilities: Seamless Upgrades
     categories: AI/Machine Learning
     certified: 'false'
-    containerImage: seldonio/seldon-core-operator:1.5.0
+    containerImage: seldonio/seldon-core-operator:1.6.0
     createdAt: '2019-05-21 15:00:00'
     description: The Seldon operator for management, monitoring and operations of machine learning systems through the Seldon Engine. Once installed, the Seldon Operator provides multiple functions which facilitate the productisation, monitoring and maintenance of machine learning systems at scale.
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/SeldonIO/seldon-core
     support: Clive Cox
-  name: seldon-operator.v1.5.0
+  name: seldon-operator.v1.6.0
   namespace: seldon-operator-system
 spec:
   apiservicedefinitions: {}
@@ -460,7 +460,7 @@ spec:
                 - name: AMBASSADOR_SINGLE_NAMESPACE
                   value: 'false'
                 - name: ENGINE_CONTAINER_IMAGE_AND_VERSION
-                  value: docker.io/seldonio/engine:1.5.0
+                  value: docker.io/seldonio/engine:1.6.0
                 - name: ENGINE_CONTAINER_IMAGE_PULL_POLICY
                   value: IfNotPresent
                 - name: ENGINE_CONTAINER_SERVICE_ACCOUNT_NAME
@@ -489,7 +489,7 @@ spec:
                 - name: USE_EXECUTOR
                   value: 'true'
                 - name: EXECUTOR_CONTAINER_IMAGE_AND_VERSION
-                  value: seldonio/seldon-core-executor:1.5.0
+                  value: seldonio/seldon-core-executor:1.6.0
                 - name: EXECUTOR_CONTAINER_IMAGE_PULL_POLICY
                   value: IfNotPresent
                 - name: EXECUTOR_PROMETHEUS_PATH
@@ -520,7 +520,7 @@ spec:
                   value: '0.5'
                 - name: ENGINE_DEFAULT_MEMORY_LIMIT
                   value: 512Mi
-                image: seldonio/seldon-core-operator:1.5.0
+                image: seldonio/seldon-core-operator:1.6.0
                 name: manager
                 ports:
                 - containerPort: 8443
@@ -593,8 +593,8 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Seldon Technologies
-  replaces: seldon-operator.v1.2.2
+  replaces: seldon-operator.v1.5.0
   selector:
     matchLabels:
       name: seldon-operator
-  version: 1.5.0
+  version: 1.6.0
diff --git a/operator/config/manifests/bases/seldon-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/seldon-operator.clusterserviceversion.yaml
@@ -19,7 +19,7 @@ metadata:
                     "spec": {
                       "containers": [
                         {
-                          "image": "seldonio/mock_classifier:1.5.0-dev",
+                          "image": "seldonio/mock_classifier:1.6.0-dev",
                           "name": "classifier"
                         }
                       ]
@@ -41,15 +41,15 @@ metadata:
     capabilities: Seamless Upgrades
     categories: AI/Machine Learning
     certified: "false"
-    containerImage: seldonio/seldon-core-operator:1.2.2
+    containerImage: seldonio/seldon-core-operator:1.6.0
     createdAt: "2019-05-21 15:00:00"
     description: The Seldon operator for management, monitoring and operations of
       machine learning systems through the Seldon Engine. Once installed, the Seldon
       Operator provides multiple functions which facilitate the productisation, monitoring
       and maintenance of machine learning systems at scale.
     repository: https://github.com/SeldonIO/seldon-core
     support: Clive Cox
-  name: seldon-operator.v1.2.2
+  name: seldon-operator.v1.6.0
   namespace: seldon-operator-system
 spec:
   apiservicedefinitions: {}
@@ -664,7 +664,7 @@ spec:
                 - name: AMBASSADOR_SINGLE_NAMESPACE
                   value: "false"
                 - name: ENGINE_CONTAINER_IMAGE_AND_VERSION
-                  value: docker.io/seldonio/engine:1.2.2
+                  value: docker.io/seldonio/engine:1.6.0
                 - name: ENGINE_CONTAINER_IMAGE_PULL_POLICY
                   value: IfNotPresent
                 - name: ENGINE_CONTAINER_SERVICE_ACCOUNT_NAME
@@ -691,7 +691,7 @@ spec:
                 - name: USE_EXECUTOR
                   value: "true"
                 - name: EXECUTOR_CONTAINER_IMAGE_AND_VERSION
-                  value: seldonio/seldon-core-executor:1.2.2
+                  value: seldonio/seldon-core-executor:1.6.0
                 - name: EXECUTOR_CONTAINER_IMAGE_PULL_POLICY
                   value: IfNotPresent
                 - name: EXECUTOR_PROMETHEUS_PATH
@@ -706,7 +706,7 @@ spec:
                 - name: EXECUTOR_REQUEST_LOGGER_DEFAULT_ENDPOINT
                   value: http://default-broker
                 - name: DEFAULT_USER_ID
-                image: seldonio/seldon-core-operator:1.2.2
+                image: seldonio/seldon-core-operator:1.6.0
                 name: manager
                 ports:
                 - containerPort: 8443
@@ -779,8 +779,8 @@ spec:
   minKubeVersion: 1.16.0
   provider:
     name: Seldon Technologies
-  replaces: seldon-operator.v1.2.1
+  replaces: seldon-operator.v1.6.0
   selector:
     matchLabels:
       name: seldon-operator
-  version: 1.2.2
+  version: 1.6.0
diff --git a/operator/config/openshift/patch_manager_env.yaml b/operator/config/openshift/patch_manager_env.yaml
@@ -6,6 +6,7 @@ metadata:
 spec:
   template:
     spec:
+      securityContext:
       containers:
       - env:
         - name: MANAGER_CREATE_RESOURCES

diff --git a/operator/config/samples/model.json b/operator/config/samples/model.json
@@ -13,7 +13,7 @@
 	    "spec": {
 	      "containers": [
 		{
-		  "image": "seldonio/mock_classifier:1.5.0",
+		  "image": "seldonio/mock_classifier:1.6.0",
 		  "name": "classifier"
 		}
 	      ]