csi: pass nil affinity to ceph-csi-operator when not configured#16973
Closed
ksc98 wants to merge 1 commit intorook:masterfrom
Closed
csi: pass nil affinity to ceph-csi-operator when not configured#16973ksc98 wants to merge 1 commit intorook:masterfrom
ksc98 wants to merge 1 commit intorook:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When no node affinity is configured, Rook passes an empty Affinity struct to the ceph-csi-operator Driver CR. This prevents the operator from using its own defaults from OperatorConfig, since it only checks for nil (not empty structs).
This PR passes
nilinstead of an empty struct when no affinity is configured, allowing the ceph-csi-operator to apply its OperatorConfig defaults.This is the Rook-side fix as suggested in review of ceph/ceph-csi-operator#388 — rather than having the ceph-csi-operator check for empty structs, Rook should simply pass
nilwhen no affinity is configured.Checklist: