Allow custom labels to be added by user (#205)

rocky341 · ctas582 · web-flow · commit 377655a59d9a · 2022-02-23T15:51:45.000Z
* 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 &lt;ctas582@users.noreply.github.com&gt;
diff --git a/kubernetes/accumulo/templates/_helpers.tpl b/kubernetes/accumulo/templates/_helpers.tpl
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "accumulo.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.labels }}
+{{ toYaml .Values.labels }}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/accumulo/templates/gc/deployment.yaml b/kubernetes/accumulo/templates/gc/deployment.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "accumulo.selectorLabels" . | nindent 8 }}
+        {{- include "accumulo.labels" . | nindent 8 }}
         app.kubernetes.io/component: gc
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
diff --git a/kubernetes/accumulo/templates/master/statefulset.yaml b/kubernetes/accumulo/templates/master/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "accumulo.selectorLabels" . | nindent 8 }}
+        {{- include "accumulo.labels" . | nindent 8 }}
         app.kubernetes.io/component: master
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
diff --git a/kubernetes/accumulo/templates/monitor/deployment.yaml b/kubernetes/accumulo/templates/monitor/deployment.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "accumulo.selectorLabels" . | nindent 8 }}
+        {{- include "accumulo.labels" . | nindent 8 }}
         app.kubernetes.io/component: monitor
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
diff --git a/kubernetes/accumulo/templates/tserver/statefulset.yaml b/kubernetes/accumulo/templates/tserver/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "accumulo.selectorLabels" . | nindent 8 }}
+        {{- include "accumulo.labels" . | nindent 8 }}
         app.kubernetes.io/component: tserver
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
diff --git a/kubernetes/accumulo/values.yaml b/kubernetes/accumulo/values.yaml
@@ -14,6 +14,7 @@
 
 nameOverride: ""
 fullnameOverride: ""
+labels: {}
 
 hdfs:
   enabled: true
diff --git a/kubernetes/gaffer-road-traffic/templates/_helpers.tpl b/kubernetes/gaffer-road-traffic/templates/_helpers.tpl
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "gaffer-road-traffic.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.labels }}
+{{ toYaml .Values.labels }}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/gaffer-road-traffic/templates/data-loader-job.yaml b/kubernetes/gaffer-road-traffic/templates/data-loader-job.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "gaffer-road-traffic.selectorLabels" . | nindent 8 }}
+        {{- include "gaffer-road-traffic.labels" . | nindent 8 }}
         app.kubernetes.io/component: loader
     spec:
       restartPolicy: OnFailure
diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml
@@ -14,6 +14,7 @@
 
 nameOverride: ""
 fullnameOverride: ""
+labels: {}
 
 loader:
   image:
diff --git a/kubernetes/gaffer/templates/_helpers.tpl b/kubernetes/gaffer/templates/_helpers.tpl
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "gaffer.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.labels }}
+{{ toYaml .Values.labels }}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/gaffer/templates/api/deployment.yaml b/kubernetes/gaffer/templates/api/deployment.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "gaffer.selectorLabels" . | nindent 8 }}
+        {{- include "gaffer.labels" . | nindent 8 }}
         app.kubernetes.io/component: api
       annotations:
         checksum/graph-config: {{ include (print $.Template.BasePath "/api/config/graph-config.yaml") . | sha256sum }}
diff --git a/kubernetes/gaffer/templates/ingress.yaml b/kubernetes/gaffer/templates/ingress.yaml
@@ -38,7 +38,7 @@ spec:
         backend:
           service:
             name: {{ include "gaffer.fullname" . }}-api
-            port: 
+            port:
               name: http
 {{- else }}
         backend:
@@ -51,7 +51,7 @@ spec:
         backend:
           service:
             name: {{ include "gaffer.fullname" . }}-ui
-            port: 
+            port:
               name: http
 {{- else }}
         backend:
diff --git a/kubernetes/gaffer/templates/ui/deployment.yaml b/kubernetes/gaffer/templates/ui/deployment.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "gaffer.selectorLabels" . | nindent 8 }}
+        {{- include "gaffer.labels" . | nindent 8 }}
         app.kubernetes.io/component: ui
       annotations:
         checksum/ui-config: {{ include (print $.Template.BasePath "/ui/ui-config.yaml") . | sha256sum }}
@@ -54,6 +54,12 @@ spec:
           httpGet:
             path: /ui/#!/graph
             port: http
+        startupProbe:
+         httpGet:
+           path: /ui/
+           port: http
+         failureThreshold: 30
+         periodSeconds: 10
         resources:
           {{- toYaml .Values.ui.resources | nindent 10 }}
       {{- with .Values.ui.affinity }}
diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml
@@ -14,6 +14,7 @@
 
 nameOverride: ""
 fullnameOverride: ""
+labels: {}
 
 graph:
   config:
diff --git a/kubernetes/hdfs/templates/_helpers.tpl b/kubernetes/hdfs/templates/_helpers.tpl
@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "hdfs.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.labels }}
+{{ toYaml .Values.labels }}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/hdfs/templates/datanodes.yaml b/kubernetes/hdfs/templates/datanodes.yaml
@@ -31,6 +31,8 @@ spec:
 {{- range $k, $v := until (int .Values.datanode.dataVolumes.count) }}
   - metadata:
       name: data{{$v}}
+      labels:
+        {{- include "hdfs.labels" $ | nindent 8 }}
     spec:
       {{- toYaml $.Values.datanode.dataVolumes.pvcTemplateSpec | nindent 6 }}
 {{- end }}
@@ -40,7 +42,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
       labels:
-        {{- include "hdfs.selectorLabels" . | nindent 8 }}
+        {{- include "hdfs.labels" . | nindent 8 }}
         app.kubernetes.io/component: datanode
     spec:
       initContainers:
diff --git a/kubernetes/hdfs/templates/namenode.yaml b/kubernetes/hdfs/templates/namenode.yaml
@@ -31,6 +31,8 @@ spec:
 {{- range $k, $v := until (int .Values.namenode.dataVolumes.count) }}
   - metadata:
       name: data{{$v}}
+      labels:
+        {{- include "hdfs.labels" $ | nindent 8 }}
     spec:
       {{- toYaml $.Values.namenode.dataVolumes.pvcTemplateSpec | nindent 6 }}
 {{- end }}
@@ -40,7 +42,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
       labels:
-        {{- include "hdfs.selectorLabels" . | nindent 8 }}
+        {{- include "hdfs.labels" . | nindent 8 }}
         app.kubernetes.io/component: namenode
     spec:
       {{- if and .Values.config.rackAwareness .Values.config.rackAwareness.nodeTopologyLabel }}
diff --git a/kubernetes/hdfs/templates/shell.yaml b/kubernetes/hdfs/templates/shell.yaml
@@ -35,7 +35,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
       labels:
-        {{- include "hdfs.selectorLabels" . | nindent 8 }}
+        {{- include "hdfs.labels" . | nindent 8 }}
         app.kubernetes.io/component: shell
     spec:
       containers:
diff --git a/kubernetes/hdfs/values.yaml b/kubernetes/hdfs/values.yaml
@@ -112,6 +112,7 @@ secrets:
 
 nameOverride: ""
 fullnameOverride: ""
+labels: {}
 
 ingress:
   enabled: true
