Skip to content

Commit 31776df

Browse files
FEATURE/MINOR: kubernetes-ingress: Add metrics service-specific metadata (#229)
Adds `controller.service.metrics.labels` and `controller.service.metrics.annotations` so that the metrics service can have its metadata templated using metadata not shared by the main service.
1 parent 3b8bb38 commit 31776df

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

kubernetes-ingress/templates/controller-service-metrics.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ metadata:
4040
app.kubernetes.io/managed-by: {{ .Release.Service }}
4141
app.kubernetes.io/instance: {{ .Release.Name }}
4242
app.kubernetes.io/version: {{ .Chart.AppVersion }}
43-
{{- if .Values.controller.service.labels }}
44-
{{ toYaml .Values.controller.service.labels | indent 4 }}
43+
{{- if .Values.controller.service.metrics.labels }}
44+
{{ toYaml .Values.controller.service.metrics.labels | indent 4 }}
4545
{{- end }}
4646
annotations:
47-
{{- range $key, $value := .Values.controller.service.annotations }}
47+
{{- range $key, $value := .Values.controller.service.metrics.annotations }}
4848
{{ $key }}: {{ $value | quote }}
4949
{{- end }}
5050
spec:

kubernetes-ingress/values.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,17 @@ controller:
460460
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
461461
# sessionAffinity: ""
462462

463+
## Controller Metrics Service configuration
464+
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
465+
metrics:
466+
## Service annotations
467+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
468+
annotations: {}
469+
470+
## Service labels
471+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
472+
labels: {}
473+
463474
## Controller DaemonSet configuration
464475
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/
465476
daemonset:

0 commit comments

Comments
 (0)