update sub channel, hardcode zen @3.20 for now (#846)

Signed-off-by: Ben Luzarraga <[email protected]>

Signed-off-by: Ben Luzarraga <[email protected]>
Co-authored-by: Ben Luzarraga <[email protected]>

Author: bluzarraga

Makefile

@@ -79,8 +79,8 @@ OPERATOR_IMAGE_NAME ?= common-service-operator
 # Current Operator bundle image name
 BUNDLE_IMAGE_NAME ?= dev-common-service-operator-bundle
 
-CHANNELS := v3.20
-DEFAULT_CHANNEL := v3.20
+CHANNELS := v3.21
+DEFAULT_CHANNEL := v3.21
 
 # Options for 'bundle-build'
 ifneq ($(origin CHANNELS), undefined)

bundle.Dockerfile

@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ibm-common-service-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=v3.20
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v3.20
+LABEL operators.operatorframework.io.bundle.channels.v1=v3.21
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v3.21
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.7.1+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml

@@ -26,7 +26,7 @@ metadata:
     description: The IBM Common Service Operator is used to deploy IBM Common Services
     nss.operator.ibm.com/managed-operators: cloud-native-postgresql
     olm.skipRange: ">=3.3.0 <3.21.0"
-    operatorChannel: v3.20
+    operatorChannel: v3.21
     operatorVersion: 3.21.0
     operators.operatorframework.io/builder: operator-sdk-v1.7.1+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

bundle/metadata/annotations.yaml

@@ -4,8 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: ibm-common-service-operator
-  operators.operatorframework.io.bundle.channels.v1: v3.20
-  operators.operatorframework.io.bundle.channel.default.v1: v3.20
+  operators.operatorframework.io.bundle.channels.v1: v3.21
+  operators.operatorframework.io.bundle.channel.default.v1: v3.21
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.7.1+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml

@@ -9,7 +9,7 @@ metadata:
     description: The IBM Common Service Operator is used to deploy IBM Common Services
     nss.operator.ibm.com/managed-operators: cloud-native-postgresql
     olm.skipRange: ""
-    operatorChannel: v3.20
+    operatorChannel: v3.21
     operatorVersion: 3.21.0
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2

controllers/constant/odlm.go

@@ -392,7 +392,7 @@ spec:
     installPlanApproval: {{ .ApprovalMode }}
     sourceName: certified-operators
     sourceNamespace: {{ .CatalogSourceNs }}
-  - channel: {{ .Channel }}
+  - channel: v3.20
     name: ibm-zen-operator
     namespace: {{ .MasterNs }}
     packageName: ibm-zen-operator
@@ -418,7 +418,7 @@ spec:
     packageName: ibm-user-data-services-operator
     scope: public
     installPlanApproval: {{ .ApprovalMode }}
-  - channel: {{ .Channel }}
+  - channel: v3.20
     name: ibm-zen-cpp-operator
     namespace: {{ .MasterNs }}
     packageName: zen-cpp-operator

testdata/deploy/deploy.yaml

@@ -15,7 +15,7 @@ spec:
         name: ibm-common-service-operator
       annotations:
         description: The IBM Common Service Operator is used to deploy IBM Common Services
-        operatorChannel: v3.20
+        operatorChannel: v3.21
         operatorVersion: 3.21.0
     spec:
       affinity: