Skip to content

fix: prevent nodeSelector inheritance in additional clouds #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oleginishev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent nodeSelector inheritance in additional clouds #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/jenkins/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
The changelog until v1.5.7 was auto-generated based on git commits.
Those entries include a reference to the git commit to be able to get more details.

## 5.8.91

Fix nodeSelector inheritance issue in additional clouds configuration.

## 5.8.90

Update `jenkins/inbound-agent` to version `3341.v0766d82b_dec0-1`
Expand Down
2 changes: 1 addition & 1 deletion charts/jenkins/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: jenkins
type: application
home: https://www.jenkins.io/
version: 5.8.90
version: 5.8.91
appVersion: 2.516.3
description: >
Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 2000 plugins to support building, deploying and automating any project.
Expand Down
12 changes: 12 additions & 0 deletions charts/jenkins/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,19 @@ jenkins:
{{- if .additionalAgentsOverride }}
{{- $_ := set $newRoot.Values "additionalAgents" list}}
{{- end}}
{{- /* Clear nodeSelector from root agent before merge to prevent inheritance */}}
{{- if $newRoot.Values.agent.nodeSelector }}
{{- $_ := set $newRoot.Values.agent "nodeSelector" dict }}
{{- end }}
{{- $newValues := merge $additionalCloud $newRoot.Values }}
{{- /* Ensure nodeSelector is properly set for current cloud */}}
{{- if $newValues.agent }}
{{- if $additionalCloud.agent.nodeSelector }}
{{- $_ := set $newValues.agent "nodeSelector" $additionalCloud.agent.nodeSelector }}
{{- else }}
{{- $_ := set $newValues.agent "nodeSelector" dict }}
{{- end }}
{{- end }}
{{- $_ := set $newRoot "Values" $newValues }}
{{- /* clear additionalClouds from the copy */}}
{{- $_ := set $newRoot.Values "additionalClouds" list }}
Expand Down