From b1489fe4070a792956318bd24fb2a3b3714a4e8f Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 17 Apr 2024 19:43:52 +0530 Subject: [PATCH 1/2] bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16 In older clusters, upgrading the odf channel from 4.15 to 4.16 tries to bring the rook-operator, leading to conflicts with ocs-operator 4.15, which already contains all Rook components in its 4.15 CSV. This conflict results in upgrade failures. To address this issue, the Rook dependency is removed from the odf-operator and added to the ocs-operator. This solution ensures a smooth upgrade process, as changing the ocs-operator channel will now bring Rook along with ocs-operator 4.16 without encountering conflicts. This commit should be reverted in 4.17 as 4.16 will feature different CSVs. In 4.17, reintroducing Rook as a dependency in odf should facilitate smooth installations and upgrades. Signed-off-by: Nitin Goyal --- bundle/metadata/dependencies.yaml | 4 ---- controllers/subscriptions.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml index 7dfeffa55..8e2b6826c 100644 --- a/bundle/metadata/dependencies.yaml +++ b/bundle/metadata/dependencies.yaml @@ -3,10 +3,6 @@ dependencies: value: packageName: ocs-operator version: ">=4.15.0 <=4.16.0" -- type: olm.package - value: - packageName: rook-ceph-operator - version: ">=4.15.0 <=4.16.0" - type: olm.package value: packageName: ocs-client-operator diff --git a/controllers/subscriptions.go b/controllers/subscriptions.go index 3d3076e5f..a323f523d 100644 --- a/controllers/subscriptions.go +++ b/controllers/subscriptions.go @@ -436,7 +436,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription { }, } - rookSubscription := &operatorv1alpha1.Subscription{ + _ = &operatorv1alpha1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: RookSubscriptionName, Namespace: OperatorNamespace, @@ -466,7 +466,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription { }, } - return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription, + return []*operatorv1alpha1.Subscription{ocsSubscription, noobaaSubscription, csiAddonsSubscription, ocsClientSubscription, prometheusSubscription} } From 54a25d0dcf4e6d83f4f9dcf2102b5cf65b4546db Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Thu, 18 Apr 2024 15:45:10 +0530 Subject: [PATCH 2/2] makefile: update bundle images Signed-off-by: Nitin Goyal --- hack/make-bundle-vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index 0302f6c35..0e733eb42 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -70,7 +70,7 @@ CRD_OPTIONS ?= "crd" OCS_BUNDLE_NAME ?= ocs-operator OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle OCS_BUNDLE_VERSION ?= v4.16.0 -OCS_BUNDLE_IMG_TAG ?= main-0c259e6 +OCS_BUNDLE_IMG_TAG ?= release-4.16-723d642 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG) @@ -110,7 +110,7 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON ROOK_BUNDLE_NAME ?= rook-ceph-operator ROOK_BUNDLE_IMG_NAME ?= $(ROOK_BUNDLE_NAME)-bundle ROOK_BUNDLE_VERSION ?= v4.16.0 -ROOK_BUNDLE_IMG_TAG ?= master-9e5499216 +ROOK_BUNDLE_IMG_TAG ?= master-f8e5f814c ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG)