Adjustmentes for k8s bundle and operator image (#57)

Author: dtrawins

bundle_k8s/manifests/intel.com_model_servers.yaml

@@ -41,7 +41,7 @@ spec:
             metadata:
               type: object
             spec:
-              description: Spec defines the desired state of Ovms
+              description: Spec defines the desired state of the Model Server
               type: object
               required:
                 - image_name
@@ -50,7 +50,7 @@ spec:
                   description: Model Server docker image to be used
                   type: string
                   default: >-
-                    registry.connect.redhat.com/intel/openvino-model-server:latest
+                    openvino/model_server:2022.1
                 deployment_parameters:
                   description: Cluster deployment parameters to be applied to the Model Server
                   type: object
@@ -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:

bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml

@@ -66,7 +66,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
@@ -292,7 +292,7 @@ spec:
               - 'urn:alm:descriptor:com.tectonic.ui:advanced'
         version: v1alpha1
   description: |
-    OpenVINO Toolkit Operator manages OpenVINO components in OpenShift.
+    OpenVINO Toolkit Operator manages OpenVINO components in Kubernetes.
 
     Currently there available components are ModelServer.
 
@@ -425,7 +425,7 @@ spec:
                   - --metrics-bind-address=127.0.0.1:8080
                   - --leader-elect
                   - --leader-election-id=ovms-operator
-                  - --watches-file watches_k8s.yaml
+                  - --watches-file=watches_k8s.yaml
                 image: quay.io/openvino/ovms-operator:1.0.0
                 livenessProbe:
                   httpGet:
@@ -500,9 +500,13 @@ 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
+  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_k8s/metadata/annotations.yaml

@@ -5,12 +5,12 @@ 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"

docker/Dockerfile

@@ -44,7 +44,7 @@ LABEL name="OpenVINO toolkit operator" \
       version="1.0.0" \
       release="1.0" \
       summary="OpenVINO(TM) Toolkit Operator" \
-      description="An Operator for managing OpenVINO Toolkit in OpenShift"
+      description="An Operator for managing OpenVINO Toolkit in OpenShift and Kubernetes"
 
 ENV HOME=/opt/openvino \
     USER_NAME=openvino \
@@ -63,4 +63,4 @@ COPY LICENSE .
 COPY licenses /licenses
 
 USER ${USER_UID}
-ENTRYPOINT ["/usr/local/bin/openvino-operator", "run", "--watches-file=./watches.yaml"]
+ENTRYPOINT ["/usr/local/bin/openvino-operator", "run"]