Skip to content

Commit 859122d

Browse files
committed
bundle: disable noobaa from client clusters
This reverts commit 096cfb4. Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>
1 parent a93f9e5 commit 859122d

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

bundle/metadata/dependencies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ dependencies:
77
value:
88
packageName: cephcsi-operator
99
version: 4.18.0
10+
- type: olm.package
11+
value:
12+
packageName: noobaa-operator
13+
version: ">=5.17.0 <=5.18.0"
1014
- type: olm.package
1115
value:
1216
packageName: recipe

config/metadata/dependencies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ dependencies:
77
value:
88
packageName: cephcsi-operator
99
version: 4.18.0
10+
- type: olm.package
11+
value:
12+
packageName: noobaa-operator
13+
version: ">=5.17.0 <=5.18.0"
1014
- type: olm.package
1115
value:
1216
packageName: recipe

internal/controller/operatorconfigmap_controller.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,11 @@ func (c *OperatorConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Re
253253
return ctrl.Result{}, err
254254
}
255255

256-
//don't reconcile noobaa-operator for remote clusters
257-
if false {
258-
if c.getNoobaaSubManagementConfig() {
259-
if err := c.reconcileNoobaaOperatorSubscription(); err != nil {
260-
c.log.Error(err, "unable to reconcile Noobaa Operator subscription")
261-
return ctrl.Result{}, err
262-
}
256+
//only reconcile noobaa-operator for remote clusters
257+
if c.getNoobaaSubManagementConfig() {
258+
if err := c.reconcileNoobaaOperatorSubscription(); err != nil {
259+
c.log.Error(err, "unable to reconcile Noobaa Operator subscription")
260+
return ctrl.Result{}, err
263261
}
264262
}
265263

0 commit comments

Comments
 (0)