Skip to content

Commit f11f729

Browse files
davidcollomdavidcollom
authored
Chore: Allow for overriding of Labels & Annotations for Service and Pods (#115)
1 parent 9259b6b commit f11f729

File tree

6 files changed

+140
-10
lines changed

6 files changed

+140
-10
lines changed

‎deploy/charts/version-checker/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ description: A Helm chart for version-checker
55
home: https://github.com/jetstack/version-checker
66
name: version-checker
77
maintainers:
8-
- name: davidcollom
8+
- name: davidcollom

‎deploy/charts/version-checker/templates/deployment.yaml

+9-4
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,27 @@ kind: Deployment
88
metadata:
99
name: {{ $chartname }}
1010
labels:
11-
{{ include "version-checker.labels" . | nindent 2 }}
11+
{{ include "version-checker.labels" . | nindent 4 }}
1212
spec:
1313
replicas: {{ .Values.replicaCount }}
1414
selector:
1515
matchLabels:
16-
app: {{ $chartname }}
16+
{{- include "version-checker.labels" . | nindent 6 }}
1717
template:
1818
metadata:
1919
labels:
20-
app: {{ $chartname }}
21-
{{ include "version-checker.labels" . | nindent 8 }}
20+
{{- include "version-checker.labels" . | nindent 8 }}
21+
{{- if .Values.additionalLabels }}
22+
{{ toYaml .Values.additionalLabels | nindent 8 }}
23+
{{- end }}
2224
annotations:
2325
prometheus.io/path: "/metrics"
2426
prometheus.io/scrape: "true"
2527
prometheus.io/port: "8080"
2628
enable.version-checker.io/{{ $chartname }}: "true"
29+
{{- if .Values.additionalAnnotations }}
30+
{{ toYaml .Values.additionalAnnotations | nindent 8 }}
31+
{{- end }}
2732
spec:
2833
serviceAccountName: {{ $chartname }}
2934
containers:

‎deploy/charts/version-checker/templates/service.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ metadata:
44
name: {{ include "version-checker.name" . }}
55
labels:
66
app: {{ include "version-checker.name" . }}
7-
{{ include "version-checker.labels" . | indent 4 }}
7+
{{ include "version-checker.labels" . | nindent 4 }}
8+
{{- if .Values.service.labels }}
9+
{{ toYaml .Values.service.labels | nindent 4 }}
10+
{{- end }}
11+
{{- if .Values.service.annotations }}
12+
annotations:
13+
{{ toYaml .Values.service.annotations | nindent 4 }}
14+
{{- end }}
815
spec:
916
ports:
1017
- port: {{ .Values.service.port }}
1118
targetPort: 8080
1219
protocol: TCP
1320
name: web
1421
selector:
15-
app: {{ include "version-checker.name" . }}
22+
{{ include "version-checker.labels" . | nindent 4 }}

‎deploy/charts/version-checker/tests/deployment_test.yaml

+83
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,57 @@ tests:
4545
- isNullOrEmpty:
4646
path: spec.template.spec.volumes
4747

48+
# Custom Envs
49+
- it: Custom Env vars
50+
set:
51+
env:
52+
- name: CUSTOM_ENV_VAR
53+
value: CUSTOM_ENV_VALUE
54+
asserts:
55+
- contains:
56+
path: spec.template.spec.containers[0].env
57+
count: 1
58+
content:
59+
name: CUSTOM_ENV_VAR
60+
value: CUSTOM_ENV_VALUE
61+
62+
# Param changes
63+
- it: imageCacheTimeout
64+
set:
65+
versionChecker.imageCacheTimeout: 60m
66+
asserts:
67+
- contains:
68+
path: spec.template.spec.containers[0].args
69+
count: 1
70+
content: "--image-cache-timeout=60m"
71+
72+
- it: logLevel
73+
set:
74+
versionChecker.logLevel: debug
75+
asserts:
76+
- contains:
77+
path: spec.template.spec.containers[0].args
78+
count: 1
79+
content: "--log-level=debug"
80+
81+
- it: metricsServingAddress
82+
set:
83+
versionChecker.metricsServingAddress: 0.0.0.0:9999
84+
asserts:
85+
- contains:
86+
path: spec.template.spec.containers[0].args
87+
count: 1
88+
content: "--metrics-serving-address=0.0.0.0:9999"
89+
90+
- it: testAllContainers
91+
set:
92+
versionChecker.testAllContainers: false
93+
asserts:
94+
- contains:
95+
path: spec.template.spec.containers[0].args
96+
count: 1
97+
content: "--test-all-containers=false"
98+
4899
# ACR
49100
- it: ACR should work
50101
set:
@@ -306,3 +357,35 @@ tests:
306357
name: version-checker
307358
secret:
308359
secretName: version-checker
360+
361+
- it: Resources are reflected
362+
set:
363+
resources:
364+
limits:
365+
cpu: 100m
366+
memory: 512Mi
367+
asserts:
368+
- equal:
369+
path: spec.template.spec.containers[0].resources
370+
value:
371+
limits:
372+
cpu: 100m
373+
memory: 512Mi
374+
375+
- it: Custom Labels to Pod
376+
set:
377+
additionalLabels:
378+
foo: bar
379+
asserts:
380+
- equal:
381+
path: spec.template.metadata.labels["foo"]
382+
value: bar
383+
384+
- it: Custom Annotations to Pod
385+
set:
386+
additionalAnnotations:
387+
foo: bar
388+
asserts:
389+
- equal:
390+
path: spec.template.metadata.annotations["foo"]
391+
value: bar

‎deploy/charts/version-checker/tests/service_test.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,38 @@ tests:
88
kind: Service
99
apiVersion: v1
1010
name: version-checker
11+
- equal:
12+
path: spec.ports[0].port
13+
value: 8080
1114
- equal:
1215
path: spec.ports[0].targetPort
1316
value: 8080
1417
- equal:
1518
path: spec.ports[0].name
1619
value: web
20+
21+
- it: Custom Port
22+
set:
23+
service.port: 9999
24+
asserts:
25+
- equal:
26+
path: spec.ports[0].port
27+
value: 9999
28+
29+
- it: Custom Labels
30+
set:
31+
service.labels:
32+
foo: bar
33+
asserts:
34+
- equal:
35+
path: metadata.labels["foo"]
36+
value: bar
37+
38+
- it: Custom Annotations
39+
set:
40+
service.annotations:
41+
foo: bar
42+
asserts:
43+
- equal:
44+
path: metadata.annotations["foo"]
45+
value: bar

‎deploy/charts/version-checker/values.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44

55
replicaCount: 1
66

7+
additionalLabels: {}
8+
additionalAnnotations: {}
9+
710
image:
811
repository: quay.io/jetstack/version-checker
912
# Override the chart version
1013
tag:
1114
pullPolicy: IfNotPresent
1215

1316
service:
17+
labels: {}
18+
annotations: {}
1419
port: 8080
1520

1621
versionChecker:
@@ -48,7 +53,8 @@ quay:
4853
# Can be used to provide custom environment variables e.g. proxy settings
4954
env: {}
5055

51-
selfhosted: {}
56+
selfhosted:
57+
{}
5258
#- name: REGISTRY
5359
# host: http://registry:5000
5460
# username:
@@ -60,7 +66,8 @@ selfhosted: {}
6066
# password: bar
6167
# token:
6268

63-
resources: {}
69+
resources:
70+
{}
6471
# limits:
6572
# cpu: 100m
6673
# memory: 128Mi
@@ -85,7 +92,6 @@ livenessProbe:
8592
initialDelaySeconds: 3
8693
periodSeconds: 3
8794

88-
8995
# Prometheus Operator
9096
prometheus:
9197
enabled: false

0 commit comments

Comments
 (0)