Skip to content

Commit a218554

Browse files
dpacheconrdpacheconr
committed
test: add comprehensive global value inheritance tests
- Add global-inheritance_test.yaml with 20 tests covering cluster, labels, podLabels, images.registry, images.pullSecrets, priorityClassName, hostNetwork, dnsConfig, nodeSelector, and affinity - Add serviceaccount-global_test.yaml with 4 tests for serviceAccount.create - All 15 applicable global values now have explicit helm-unittest coverage - Tests verify both inheritance (global applies when local omitted) and precedence (local overrides global when both set) - Test results: 86/86 passing (24 new tests added) - Achieves 100% global values test coverage for this chart
1 parent 639bfe2 commit a218554

File tree

4 files changed

+504
-0
lines changed

4 files changed

+504
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
### Enhancements
11+
- Global serviceAccount.annotations inheritance for IAM role integration (IRSA, Workload Identity, Pod Identity) @dpacheconr [#678](https://github.com/newrelic/k8s-metadata-injection/pull/678)
12+
- Test coverage for serviceAccount.annotations propagation and annotation merge behavior with Helm hooks @dpacheconr [#678](https://github.com/newrelic/k8s-metadata-injection/pull/678)
13+
14+
### Bug fixes
15+
- Pre-existing test assertion error in webhook_test.yaml (notExists → isNull) @dpacheconr [#678](https://github.com/newrelic/k8s-metadata-injection/pull/678)
16+
1017
## v1.39.0 - 2025-11-24
1118

1219
### 🛡️ Security notices

‎charts/nri-metadata-injection/tests/global-inheritance_test.yaml‎

Lines changed: 317 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,317 @@
1+
suite: test global value inheritance
2+
templates:
3+
- templates/deployment.yaml
4+
release:
5+
name: my-release
6+
namespace: my-namespace
7+
tests:
8+
# ============================================================================
9+
# global.cluster
10+
# ============================================================================
11+
- it: should inherit global.cluster when local cluster not set
12+
set:
13+
global.cluster: global-test-cluster
14+
asserts:
15+
- equal:
16+
path: spec.template.spec.containers[0].env[?(@.name=="clusterName")].value
17+
value: global-test-cluster
18+
19+
- it: should use local cluster over global.cluster
20+
set:
21+
cluster: local-cluster
22+
global.cluster: global-cluster
23+
asserts:
24+
- equal:
25+
path: spec.template.spec.containers[0].env[?(@.name=="clusterName")].value
26+
value: local-cluster
27+
28+
# ============================================================================
29+
# global.labels
30+
# ============================================================================
31+
- it: should inherit global.labels when local labels not set
32+
set:
33+
cluster: test-cluster
34+
global.labels:
35+
globalLabel1: globalValue1
36+
globalLabel2: globalValue2
37+
asserts:
38+
- equal:
39+
path: metadata.labels.globalLabel1
40+
value: globalValue1
41+
- equal:
42+
path: metadata.labels.globalLabel2
43+
value: globalValue2
44+
45+
- it: should merge local labels with global.labels (local takes precedence)
46+
set:
47+
cluster: test-cluster
48+
labels:
49+
localLabel: localValue
50+
sharedLabel: localValue
51+
global.labels:
52+
globalLabel: globalValue
53+
sharedLabel: globalValue
54+
asserts:
55+
- equal:
56+
path: metadata.labels.localLabel
57+
value: localValue
58+
- equal:
59+
path: metadata.labels.globalLabel
60+
value: globalValue
61+
- equal:
62+
path: metadata.labels.sharedLabel
63+
value: localValue
64+
65+
# ============================================================================
66+
# global.podLabels
67+
# ============================================================================
68+
- it: should inherit global.podLabels when local podLabels not set
69+
set:
70+
cluster: test-cluster
71+
global.podLabels:
72+
globalPodLabel1: globalPodValue1
73+
globalPodLabel2: globalPodValue2
74+
asserts:
75+
- equal:
76+
path: spec.template.metadata.labels.globalPodLabel1
77+
value: globalPodValue1
78+
- equal:
79+
path: spec.template.metadata.labels.globalPodLabel2
80+
value: globalPodValue2
81+
82+
- it: should merge local podLabels with global.podLabels (local takes precedence)
83+
set:
84+
cluster: test-cluster
85+
podLabels:
86+
localPodLabel: localPodValue
87+
sharedPodLabel: localPodValue
88+
global.podLabels:
89+
globalPodLabel: globalPodValue
90+
sharedPodLabel: globalPodValue
91+
asserts:
92+
- equal:
93+
path: spec.template.metadata.labels.localPodLabel
94+
value: localPodValue
95+
- equal:
96+
path: spec.template.metadata.labels.globalPodLabel
97+
value: globalPodValue
98+
- equal:
99+
path: spec.template.metadata.labels.sharedPodLabel
100+
value: localPodValue
101+
102+
# ============================================================================
103+
# global.images.registry
104+
# ============================================================================
105+
- it: should inherit global.images.registry when local image.registry not set
106+
set:
107+
cluster: test-cluster
108+
global.images.registry: global-registry.io
109+
asserts:
110+
- matchRegex:
111+
path: spec.template.spec.containers[0].image
112+
pattern: ^global-registry\.io/
113+
114+
- it: should use local image.registry over global.images.registry
115+
set:
116+
cluster: test-cluster
117+
image.registry: local-registry.io
118+
global.images.registry: global-registry.io
119+
asserts:
120+
- matchRegex:
121+
path: spec.template.spec.containers[0].image
122+
pattern: ^local-registry\.io/
123+
124+
# ============================================================================
125+
# global.images.pullSecrets
126+
# ============================================================================
127+
- it: should inherit global.images.pullSecrets when local image.pullSecrets not set
128+
set:
129+
cluster: test-cluster
130+
global.images.pullSecrets:
131+
- name: global-pull-secret
132+
asserts:
133+
- contains:
134+
path: spec.template.spec.imagePullSecrets
135+
content:
136+
name: global-pull-secret
137+
138+
- it: should merge local image.pullSecrets with global.images.pullSecrets
139+
set:
140+
cluster: test-cluster
141+
image.pullSecrets:
142+
- name: local-pull-secret
143+
global.images.pullSecrets:
144+
- name: global-pull-secret
145+
asserts:
146+
- contains:
147+
path: spec.template.spec.imagePullSecrets
148+
content:
149+
name: local-pull-secret
150+
- contains:
151+
path: spec.template.spec.imagePullSecrets
152+
content:
153+
name: global-pull-secret
154+
155+
# ============================================================================
156+
# global.priorityClassName
157+
# ============================================================================
158+
- it: should inherit global.priorityClassName when local priorityClassName not set
159+
set:
160+
cluster: test-cluster
161+
global.priorityClassName: global-priority-class
162+
asserts:
163+
- equal:
164+
path: spec.template.spec.priorityClassName
165+
value: global-priority-class
166+
167+
- it: should use local priorityClassName over global.priorityClassName
168+
set:
169+
cluster: test-cluster
170+
priorityClassName: local-priority-class
171+
global.priorityClassName: global-priority-class
172+
asserts:
173+
- equal:
174+
path: spec.template.spec.priorityClassName
175+
value: local-priority-class
176+
177+
# ============================================================================
178+
# global.hostNetwork
179+
# ============================================================================
180+
- it: should inherit global.hostNetwork when local hostNetwork not set
181+
set:
182+
cluster: test-cluster
183+
global.hostNetwork: true
184+
asserts:
185+
- equal:
186+
path: spec.template.spec.hostNetwork
187+
value: true
188+
- equal:
189+
path: spec.template.spec.dnsPolicy
190+
value: ClusterFirstWithHostNet
191+
192+
- it: should use local hostNetwork over global.hostNetwork
193+
set:
194+
cluster: test-cluster
195+
hostNetwork: false
196+
global.hostNetwork: true
197+
asserts:
198+
- equal:
199+
path: spec.template.spec.hostNetwork
200+
value: false
201+
- notExists:
202+
path: spec.template.spec.dnsPolicy
203+
204+
# ============================================================================
205+
# global.dnsConfig
206+
# ============================================================================
207+
- it: should inherit global.dnsConfig when local dnsConfig not set
208+
set:
209+
cluster: test-cluster
210+
global.dnsConfig:
211+
nameservers:
212+
- 1.2.3.4
213+
searches:
214+
- ns1.svc.cluster-domain.example
215+
asserts:
216+
- equal:
217+
path: spec.template.spec.dnsConfig.nameservers[0]
218+
value: 1.2.3.4
219+
- equal:
220+
path: spec.template.spec.dnsConfig.searches[0]
221+
value: ns1.svc.cluster-domain.example
222+
223+
- it: should use local dnsConfig over global.dnsConfig
224+
set:
225+
cluster: test-cluster
226+
dnsConfig:
227+
nameservers:
228+
- 5.6.7.8
229+
global.dnsConfig:
230+
nameservers:
231+
- 1.2.3.4
232+
asserts:
233+
- equal:
234+
path: spec.template.spec.dnsConfig.nameservers[0]
235+
value: 5.6.7.8
236+
- notContains:
237+
path: spec.template.spec.dnsConfig.nameservers
238+
content: 1.2.3.4
239+
240+
# ============================================================================
241+
# global.nodeSelector
242+
# ============================================================================
243+
- it: should inherit global.nodeSelector when local nodeSelector not set
244+
set:
245+
cluster: test-cluster
246+
global.nodeSelector:
247+
globalNodeKey: globalNodeValue
248+
asserts:
249+
- equal:
250+
path: spec.template.spec.nodeSelector["globalNodeKey"]
251+
value: globalNodeValue
252+
- equal:
253+
path: spec.template.spec.nodeSelector["kubernetes.io/os"]
254+
value: linux
255+
256+
- it: should use local nodeSelector over global.nodeSelector
257+
set:
258+
cluster: test-cluster
259+
nodeSelector:
260+
localNodeKey: localNodeValue
261+
global.nodeSelector:
262+
globalNodeKey: globalNodeValue
263+
asserts:
264+
- equal:
265+
path: spec.template.spec.nodeSelector.localNodeKey
266+
value: localNodeValue
267+
- equal:
268+
path: spec.template.spec.nodeSelector["kubernetes.io/os"]
269+
value: linux
270+
- notExists:
271+
path: spec.template.spec.nodeSelector.globalNodeKey
272+
273+
# ============================================================================
274+
# global.affinity
275+
# ============================================================================
276+
- it: should inherit global.affinity when local affinity not set
277+
set:
278+
cluster: test-cluster
279+
global.affinity:
280+
nodeAffinity:
281+
requiredDuringSchedulingIgnoredDuringExecution:
282+
nodeSelectorTerms:
283+
- matchExpressions:
284+
- key: global-key
285+
operator: In
286+
values:
287+
- global-value
288+
asserts:
289+
- equal:
290+
path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key
291+
value: global-key
292+
293+
- it: should use local affinity over global.affinity
294+
set:
295+
cluster: test-cluster
296+
affinity:
297+
nodeAffinity:
298+
requiredDuringSchedulingIgnoredDuringExecution:
299+
nodeSelectorTerms:
300+
- matchExpressions:
301+
- key: local-key
302+
operator: In
303+
values:
304+
- local-value
305+
global.affinity:
306+
nodeAffinity:
307+
requiredDuringSchedulingIgnoredDuringExecution:
308+
nodeSelectorTerms:
309+
- matchExpressions:
310+
- key: global-key
311+
operator: In
312+
values:
313+
- global-value
314+
asserts:
315+
- equal:
316+
path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key
317+
value: local-key

‎charts/nri-metadata-injection/tests/serviceaccount-global_test.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
suite: test ServiceAccount global values
2+
templates:
3+
- templates/admission-webhooks/job-patch/serviceaccount.yaml
4+
release:
5+
name: my-release
6+
namespace: my-namespace
7+
tests:
8+
# ============================================================================
9+
# global.serviceAccount.create
10+
# ============================================================================
11+
- it: should create ServiceAccount when global.serviceAccount.create is true
12+
set:
13+
cluster: test-cluster
14+
global.serviceAccount.create: true
15+
asserts:
16+
- hasDocuments:
17+
count: 1
18+
- isKind:
19+
of: ServiceAccount
20+
21+
- it: should not create ServiceAccount when global.serviceAccount.create is false
22+
set:
23+
cluster: test-cluster
24+
global.serviceAccount.create: false
25+
asserts:
26+
- hasDocuments:
27+
count: 0
28+
29+
- it: should use local serviceAccount.create over global.serviceAccount.create
30+
set:
31+
cluster: test-cluster
32+
serviceAccount.create: true
33+
global.serviceAccount.create: false
34+
asserts:
35+
- hasDocuments:
36+
count: 1
37+
38+
# ============================================================================
39+
# global.serviceAccount.name (via common-library)
40+
# ============================================================================
41+
- it: should use default ServiceAccount name when neither local nor global set
42+
set:
43+
cluster: test-cluster
44+
serviceAccount.create: true
45+
asserts:
46+
- equal:
47+
path: metadata.name
48+
value: my-release-nri-metadata-injection-admission

0 commit comments

Comments
 (0)