restore default affinity for noobaa standalone

[jackyalbo]

Fix for https://bugzilla.redhat.com/show_bug.cgi?id=2311551

We revert the nodeAffinity change to apply only to cases where users explicitly set nodeAffinity in storage cluster spec.

[openshift-ci]

Hi @jackyalbo. Thanks for your PR.

I'm waiting for a red-hat-storage member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[jackyalbo]

/retest-required

[openshift-ci]

@jackyalbo: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest-required

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[malayparida2000]

/ok-to-test

[malayparida2000]

/retest

[malayparida2000]

Please fix the failing unit test here

ocs-operator/controllers/storagecluster/noobaa_system_reconciler_test.go

Line 284 in 6cbff2c

func TestSetNooBaaDesiredState(t *testing.T) {

ocs-operator/controllers/storagecluster/noobaa_system_reconciler_test.go

Line 376 in 6cbff2c

assert.Equal(t, noobaa.Spec.Affinity, &corev1.Affinity{NodeAffinity: noobaaplacement.NodeAffinity})

[malayparida2000]

@jackyalbo is this a direct revert of this #2461?

[jackyalbo]

@jackyalbo is this a direct revert of this #2461?
No. I still want Affinity to be set in standalone but only if it is set in storageCluster spec( the ok check).
I'm trying not to hurt the flow for non-standalone - which failed the unit test.

[malayparida2000]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackyalbo, malayparida2000, umangachapagain

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [umangachapagain]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[malayparida2000]

/retest

[malayparida2000]

/cherry-pick release-4.17

[openshift-cherrypick-robot]

@malayparida2000: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[openshift-cherrypick-robot]

@malayparida2000: new pull request created: #2801

In response to this:

/cherry-pick release-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.