Bug 1854651: [release 4.5] backport pr 618 - fix segfault #623
Conversation
Signed-off-by: Anubhav Deep <adeep@redhat.com> (cherry picked from commit 48be5cf)
The value of StorageCluster.Spec.LabelSelector was not being properly appended to the generated Placements of the OCS components.Specifically, adding a new NodeSelectorTerm results in a selector term thatis ORed with any other terms, whereas adding a newNodeSelectorRequirement to an existing NodeSelectorTerm would result in an AND of all requirements in that term. This commit makes it so the LabelSelector field is ANDed with any other existing node selectors in the Placement. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> (cherry picked from commit 3d9f406)
…lector There was a segfault (nil pointer dereference) in newStorageClassDeviceSets. This test case runs into it. Adding it after the fix so that we don't regress. Signed-off-by: Michael Adam <obnox@redhat.com> (cherry picked from commit 7d286ae)
Only set the default node affinity if both the LabelSelector and the Placement's NodeAffinity are nil. This is because we don't want to override the configured NodeAffinity in all cases where the LabelSelector is nil. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> (cherry picked from commit 29def16)
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> (cherry picked from commit 4196b60)
openshift-ci-robot
added
the
bugzilla/severity-high
|
@obnoxxx: This pull request references Bugzilla bug 1854651, which is invalid:
Comment In response to this:
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/test-infra repository. |
openshift-ci-robot
added
the
bugzilla/invalid-bug
openshift-ci-robot
added
the
approved
obnoxxx
added
bugzilla/valid-bug
|
@JohnStrunk FYI |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jarrpa, obnoxxx 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:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
@obnoxxx: All pull requests linked via external trackers have merged: openshift/ocs-operator#623. Bugzilla bug 1854651 has been moved to the POST state. In response to this:
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/test-infra repository. |
This backports PR #618 (and as prerequisite also the innocuous pr #567).
This is needed to fix a nil pointer dereference segfault in
newStorageClassDeviceSetswhen an empty LabelSelector was provided in the StorageCluster CR.See https://bugzilla.redhat.com/show_bug.cgi?id=1854651