Update to 1.0.0 upload changes. (#58)

* Update to 1.0.0 upload changes.

Co-authored-by: Trawinski, Dariusz <dariusz.trawinski@intel.com>

Makefile

@@ -129,7 +129,7 @@ ifeq ($(TARGET_PLATFORM), openshift)
     fi
 	docker tag $(CATALOG_REPOSITORY):$(IMAGE_TAG) $(CATALOG_REPOSITORY):$(BRANCH)-latest 
 else
-	sudo opm index add --bundles $(BUNDLE_REPOSITORY)-k8s:$(IMAGE_TAG)  -c docker --tag $(CATALOG_REPOSITORY)-k8s:$(IMAGE_TAG)
+	sudo opm index add --bundles quay.io/operatorhubio/ovms-operator:v0.1.0,quay.io/operatorhubio/ovms-operator:v0.2.0,$(BUNDLE_REPOSITORY)-k8s:$(IMAGE_TAG) -c docker --tag $(CATALOG_REPOSITORY)-k8s:$(IMAGE_TAG)
 	docker tag $(CATALOG_REPOSITORY)-k8s:$(IMAGE_TAG) $(CATALOG_REPOSITORY)-k8s:$(BRANCH)-latest 	
 endif
 
@@ -283,4 +283,5 @@ help: ## Show this help screen.
 	@echo ''
 	@echo 'Available targets are:'
 	@echo ''
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-25s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-25s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+

bundle/Dockerfile

@@ -22,7 +22,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ovms-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.7.1+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.19.1+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
 

bundle_k8s/Dockerfile

@@ -22,7 +22,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ovms-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.7.1+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.19.1+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
 

bundle_k8s/manifests/openvino-operator.clusterserviceversion.yaml

@@ -64,6 +64,7 @@ metadata:
           }
         }
       ]
+    containerImage: quay.io/openvino/ovms-operator:1.0.0
     capabilities: Basic Install
     categories: "AI/Machine Learning"
     operators.operatorframework.io/builder: operator-sdk-v1.19.1+git
@@ -510,3 +511,4 @@ spec:
   provider:
     name: Intel
   version: 1.0.0
+  replaces: ovms-operator.v0.2.0

bundle_k8s/metadata/annotations.yaml

@@ -9,6 +9,7 @@ annotations:
   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
+  containerImage: quay.io/openvino/ovms-operator:1.0.0
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1

docs/operator_installation.md

@@ -3,8 +3,6 @@
 *Note:* Operator, starting from version 1.0 includes non-compatible changes in the CRD records of `ModelServer` and `Notebook`.
 It is recommended to remove all those custom records before upgrading the operator from v0.2 to v1.0.
 
-*Note:* This repository includes operator v1.0 which is to be published soon. The source code for older versions is stored in the [model server repo](https://github.com/openvinotoolkit/model_server/tree/main/extras)
-
 ## Openshift
 
 In the OpenShift [web console](https://docs.openshift.com/container-platform/4.10/web_console/web-console.html) navigate to OperatorHub menu. Search for "OpenVINO™ Toolkit Operator". Then, click the `Install` button.