updated version to 4.5.1 (#1163)

bitscuit · web-flow · commit ea1f64e744f0 · 2025-05-02T00:13:34.000+08:00
* updated version to 4.6.0

Signed-off-by: Henry Li &lt;henry.h.li@ibm.com&gt;

* updated channel to v4.5

Signed-off-by: Henry Li &lt;henry.h.li@ibm.com&gt;

* changed version to 4.5.1

Signed-off-by: Henry Li &lt;henry.h.li@ibm.com&gt;

---------

Signed-off-by: Henry Li &lt;henry.h.li@ibm.com&gt;
diff --git a/Makefile b/Makefile
@@ -86,7 +86,7 @@ OPERATOR_IMAGE_NAME ?= odlm
 # Current Operator bundle image name
 BUNDLE_IMAGE_NAME ?= odlm-operator-bundle
 # Current Operator version
-OPERATOR_VERSION ?= 4.5.0
+OPERATOR_VERSION ?= 4.5.1
 
 # Kind cluster name
 KIND_CLUSTER_NAME ?= "odlm"
@@ -216,7 +216,7 @@ bundle-manifests: yq
 
 generate-all: yq manifests kustomize operator-sdk ## Generate bundle manifests, metadata and package manifests
 	$(OPERATOR_SDK) generate kustomize manifests -q
-	- make bundle-manifests CHANNELS=v4.4 DEFAULT_CHANNEL=v4.4
+	- make bundle-manifests CHANNELS=v4.5 DEFAULT_CHANNEL=v4.5
 
 ##@ Test
 
diff --git a/bundle.Dockerfile b/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-odlm
-LABEL operators.operatorframework.io.bundle.channels.v1=v4.4
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.4
+LABEL operators.operatorframework.io.bundle.channels.v1=v4.5
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.5
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
diff --git a/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml
@@ -128,7 +128,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Developer Tools, Monitoring, Logging & Tracing, Security
     certified: "false"
-    containerImage: icr.io/cpopen/odlm:4.5.0
+    containerImage: icr.io/cpopen/odlm:4.5.1
     createdAt: "2025-02-14T21:16:49Z"
     description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based API to manage the lifecycle of operands.
     features.operators.openshift.io/disconnected: "true"
@@ -139,7 +139,7 @@ metadata:
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
     nss.operator.ibm.com/managed-operators: ibm-odlm
-    olm.skipRange: '>=1.2.0 <4.5.0'
+    olm.skipRange: '>=1.2.0 <4.5.1'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -150,7 +150,7 @@ metadata:
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: operand-deployment-lifecycle-manager.v4.5.0
+  name: operand-deployment-lifecycle-manager.v4.5.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -649,7 +649,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: icr.io/cpopen/odlm:4.5.0
+                    image: icr.io/cpopen/odlm:4.5.1
                     imagePullPolicy: IfNotPresent
                     livenessProbe:
                       failureThreshold: 10
@@ -875,7 +875,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: IBM
-  version: 4.5.0
+  version: 4.5.1
   relatedImages:
-    - image: icr.io/cpopen/odlm:4.5.0
+    - image: icr.io/cpopen/odlm:4.5.1
       name: ODLM_IMAGE
diff --git a/bundle/metadata/annotations.yaml b/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-odlm
-  operators.operatorframework.io.bundle.channels.v1: v4.4
-  operators.operatorframework.io.bundle.channel.default.v1: v4.4
+  operators.operatorframework.io.bundle.channels.v1: v4.5
+  operators.operatorframework.io.bundle.channel.default.v1: v4.5
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: icr.io/cpopen/odlm
   newName: icr.io/cpopen/odlm
-  newTag: 4.5.0
+  newTag: 4.5.1
diff --git a/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml
@@ -6,7 +6,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Developer Tools, Monitoring, Logging & Tracing, Security
     certified: "false"
-    containerImage: icr.io/cpopen/odlm:4.5.0
+    containerImage: icr.io/cpopen/odlm:4.5.1
     createdAt: "2020-11-12T17:05:48Z"
     description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based
       API to manage the lifecycle of operands.
@@ -18,7 +18,7 @@ metadata:
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
     nss.operator.ibm.com/managed-operators: ibm-odlm
-    olm.skipRange: '>=1.2.0 <4.5.0'
+    olm.skipRange: '>=1.2.0 <4.5.1'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
@@ -489,6 +489,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/cpopen/odlm:4.5.0
+  - image: icr.io/cpopen/odlm:4.5.1
     name: ODLM_IMAGE
   version: 0.0.0
diff --git a/helm-cluster-scoped/Chart.yaml b/helm-cluster-scoped/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-odlm-cluster-scoped
 description: A Helm chart for ibm-odlm
 type: application
-version: 4.5.0
-appVersion: 4.5.0
+version: 4.5.1
+appVersion: 4.5.1
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: ibm-odlm
 description: A Helm chart for ibm-odlm
 type: application
-version: 4.5.0
-appVersion: 4.5.0
+version: 4.5.1
+appVersion: 4.5.1
diff --git a/helm/templates/operator-deployment.yaml b/helm/templates/operator-deployment.yaml
@@ -152,18 +152,9 @@ spec:
         categories: Developer Tools, Monitoring, Logging & Tracing, Security
         certified: "false"
         containerImage: icr.io/cpopen/odlm@sha256:3076710c9891bfb573ea4744398d02977702e8cf24e9f5151f9607c4dc2f95db
-        createdAt: "2024-09-28T19:55:35Z"
         description: The Operand Deployment Lifecycle Manager provides a Kubernetes
           CRD-based API to manage the lifecycle of operands.
         nss.operator.ibm.com/managed-operators: ibm-odlm
-        # olm.operatorGroup: common-service
-        # olm.operatorNamespace: cs-op
-        # olm.skipRange: '>=1.2.0 <4.3.8'
-        # olm.targetNamespaces: cs-op
-        operatorframework.io/properties: '{"properties":[{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandBindInfo","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandConfig","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRegistry","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRequest","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperatorConfig","version":"v1alpha1"}},{"type":"olm.package","value":{"packageName":"ibm-odlm","version":"4.5.0"}}]}'
-        operators.openshift.io/infrastructure-features: '["disconnected"]'
-        operators.operatorframework.io/builder: operator-sdk-v1.32.0
-        operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
         productID: 068a62892a1e4db39641342e592daa25
         productMetric: FREE
         productName: IBM Cloud Platform Common Services
@@ -204,11 +195,9 @@ spec:
         {{- $watchNamespaces = prepend $watchNamespaces .Values.global.operatorNamespace }}
         - name: WATCH_NAMESPACE
           value: {{ uniq $watchNamespaces | join "," | quote }}
-        - name: OPERATOR_CONDITION_NAME
-          value: operand-deployment-lifecycle-manager.v4.5.0
         - name: NO_OLM
           value: "true"
-        image: {{ .Values.cpfs.imagePullPrefix | default .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator }}/odlm:4.5.0
+        image: {{ .Values.cpfs.imagePullPrefix | default .Values.global.imagePullPrefix }}/{{ .Values.cpfs.imageRegistryNamespaceOperator }}/odlm:4.5.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
diff --git a/helm/templates/rbac.yaml b/helm/templates/rbac.yaml
@@ -324,7 +324,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: operand-deployment-lifecycle-manager.v4.5.0
+  name: operand-deployment-lifecycle-manager-olm
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName }}
@@ -335,7 +335,7 @@ rules:
 - apiGroups:
   - operators.coreos.com
   resourceNames:
-  - operand-deployment-lifecycle-manager.v4.5.0
+  - operand-deployment-lifecycle-manager-olm
   resources:
   - operatorconditions
   verbs:
@@ -347,7 +347,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: operand-deployment-lifecycle-manager.v4.5.0
+  name: operand-deployment-lifecycle-manager-olm
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName}}
@@ -357,7 +357,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: operand-deployment-lifecycle-manager.v4.5.0
+  name: operand-deployment-lifecycle-manager-olm
 subjects:
 - kind: ServiceAccount
   name: operand-deployment-lifecycle-manager
diff --git a/version/version.go b/version/version.go
@@ -17,5 +17,5 @@
 package version
 
 var (
-	Version = "4.5.0"
+	Version = "4.5.1"
 )
