Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 2275456:[release-4.16] bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16 #400

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Bug 2275456:[release-4.16] bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1489fe
bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16
iamniting Apr 17, 2024
54a25d0
makefile: update bundle images
iamniting Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions bundle/metadata/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions controllers/subscriptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
},
}

rookSubscription := &operatorv1alpha1.Subscription{
_ = &operatorv1alpha1.Subscription{
ObjectMeta: metav1.ObjectMeta{
Name: RookSubscriptionName,
Namespace: OperatorNamespace,
Expand Down Expand Up @@ -466,7 +466,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
},
}

return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription,
return []*operatorv1alpha1.Subscription{ocsSubscription, noobaaSubscription,
csiAddonsSubscription, ocsClientSubscription, prometheusSubscription}
}

Expand Down
4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
Loading