fixes for bundle (#47)

* tests fixes for bundle

* review changes

* bundle corrections

Author: dtrawins

Makefile

@@ -89,16 +89,16 @@ 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:0.2.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.8.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|registry.connect.redhat.com/intel/ovms-operator:1.0.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
 	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:0.2.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
-	sed -i "s|registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.8.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:1.0.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
 else
 	echo "Building kubernetes bundle"
 	sed -i "s|registry.connect.redhat.com/intel/ovms-operator:0.2.0|$(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:0.2.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
+	sed -i "s|$(OPERATOR_IMAGE):$(IMAGE_TAG)|registry.connect.redhat.com/intel/ovms-operator:1.0.0|" bundle/manifests/openvino-operator.clusterserviceversion.yaml
 endif
 
 bundle_push:

bundle/manifests/intel.com_model_servers.yaml

@@ -253,8 +253,8 @@ spec:
                         In openshift, you might need to create Security Context Constraints to allow grant permissions for changing the context.
                       type: string
                     runAsGroup:
-                       type: string
-                       description: >-
+                      type: string
+                      description: >-
                          Set the group ID if access to the model repository is restricted. Model server will start with this security context.
                          In openshift, you might need to create Security Context Constraints to allow grant permissions for changing the context.
                     aws_secret_access_key:
@@ -297,4 +297,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-

bundle/manifests/intel.com_notebooks.yaml

@@ -38,7 +38,7 @@ spec:
                   type: boolean
                   default: false
                 latest_update_date:
-                  description: The date of the latest notebooks update in format Year-Month-Day. Not used if auto_update_image not set. 
+                  description: The date of the latest notebooks update in format Year-Month-Day. Not used if auto_update_image not set
                   type: string
                 commit:
                   description: Git commit reference in notebook repository to build the docker image

bundle/manifests/openvino-operator-controller-manager_v1_serviceaccount.yaml

@@ -78,7 +78,7 @@ metadata:
       ]
     capabilities: Basic Install
     categories: "AI/Machine Learning"
-    operators.operatorframework.io/builder: operator-sdk-v1.7.1+git
+    operators.operatorframework.io/builder: operator-sdk-v1.19.1+git
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
   name: openvino-operator.v1.0.0
   namespace: placeholder
@@ -511,7 +511,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:0.2.0
+                image: registry.connect.redhat.com/intel/ovms-operator:1.0.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -585,9 +585,15 @@ spec:
   - AI Inference OpenVINO
   links:
   - name: OpenVINO Toolkit Operator
-    url: https://github.com/openvinotoolkit/openshift_operator
+    url: https://github.com/openvinotoolkit/operator
+  - name: OpenVINO Model Server
+    url: https://github.com/openvinotoolkit/model_server
+  - name: OpenVINO Notebooks
+    url: https://github.com/openvinotoolkit/openvino_notebooks
+  maintainers:
+  - name: Operator Support
+    email: openvino-operator-support@intel.com
   maturity: alpha
   provider:
     name: Intel
-    url: https://github.com/openvinotoolkit/model_server
   version: 1.0.0

bundle/manifests/openvino-operator.clusterserviceversion.yaml

@@ -5,12 +5,13 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: ovms-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.7.1+git
+  operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.19.1+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 
-  com.redhat.openshift.versions: "v4.6"
+  com.redhat.openshift.versions: "v4.9"