Skip to content

Commit 377655a

Browse files
rocky341ctas582
rocky341
and
ctas582
authored
Allow custom labels to be added by user (#205)
* Making routes HTTPS and setting resources for API/UI * Adjusted resource limits/requests * reduced cpu limit but raised request * PR Changes to enable custom labels * 80 to http * Add extra labels inside the template helper so that they get added to all resources * Allow extra labels to be added to all Helm charts * Add labels to PVCs * Ensure all labels are added to templated pods rather than just selectorLabels Co-authored-by: ctas582 <[email protected]>
1 parent 79d7edf commit 377655a

19 files changed

+38
-12
lines changed

Diff for: ‎kubernetes/accumulo/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "accumulo.chart" . }}
4141
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4242
{{- end }}
4343
app.kubernetes.io/managed-by: {{ .Release.Service }}
44+
{{- if .Values.labels }}
45+
{{ toYaml .Values.labels }}
46+
{{- end -}}
4447
{{- end -}}
4548

4649
{{/*

Diff for: ‎kubernetes/accumulo/templates/gc/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
template:
2929
metadata:
3030
labels:
31-
{{- include "accumulo.selectorLabels" . | nindent 8 }}
31+
{{- include "accumulo.labels" . | nindent 8 }}
3232
app.kubernetes.io/component: gc
3333
annotations:
3434
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}

Diff for: ‎kubernetes/accumulo/templates/master/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
template:
3131
metadata:
3232
labels:
33-
{{- include "accumulo.selectorLabels" . | nindent 8 }}
33+
{{- include "accumulo.labels" . | nindent 8 }}
3434
app.kubernetes.io/component: master
3535
annotations:
3636
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}

Diff for: ‎kubernetes/accumulo/templates/monitor/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
template:
2929
metadata:
3030
labels:
31-
{{- include "accumulo.selectorLabels" . | nindent 8 }}
31+
{{- include "accumulo.labels" . | nindent 8 }}
3232
app.kubernetes.io/component: monitor
3333
annotations:
3434
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}

Diff for: ‎kubernetes/accumulo/templates/tserver/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
template:
3131
metadata:
3232
labels:
33-
{{- include "accumulo.selectorLabels" . | nindent 8 }}
33+
{{- include "accumulo.labels" . | nindent 8 }}
3434
app.kubernetes.io/component: tserver
3535
annotations:
3636
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}

Diff for: ‎kubernetes/accumulo/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
nameOverride: ""
1616
fullnameOverride: ""
17+
labels: {}
1718

1819
hdfs:
1920
enabled: true

Diff for: ‎kubernetes/gaffer-road-traffic/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "gaffer-road-traffic.chart" . }}
4141
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4242
{{- end }}
4343
app.kubernetes.io/managed-by: {{ .Release.Service }}
44+
{{- if .Values.labels }}
45+
{{ toYaml .Values.labels }}
46+
{{- end -}}
4447
{{- end -}}
4548

4649
{{/*

Diff for: ‎kubernetes/gaffer-road-traffic/templates/data-loader-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
template:
2525
metadata:
2626
labels:
27-
{{- include "gaffer-road-traffic.selectorLabels" . | nindent 8 }}
27+
{{- include "gaffer-road-traffic.labels" . | nindent 8 }}
2828
app.kubernetes.io/component: loader
2929
spec:
3030
restartPolicy: OnFailure

Diff for: ‎kubernetes/gaffer-road-traffic/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
nameOverride: ""
1616
fullnameOverride: ""
17+
labels: {}
1718

1819
loader:
1920
image:

Diff for: ‎kubernetes/gaffer/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "gaffer.chart" . }}
4141
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4242
{{- end }}
4343
app.kubernetes.io/managed-by: {{ .Release.Service }}
44+
{{- if .Values.labels }}
45+
{{ toYaml .Values.labels }}
46+
{{- end -}}
4447
{{- end -}}
4548

4649
{{/*

Diff for: ‎kubernetes/gaffer/templates/api/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
template:
2929
metadata:
3030
labels:
31-
{{- include "gaffer.selectorLabels" . | nindent 8 }}
31+
{{- include "gaffer.labels" . | nindent 8 }}
3232
app.kubernetes.io/component: api
3333
annotations:
3434
checksum/graph-config: {{ include (print $.Template.BasePath "/api/config/graph-config.yaml") . | sha256sum }}

Diff for: ‎kubernetes/gaffer/templates/ingress.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
backend:
3939
service:
4040
name: {{ include "gaffer.fullname" . }}-api
41-
port:
41+
port:
4242
name: http
4343
{{- else }}
4444
backend:
@@ -51,7 +51,7 @@ spec:
5151
backend:
5252
service:
5353
name: {{ include "gaffer.fullname" . }}-ui
54-
port:
54+
port:
5555
name: http
5656
{{- else }}
5757
backend:

Diff for: ‎kubernetes/gaffer/templates/ui/deployment.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
template:
2929
metadata:
3030
labels:
31-
{{- include "gaffer.selectorLabels" . | nindent 8 }}
31+
{{- include "gaffer.labels" . | nindent 8 }}
3232
app.kubernetes.io/component: ui
3333
annotations:
3434
checksum/ui-config: {{ include (print $.Template.BasePath "/ui/ui-config.yaml") . | sha256sum }}
@@ -54,6 +54,12 @@ spec:
5454
httpGet:
5555
path: /ui/#!/graph
5656
port: http
57+
startupProbe:
58+
httpGet:
59+
path: /ui/
60+
port: http
61+
failureThreshold: 30
62+
periodSeconds: 10
5763
resources:
5864
{{- toYaml .Values.ui.resources | nindent 10 }}
5965
{{- with .Values.ui.affinity }}

Diff for: ‎kubernetes/gaffer/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
nameOverride: ""
1616
fullnameOverride: ""
17+
labels: {}
1718

1819
graph:
1920
config:

Diff for: ‎kubernetes/hdfs/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "hdfs.chart" . }}
4141
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4242
{{- end }}
4343
app.kubernetes.io/managed-by: {{ .Release.Service }}
44+
{{- if .Values.labels }}
45+
{{ toYaml .Values.labels }}
46+
{{- end -}}
4447
{{- end -}}
4548

4649
{{/*

Diff for: ‎kubernetes/hdfs/templates/datanodes.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ spec:
3131
{{- range $k, $v := until (int .Values.datanode.dataVolumes.count) }}
3232
- metadata:
3333
name: data{{$v}}
34+
labels:
35+
{{- include "hdfs.labels" $ | nindent 8 }}
3436
spec:
3537
{{- toYaml $.Values.datanode.dataVolumes.pvcTemplateSpec | nindent 6 }}
3638
{{- end }}
@@ -40,7 +42,7 @@ spec:
4042
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
4143
checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
4244
labels:
43-
{{- include "hdfs.selectorLabels" . | nindent 8 }}
45+
{{- include "hdfs.labels" . | nindent 8 }}
4446
app.kubernetes.io/component: datanode
4547
spec:
4648
initContainers:

Diff for: ‎kubernetes/hdfs/templates/namenode.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ spec:
3131
{{- range $k, $v := until (int .Values.namenode.dataVolumes.count) }}
3232
- metadata:
3333
name: data{{$v}}
34+
labels:
35+
{{- include "hdfs.labels" $ | nindent 8 }}
3436
spec:
3537
{{- toYaml $.Values.namenode.dataVolumes.pvcTemplateSpec | nindent 6 }}
3638
{{- end }}
@@ -40,7 +42,7 @@ spec:
4042
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
4143
checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
4244
labels:
43-
{{- include "hdfs.selectorLabels" . | nindent 8 }}
45+
{{- include "hdfs.labels" . | nindent 8 }}
4446
app.kubernetes.io/component: namenode
4547
spec:
4648
{{- if and .Values.config.rackAwareness .Values.config.rackAwareness.nodeTopologyLabel }}

Diff for: ‎kubernetes/hdfs/templates/shell.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
3636
checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
3737
labels:
38-
{{- include "hdfs.selectorLabels" . | nindent 8 }}
38+
{{- include "hdfs.labels" . | nindent 8 }}
3939
app.kubernetes.io/component: shell
4040
spec:
4141
containers:

Diff for: ‎kubernetes/hdfs/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ secrets:
112112

113113
nameOverride: ""
114114
fullnameOverride: ""
115+
labels: {}
115116

116117
ingress:
117118
enabled: true

0 commit comments

Comments
 (0)