Skip to content

feat: Propagate global tolerations to webhook jobs #668

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

Merged
merged 5 commits into from
Nov 21, 2025
Merged

feat: Propagate global tolerations to webhook jobs #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18e2d2e
fix: Propagate global tolerations to webhook jobs
chernetskyi Nov 13, 2025
1701b32
test: Add unit test for global tolerations
chernetskyi Nov 17, 2025
65a67aa
chore: Add changelog entry
chernetskyi Nov 17, 2025
f6fb3bc
Merge branch 'main' into job-tolerations
dbudziwojskiNR Nov 21, 2025
8162ce1
Add additional helm unit test
dbudziwojskiNR Nov 21, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### security
- Allow pre-upgrade job pods to honor global security context settings @dpacheconr [#670](https://github.com/newrelic/k8s-metadata-injection/pull/670)

### enhancement
- Propagate global tolerations to webhook jobs @chernetskyi [#668](https://github.com/newrelic/k8s-metadata-injection/pull/668)

## v1.38.1 - 2025-10-20

### ⛓️ Dependencies
Expand Down
4 changes: 2 additions & 2 deletions charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ spec:
nodeSelector:
kubernetes.io/os: linux
{{ include "newrelic.common.nodeSelector" . | nindent 8 }}
{{- if .Values.tolerations }}
{{- with include "newrelic.common.tolerations" . }}
tolerations:
{{- toYaml .Values.tolerations | nindent 8 }}
{{- . | nindent 8 -}}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ spec:
nodeSelector:
kubernetes.io/os: linux
{{ include "newrelic.common.nodeSelector" . | nindent 8 }}
{{- if .Values.tolerations }}
{{- with include "newrelic.common.tolerations" . }}
tolerations:
{{- toYaml .Values.tolerations | nindent 8 }}
{{- . | nindent 8 -}}
{{- end }}
{{- end }}
34 changes: 34 additions & 0 deletions charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,37 @@ tests:
value:
kubernetes.io/os: linux
aCoolTestLabel: aCoolTestValue

- it: has propagated global tolerations
set:
cluster: my-cluster
global.tolerations:
- key: globalTaintKey
operator: Exists
effect: NoExecute
asserts:
- equal:
path: spec.template.spec.tolerations
value:
- key: globalTaintKey
operator: Exists
effect: NoExecute

- it: has overrides global tolerations with chart specific tolerations
set:
cluster: my-cluster
global.tolerations:
- key: globalTaintKey
operator: Exists
effect: NoExecute
tolerations:
- key: localTaintKey
operator: Exists
effect: NoExecute
asserts:
- equal:
path: spec.template.spec.tolerations
value:
- key: localTaintKey
operator: Exists
effect: NoExecute
Loading