update bundle to latest images (#107)

openvinotoolkit · May 24, 2024 · 51b8a2b · 51b8a2b
1 parent 8a6dfb2
commit 51b8a2b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -96,21 +96,21 @@ CATALOG_REPOSITORY ?= registry.toolbox.iotg.sclab.intel.com/cpp/openvino-operato
 bundle_build:
 ifeq ($(TARGET_PLATFORM), openshift)
 	echo "Building openshift bundle"
-	sed -i "s|registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 	docker build -t $(BUNDLE_REPOSITORY):$(IMAGE_TAG) -f bundle/Dockerfile  bundle
-	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 else
 	echo "Building kubernetes bundle"
 ifeq ($(ADD_NOTEBOOK_K8S), 1)
 	sed -i "s|registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:12f0c23da8a11e77c4aa58bd38143ab34858405c66936296aaebf21b4e61fd92|gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
-	sed -i "s|registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 	docker build -t $(BUNDLE_REPOSITORY)-k8s:$(IMAGE_TAG) -f bundle/Dockerfile bundle
-	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 	sed -i "s|gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0|registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:da5714b93ac39277affdc10c3ba142d8c032ed0ddb2ba61c04cbddac710464c4|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 else
-	sed -i "s|quay.io/openvino/ovms-operator:1.1.0|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|quay.io/openvino/ovms-operator:1.2.0|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml
 	docker build -t $(BUNDLE_REPOSITORY)-k8s:$(IMAGE_TAG) -f bundle_k8s/Dockerfile bundle_k8s
-	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|quay.io/openvino/ovms-operator:1.1.0|" bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|quay.io/openvino/ovms-operator:1.2.0|" bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml
 endif
 endif
 

diff --git a/bundle/manifests/intel.com_model_servers.yaml b/bundle/manifests/intel.com_model_servers.yaml
@@ -50,7 +50,7 @@ spec:
                   description: Model Server docker image to be used
                   type: string
                   default: >-
-                    registry.connect.redhat.com/intel/openvino-model-server@sha256:b8721a65da98bd9b354680ecb2dca8a4d60a1097babe9822ab264f8e951190f7
+                    registry.connect.redhat.com/intel/openvino-model-server@sha256:0817c19cfaf2eef85e98b1d1f43f14ad3eacd873b36e7ee3740810ae3b5f60d0
                 deployment_parameters:
                   description: Cluster deployment parameters to be applied to the Model Server
                   type: object

diff --git a/bundle/manifests/openvino-operator.clusterserviceversion.yaml b/bundle/manifests/openvino-operator.clusterserviceversion.yaml
diff --git a/bundle_k8s/Dockerfile b/bundle_k8s/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
 
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
-LABEL com.redhat.openshift.versions="v4.6"
+LABEL com.redhat.openshift.versions="v4.9"
 
 COPY manifests /manifests/
 COPY metadata /metadata/

diff --git a/bundle_k8s/manifests/intel.com_model_servers.yaml b/bundle_k8s/manifests/intel.com_model_servers.yaml
@@ -50,7 +50,7 @@ spec:
                   description: Model Server docker image to be used
                   type: string
                   default: >-
-                    openvino/model_server:2024.0
+                    openvino/model_server:2024.1
                 deployment_parameters:
                   description: Cluster deployment parameters to be applied to the Model Server
                   type: object
@@ -114,6 +114,12 @@ spec:
                             xpu_device_quantity:
                               type: string
                               default: "1"
+                    extra_envs_secret:
+                      type: string
+                      description: Secret name including extra environment variables to be applied in the deployed pods
+                    extra_envs_configmap:
+                      type: string
+                      description: ConfigMap name including extra environment variables to be applied in the deployed pods
                 service_parameters:
                   type: object
                   description: Fill service settings

diff --git a/bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml b/bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml
@@ -15,7 +15,7 @@ metadata:
             "name": "model-server-sample"
           },
           "spec": {
-            "image_name": "openvino/model_server:2024.0",
+            "image_name": "openvino/model_server:2024.1",
             "deployment_parameters": {
               "replicas": 1
             },
@@ -64,7 +64,7 @@ metadata:
           }
         }
       ]
-    containerImage: quay.io/openvino/ovms-operator:1.1.0
+    containerImage: quay.io/openvino/ovms-operator:1.2.0
     capabilities: Basic Install
     categories: "AI/Machine Learning"
     operators.operatorframework.io/builder: operator-sdk-v1.34.1+git
@@ -286,6 +286,18 @@ spec:
             x-descriptors:
               - 'urn:alm:descriptor:com.tectonic.ui:updateStrategy'
               - 'urn:alm:descriptor:com.tectonic.ui:advanced'
+          - description: >-
+              Secret name including extra environment variables to be applied in the deployed pods `oc create secret generic env_secret --from-file envfile.txt`
+            displayName: Extra environment variables form a secret
+            path: deployment_parameters.extra_envs_secret
+            x-descriptors:
+              - 'urn:alm:descriptor:io.kubernetes:Secret'
+          - description: >-
+              ConfigMap name including extra environment variables to be applied in the deployed pods `oc create configmap env_configmap --from-file envfile.txt`
+            displayName: Extra environment variables form a configmap
+            path: deployment_parameters.extra_envs_configmap
+            x-descriptors:
+              - 'urn:alm:descriptor:io.kubernetes:ConfigMap'
           - description: Number of gRPC servers. Default 1. Increase for multi client, high throughput scenarios
             displayName: GRPC workers
             path: server_settings.grpc_workers
@@ -439,7 +451,7 @@ spec:
                   - --leader-elect
                   - --leader-election-id=ovms-operator
                   - --watches-file=watches_k8s.yaml
-                image: quay.io/openvino/ovms-operator:1.1.0
+                image: quay.io/openvino/ovms-operator:1.2.0
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/bundle_k8s/metadata/annotations.yaml b/bundle_k8s/metadata/annotations.yaml
@@ -9,7 +9,7 @@ annotations:
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
-  containerImage: quay.io/openvino/ovms-operator:1.1.0
+  containerImage: quay.io/openvino/ovms-operator:1.2.0
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1