Commit 545388d
committed
Fix nodePlugin affinity not propagating from OperatorConfig to DaemonSet
Rook creates Driver CRs with a non-nil but empty Affinity struct.
The merge logic only checked if Affinity == nil, so the affinity
from OperatorConfig.driverSpecDefaults was never applied.
Add isAffinityEmpty() helper to check for nil or effectively empty
affinity structs, allowing the merge to properly fill in defaults.
Signed-off-by: ksc98 <kylechang96@gmail.com>1 parent 7c71102 commit 545388d
1 file changed
+13
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1731 | 1731 | | |
1732 | 1732 | | |
1733 | 1733 | | |
1734 | | - | |
| 1734 | + | |
1735 | 1735 | | |
1736 | 1736 | | |
1737 | 1737 | | |
| |||
1786 | 1786 | | |
1787 | 1787 | | |
1788 | 1788 | | |
1789 | | - | |
| 1789 | + | |
1790 | 1790 | | |
1791 | 1791 | | |
1792 | 1792 | | |
| |||
1855 | 1855 | | |
1856 | 1856 | | |
1857 | 1857 | | |
| 1858 | + | |
| 1859 | + | |
| 1860 | + | |
| 1861 | + | |
| 1862 | + | |
| 1863 | + | |
| 1864 | + | |
| 1865 | + | |
| 1866 | + | |
| 1867 | + | |
| 1868 | + | |
0 commit comments