fix: prevent nodeSelector inheritance in additional clouds #1496
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.
Resolves: nodeSelector configuration conflicts in multi-cloud setups
What does this PR do?
This PR fixes a critical bug in the Jenkins Helm chart where the
nodeSelectorconfiguration from the root agent was being incorrectly inherited by additional clouds during the merge process. This caused configuration conflicts in multi-cloud Jenkins setups where different clouds should have different node selectors.Background:
When using multiple Jenkins clouds (additional clouds), each cloud should be able to specify its own
nodeSelectorconfiguration independently. However, the current implementation was inheriting thenodeSelectorfrom the root agent configuration, causing conflicts and preventing proper node selection for different clouds.The fix:
nodeSelectorfrom the root agent before merging with additional cloud configurationsnodeSelectorconfigurationnodeSelectorbetween different cloud configurationsThis change is backward compatible and doesn't break existing functionality.
If you modified files in the
./charts/jenkins/directory, please also include the following:Special notes for your reviewer
This is a bug fix that prevents configuration conflicts in multi-cloud Jenkins setups. The change is backward compatible and doesn't break existing functionality. All unit tests pass successfully (26 test suites, 180 tests).
Testing: