Sync bundle with RedHat repos version (#84)

* sync with redhat repos version

* remove kube-rbac-proxy override from Makefile

Author: mzegla

Makefile

@@ -96,17 +96,17 @@ 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:1.1.0|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
-	sed -i "s|gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0|registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.9.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
 	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:1.1.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
-	sed -i "s|registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.9.0|gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 else
 	echo "Building kubernetes bundle"
 ifeq ($(ADD_NOTEBOOK_K8S), 1)
-	sed -i "s|registry.connect.redhat.com/intel/ovms-operator:1.1.0|$(OPERATOR_IMAGE):$(IMAGE_TAG)|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:12f0c23da8a11e77c4aa58bd38143ab34858405c66936296aaebf21b4e61fd92|gcr.io/kubebuilder/kube-rbac-proxy:v0.8.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
 	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:1.1.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	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|gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0|registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:12f0c23da8a11e77c4aa58bd38143ab34858405c66936296aaebf21b4e61fd92|" 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
 	docker build -t $(BUNDLE_REPOSITORY)-k8s:$(IMAGE_TAG) -f bundle_k8s/Dockerfile bundle_k8s

bundle/manifests/intel.com_model_servers.yaml

@@ -280,7 +280,7 @@ spec:
                       type: string
                 monitoring:
                   type: object
-                  description: >- 
+                  description: >-
                     Configuration of service and model monitoring. This works only for single model mode. For serving multiple models, metrics are enabled via configuration file.
                     Learn more about metrics: https://docs.openvino.ai/latest/ovms_docs_metrics.html#metrics
                   properties:
@@ -290,7 +290,7 @@ spec:
                     metrics_list:
                       type: string
                       description: >-
-                        Comma-separated list of metrics to be enabled. Full list of available metrics can be found on: 
+                        Comma-separated list of metrics to be enabled. Full list of available metrics can be found on:
                         https://docs.openvino.ai/latest/ovms_docs_metrics.html#available-metrics-families
                       default: ""
               x-kubernetes-preserve-unknown-fields: true

bundle/manifests/openvino-operator.clusterserviceversion.yaml

@@ -178,7 +178,7 @@ spec:
             x-descriptors:
               - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
           - description: >-
-              Specify list of metrics to be collected. If left blank, the default set of metrics will be collected. 
+              Specify list of metrics to be collected. If left blank, the default set of metrics will be collected.
               See the full list of available metrics: https://docs.openvino.ai/latest/ovms_docs_metrics.html#available-metrics-families.
             displayName: Collected metrics list
             path: monitoring.metrics_list
@@ -513,7 +513,7 @@ spec:
                 - --upstream=http://127.0.0.1:8080/
                 - --logtostderr=true
                 - --v=10
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+                image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:12f0c23da8a11e77c4aa58bd38143ab34858405c66936296aaebf21b4e61fd92
                 name: kube-rbac-proxy
                 ports:
                 - containerPort: 8443
@@ -524,7 +524,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:1.1.0
+                image: registry.connect.redhat.com/intel/ovms-operator@sha256:d4c8a211f276a8e666917498149aaf8f19c30695552057a509205480ef15e911
                 livenessProbe:
                   httpGet:
                     path: /healthz