diff --git a/Makefile b/Makefile index 3e1f49b9..f747d204 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ OPERATOR_IMAGE_NAME ?= odlm # Current Operator bundle image name BUNDLE_IMAGE_NAME ?= odlm-operator-bundle # Current Operator version -OPERATOR_VERSION ?= 4.3.9 +OPERATOR_VERSION ?= 4.4.0 # Kind cluster name KIND_CLUSTER_NAME ?= "odlm" @@ -211,7 +211,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.3 DEFAULT_CHANNEL=v4.3 + - make bundle-manifests CHANNELS=v4.4 DEFAULT_CHANNEL=v4.4 ##@ Test diff --git a/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml index 57506a00..8d45defa 100644 --- a/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml +++ b/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml @@ -132,7 +132,7 @@ metadata: 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.skipRange: '>=1.2.0 <4.3.9' + olm.skipRange: '>=1.2.0 <4.4.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 @@ -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.3.9 + name: operand-deployment-lifecycle-manager.v4.4.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -875,7 +875,7 @@ spec: minKubeVersion: 1.19.0 provider: name: IBM - version: 4.3.9 + version: 4.4.0 relatedImages: - - image: icr.io/cpopen/odlm:4.3.9 + - image: icr.io/cpopen/odlm:4.4.0 name: ODLM_IMAGE diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index e4758c86..10e9371e 100644 --- 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.3 - operators.operatorframework.io.bundle.channel.default.v1: v4.3 + operators.operatorframework.io.bundle.channels.v1: v4.4 + operators.operatorframework.io.bundle.channel.default.v1: v4.4 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/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml index fc966d91..bdcedb80 100644 --- a/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml +++ b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: 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.skipRange: '>=1.2.0 <4.3.9' + olm.skipRange: '>=1.2.0 <4.4.0' 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.3.9 + - image: icr.io/cpopen/odlm:4.4.0 name: ODLM_IMAGE version: 0.0.0 diff --git a/helm-cluster-scoped/Chart.yaml b/helm-cluster-scoped/Chart.yaml index 64e8b190..fe69038a 100644 --- 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.3.9 -appVersion: 4.3.9 \ No newline at end of file +version: 4.4.0 +appVersion: 4.4.0 \ No newline at end of file diff --git a/helm/Chart.yaml b/helm/Chart.yaml index ceaf57ef..c80dcabf 100644 --- 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.3.9 -appVersion: 4.3.9 \ No newline at end of file +version: 4.4.0 +appVersion: 4.4.0 \ No newline at end of file diff --git a/helm/templates/operator-deployment.yaml b/helm/templates/operator-deployment.yaml index e0c5846f..2c43f269 100644 --- a/helm/templates/operator-deployment.yaml +++ b/helm/templates/operator-deployment.yaml @@ -156,7 +156,7 @@ spec: # 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.3.8"}}]}' + 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.4.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 @@ -201,7 +201,7 @@ spec: name: namespace-scope optional: true - name: OPERATOR_CONDITION_NAME - value: operand-deployment-lifecycle-manager.v4.3.9 + value: operand-deployment-lifecycle-manager.v4.4.0 - name: NO_OLM value: "true" image: {{ .Values.imagePullPrefix}}/{{ .Values.imageRegistryNamespaceOperator}}/{{ .Values.operatorImage }}:{{ .Values.operatorVersion }} diff --git a/helm/templates/rbac.yaml b/helm/templates/rbac.yaml index d599bdf7..f3c7fae8 100644 --- a/helm/templates/rbac.yaml +++ b/helm/templates/rbac.yaml @@ -190,13 +190,13 @@ metadata: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: operand-deployment-lifecycle-manager.v4.3.9 + name: operand-deployment-lifecycle-manager.v4.4.0 namespace: {{ .Values.operatorNamespace }} rules: - apiGroups: - operators.coreos.com resourceNames: - - operand-deployment-lifecycle-manager.v4.3.9 + - operand-deployment-lifecycle-manager.v4.4.0 resources: - operatorconditions verbs: @@ -209,12 +209,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: operand-deployment-lifecycle-manager.v4.3.9 + name: operand-deployment-lifecycle-manager.v4.4.0 namespace: {{ .Values.operatorNamespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: operand-deployment-lifecycle-manager.v4.3.9 + name: operand-deployment-lifecycle-manager.v4.4.0 subjects: - kind: ServiceAccount name: operand-deployment-lifecycle-manager diff --git a/helm/values.yaml b/helm/values.yaml index b9ef354d..c1237abd 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ imagePullSecret: ibm-entitlement-key # Note there are no leading or trailing /'s imageRegistryNamespaceOperator: cpopen imageRegistryNamespaceOperand: cpopen/cpfs -operatorVersion: 4.3.9 +operatorVersion: 4.4.0 # other configuration you think you might need for your operator # following are examples, not required: diff --git a/version/version.go b/version/version.go index 57140a6d..95f3117b 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ package version var ( - Version = "4.3.9" + Version = "4.4.0" )