From 51b8a2b9829e189e76286dc0982b865ffb1c7724 Mon Sep 17 00:00:00 2001 From: "Trawinski, Dariusz" Date: Fri, 24 May 2024 08:32:43 +0200 Subject: [PATCH] update bundle to latest images (#107) --- Makefile | 12 ++++----- bundle/manifests/intel.com_model_servers.yaml | 2 +- ...envino-operator.clusterserviceversion.yaml | 27 ++++++++++++++++--- bundle_k8s/Dockerfile | 4 +-- .../manifests/intel.com_model_servers.yaml | 8 +++++- ...envino-operator.clusterserviceversion.yaml | 18 ++++++++++--- bundle_k8s/metadata/annotations.yaml | 2 +- 7 files changed, 55 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index dba4a35..a6d9ce3 100644 --- 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 index f9e5ad9..adc29a9 100644 --- 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 index eaaac8f..0bce714 100644 --- a/bundle/manifests/openvino-operator.clusterserviceversion.yaml +++ b/bundle/manifests/openvino-operator.clusterserviceversion.yaml @@ -16,7 +16,7 @@ metadata: "name": "model-server-sample" }, "spec": { - "image_name": "registry.connect.redhat.com/intel/openvino-model-server@sha256:b8721a65da98bd9b354680ecb2dca8a4d60a1097babe9822ab264f8e951190f7", + "image_name": "registry.connect.redhat.com/intel/openvino-model-server@sha256:0817c19cfaf2eef85e98b1d1f43f14ad3eacd873b36e7ee3740810ae3b5f60d0", "deployment_parameters": { "replicas": 1 }, @@ -68,16 +68,28 @@ metadata: "apiVersion": "intel.com/v1alpha1", "kind": "Notebook", "metadata": { - "name": "v2024" + "name": "v2024.1" }, "spec": { - "git_ref": "main", + "git_ref": "2024.1", "auto_update_image": false } } ] capabilities: Basic Install categories: "AI/Machine Learning" + description: OpenVINO Toolkit Operator manages OpenVINO components in OpenShift + containerImage: registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4 + createdAt: "2024-05-14T09:29:35Z" + support: Intel + operators.openshift.io/valid-subscription: "Not required" + features.operators.openshift.io/disconnected: "false" + features.operators.openshift.io/fips-compliant: "false" + features.operators.openshift.io/proxy-aware: "true" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" operators.operatorframework.io/builder: operator-sdk-v1.34.1+git operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1 name: openvino-operator.v1.2.0 @@ -414,6 +426,13 @@ spec: OpenVINO Model Server Operator on [Github](https://github.com/openvinotoolkit/operator) + relatedImages: + - name: kube-rbac-proxy + image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:da5714b93ac39277affdc10c3ba142d8c032ed0ddb2ba61c04cbddac710464c4 + - name: openvino-operator + image: registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4 + - name: openvino-model-server + image: registry.connect.redhat.com/intel/openvino-model-server@sha256:0817c19cfaf2eef85e98b1d1f43f14ad3eacd873b36e7ee3740810ae3b5f60d0 displayName: OpenVINO Toolkit Operator icon: - base64data: iVBORw0KGgoAAAANSUhEUgAAAcMAAAEMCAYAAAC4ON2/AAAEGWlDQ1BrQ0dDb2xvclNwYWNlR2VuZXJpY1JHQgAAOI2NVV1oHFUUPrtzZyMkzlNsNIV0qD8NJQ2TVjShtLp/3d02bpZJNtoi6GT27s6Yyc44M7v9oU9FUHwx6psUxL+3gCAo9Q/bPrQvlQol2tQgKD60+INQ6Ium65k7M5lpurHeZe58853vnnvuuWfvBei5qliWkRQBFpquLRcy4nOHj4g9K5CEh6AXBqFXUR0rXalMAjZPC3e1W99Dwntf2dXd/p+tt0YdFSBxH2Kz5qgLiI8B8KdVy3YBevqRHz/qWh72Yui3MUDEL3q44WPXw3M+fo1pZuQs4tOIBVVTaoiXEI/MxfhGDPsxsNZfoE1q66ro5aJim3XdoLFw72H+n23BaIXzbcOnz5mfPoTvYVz7KzUl5+FRxEuqkp9G/Ajia219thzg25abkRE/BpDc3pqvphHvRFys2weqvp+krbWKIX7nhDbzLOItiM8358pTwdirqpPFnMF2xLc1WvLyOwTAibpbmvHHcvttU57y5+XqNZrLe3lE/Pq8eUj2fXKfOe3pfOjzhJYtB/yll5SDFcSDiH+hRkH25+L+sdxKEAMZahrlSX8ukqMOWy/jXW2m6M9LDBc31B9LFuv6gVKg/0Szi3KAr1kGq1GMjU/aLbnq6/lRxc4XfJ98hTargX++DbMJBSiYMIe9Ck1YAxFkKEAG3xbYaKmDDgYyFK0UGYpfoWYXG+fAPPI6tJnNwb7ClP7IyF+D+bjOtCpkhz6CFrIa/I6sFtNl8auFXGMTP34sNwI/JhkgEtmDz14ySfaRcTIBInmKPE32kxyyE2Tv+thKbEVePDfW/byMM1Kmm0XdObS7oGD/MypMXFPXrCwOtoYjyyn7BV29/MZfsVzpLDdRtuIZnbpXzvlf+ev8MvYr/Gqk4H/kV/G3csdazLuyTMPsbFhzd1UabQbjFvDRmcWJxR3zcfHkVw9GfpbJmeev9F08WW8uDkaslwX6avlWGU6NRKz0g/SHtCy9J30o/ca9zX3Kfc19zn3BXQKRO8ud477hLnAfc1/G9mrzGlrfexZ5GLdn6ZZrrEohI2wVHhZywjbhUWEy8icMCGNCUdiBlq3r+xafL549HQ5jH+an+1y+LlYBifuxAvRN/lVVVOlwlCkdVm9NOL5BE4wkQ2SMlDZU97hX86EilU/lUmkQUztTE6mx1EEPh7OmdqBtAvv8HdWpbrJS6tJj3n0CWdM6busNzRV3S9KTYhqvNiqWmuroiKgYhshMjmhTh9ptWhsF7970j/SbMrsPE1suR5z7DMC+P/Hs+y7ijrQAlhyAgccjbhjPygfeBTjzhNqy28EdkUh8C+DU9+z2v/oyeH791OncxHOs5y2AtTc7nb/f73TWPkD/qwBnjX8BoJ98VQNcC+8AAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAAcOgAwAEAAAAAQAAAQwAAAAANYIg6gAAOc1JREFUeAHtnQfcHUX1vyeQEAIEAkFA6QgCEqQpIKgURRFBUAGJ0otUaVJ/0lQUpKp0QQEBBRVBQKmCgAWkigICmtCkGWoglbD/86ze/O/7vvfePbt3986b7Hc+n+S9d+/szOwzs3OmnHNmSGIhKIiACIiACIhAjQnMUeNn16OLgAiIgAiIQEpAwlANQQREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEJAxr3wQEQAREQAREQMJQbUAEREAERKD2BCQMa98EBEAEREAEREDCUG1ABERABESg9gQkDGvfBARABERABERAwlBtQAREQAREoPYEhsYgMGXKlDBu3Ljw1FNPhUceeST8/e9/D4899lj4xz/+EV599dUBRVpiiSXCCiusEFZeeeUwZsyYsNJKK4WllloqLLPMMmHOOeccEF8XRGBWJPCf//wnTJo0KbPow4YNC+95z3sy4/UywhtvvNHy3W1VhsUXXzwMHfrfrmfGjBnh2WefbRVtwLXm+wb8+L8LL7/8cnjzzTfb/dzn+hxzzBGWXHLJPtdiffGWe9SoUWGBBRaIVczw9ttvp/32008/HZ544onw8MMPh3/+859pf07/3Rzmm2++sNxyy6X/3ve+94X3v//9aT++9NJLB+qy7EDZ/v3vf/dJdsSIEWHBBRcMzz33XBg+fHhYbLHF0t/feuutMGHChDBy5Miw0EIL/feepEfBhFxyyy23JEceeWRiYBLLvet/66yzTnLCCSckd911V2KdSI+eRNmIQDUEfvnLX7reCRscJiZ8qilEwVR/8IMfuMr+8Y9/PLFOa2YuPId1mq576UOywjnnnONKi/6HfO+///6sJHvy+w9/+ENXua+++uqelKc5ExtcJH/84x+T448/PllrrbVc5czq3z/xiU8ktJkHHnggmTZtWnN2hT/TPj784Q8nJnTTMiIfKLMJwvT7Bz7wgWTq1Klp+hdeeGF67aKLLpqZX5j5qYIP77zzTvLXv/41LdAiiyxSCsR2kAFw1llnJePHj6/gSZSkCFRP4KWXXkpsFOt6T26//fbqC+TMgc7M20lecsklfVKNKQzpSz75yU8mdPaxw2AUhrZal5x++unJe9/7XlebbNc3Z11HgP3oRz9KhVYZ9XDnnXcmtnIyU/A1hCHvFhMn2uvHPvaxBJnULAwr2TO0BwqWadh9993DaqutFo466qhgL7oxqS6w3LrvvvuGVVddNdjsM11yrS43pSwC5RN417veFbbddltXwr/+9a9d8XoR6cEHHwz33XefK6v11lvPFa9XkW666aZggqhX2c0S+VCfBx54YFhxxRXDQQcdFP71r39VWu4///nPYbfddgurrLJK+Na3vpUuuXaTIfKnVTjiiCPCr371q/Doo4+mz/bBD36wT7TSheHjjz8e9t5772DSPvz4xz/uk1kvvrBfcOKJJ4YPfehD4Zvf/GZ44YUXepGt8hCBUghstdVWrnQuvfTS8Prrr7viVh3ptttuc2WBoGcPabCFgw8+ONhy6WArVs/Lgw7HIYccEtZYY43w/e9/v+f5oy9yzDHHBITUSSedlO7plVmIzTbbLPDeMPj54he/GGzlsk/ypQlDNv7PPPPMYMsl4bzzzuuTSYwvCMVjjz02bLTRRsH2YtKN3xjlUJ4ikIcAg0gUxrICKy2MqGMH3ntb4nIVgw5osAZmQChV1DHYsmGwPbTArP3UU0+NjgChePjhh4eNN944XHfddQElqzIC7xWDzT/96U/ps/ZPsxRhyGxwu+22C1/96lfdmlz9C1LVdzScttlmm3QJteql2qqeQenWhwCagrxLnnDVVVd5olUahxkV778nrLvuup5oUeLccccd6WA+SuYRM2U2uOOOO4Zdd9011biMWJQBWf/tb38LW2yxRfja174W0LYtGpqXTceOHRt23nnngJbpgNDthuVvfvObdCPSEq50k7WM9NEmsr2Nbh9Z94tA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kwiIgAiIQD0ISBjWo571lCIgAiIgAh0ISBh2gKOfREAEREAE6kFAwrAe9aynFAEREAER6EBAwrADHP0kAiIgAiJQDwIShvWoZz2lCIiACIhABwIShh3g6CcREAEREIF6EJAwrEc96ylFQAREQAQ6EJAw7ABHP4mACIiACNSDgIRhPepZTykCIiACItCBgIRhBzj6SQREQAREoB4EJAzrUc96ShEQAREQgQ4EJAw7wNFPIiACIiAC9SAgYViPetZTioAIiIAIdCAgYdgBTtZPSZJkRQnTp08PnniZCSmCCIiACIhAZQSGWEed3aNXlr0SFgEREAEREIH4BDQzjF8HKoEIiIAIiEBkAhKGkStA2YuACIiACMQnIGEYvw5UAhEQAREQgcgEJAwjV4CyFwEREAERiE9AwjB+HagEIiACIiACkQlIGEauAGUvAiIgAiIQn4CEYfw6UAlEQAREQAQiE5AwjFwByl4EREAERCA+AQnD+HWgEoiACIiACEQmIGEYuQKUvQiIgAiIQHwCEobx60AlEAEREAERiExAwjByBSh7ERABERCB+AQkDOPXgUogAiIgAiIQmYCEYeQKUPYiIAIiIALxCUgYxq8DlUAEREAERCAyAQnDyBWg7EVABERABOITkDCMXwcqgQiIgAiIQGQCEoaRK0DZi4AIiIAIxCcgYRi/DlQCERABERCByAQkDCNXgLIXAREQARGIT0DCMH4dqAQiIAIiIAKRCUgYRq4AZS8CIiACIhCfgIRh/DpQCURABERABCITkDCMXAHKXgREQAREID4BCcP4daASiIAIiIAIRCYgYRi5ApS9CIiACIhAfAIShvHrQCUQAREQARGITEDCMHIFKHsREAEREIH4BCQM49eBSiACIiACIhCZgIRh5ApQ9iIgAiIgAvEJSBjGrwOVQAREQAREIDIBCcPIFaDsRUAEREAE4hOQMIxfByqBCIiACIhAZAIShpErQNmLgAiIgAjEJyBhGL8OVAIREAEREIHIBCQMI1eAshcBERABEYhPQMIwfh2oBCIgAiIgApEJSBhGrgBlLwIiIAIiEJ+AhGH8OlAJREAEREAEIhOQMIxcAcpeBERABEQgPgEJw/h1oBKIgAiIgAhEJiBhGLkClL0IiIAIiEB8AhKG8etAJRABERABEYhMQMIwcgUoexEQAREQgfgEJAzj14FKIAIiIAIiEJmAhGHkClD2IiACIiAC8QlIGMavA5VABERABEQgMgEJw8gVoOxFQAREQATiE5AwjF8HKoEIiIAIiEBkAhKGkStA2YuACIiACMQnIGEYvw5UAhEQAREQgcgEJAwjV4CyFwEREAERiE9AwjB+HagEIiACIiACkQlIGEauAGUvAiIgAiIQn4CEYfw6UAlEQAREQAQiE5AwjFwByl4EREAERCA+AQnD+HWgEoiACIiACEQmIGEYuQKUvQiIgAiIQHwCEobx60AlEAEREAERiExAwjByBSh7ERABERCB+AQkDOPXgUogAiIgAiIQmYCEYeQKUPYiIAIiIALxCUgYxq8DlUAEREAERCAyAQnDyBWg7EVABERABOITkDCMXwcqgQiIgAiIQGQCEoaRK0DZi4AIiIAIxCcgYRi/DlQCERABERCByAQkDCNXgLIXAREQARGIT0DCMH4dqAQiIAIiIAKRCUgYRq4AZS8CIiACIhCfgIRh/DpQCURABERABCITkDCMXAHKXgREQAREID4BCcP4daASiIAIiIAIRCYgYRi5ApS9CIiACIhAfAIShvHrQCUQAREQARGITEDCMHIFKHsREAEREIH4BCQM49eBSiACIiACIhCZgIRh5ApQ9iIgAiIgAvEJSBjGrwOVQAREQAREIDIBCcPIFaDsRUAEREAE4hOQMIxfByqBCIiACIhAZAIShpErQNmLgAiIgAjEJyBhGL8OVAIREAEREIHIBCQMI1eAshcBERABEYhPQMIwfh2oBCIgAiIgApEJSBhGrgBlLwIiIAIiEJ+AhGH8OlAJREAEREAEIhOQMIxcAcpeBERABEQgPgEJw/h1oBKIgAiIgAhEJiBhGLkClL0IiIAIiEB8Av8PFQdL4ZmmqdYAAAAASUVORK5CYII= @@ -536,7 +555,7 @@ spec: - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - --leader-election-id=ovms-operator - image: registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911 + image: registry.connect.redhat.com/intel/ovms-operator@sha256:9049f5d4e3c764fdca057b60e41ea62c3ca49207433f593668091850d27977d4 livenessProbe: httpGet: path: /healthz diff --git a/bundle_k8s/Dockerfile b/bundle_k8s/Dockerfile index 09ef413..9d55169 100644 --- 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 index d421c7c..a6496d0 100644 --- 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 index 0dcf9e3..f7d6910 100644 --- 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 index d104f21..eb9c06e 100644 --- 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