diff options
author | Andreas Geissler <andreas-geissler@telekom.de> | 2023-07-20 11:15:42 +0200 |
---|---|---|
committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-07-21 11:23:36 +0200 |
commit | 8c55fdd1dc3f78e32d7214353f09dd67831de216 (patch) | |
tree | 90e904a7ba132092a9c17e1e52a1fa9610ae8dde /kubernetes/common/network-name-gen | |
parent | 74ef268ceb0d9cb3361c5ed252a86ed9d30a7f0d (diff) |
[COMMON] Add missing labels for etcd, mongo, postgres
Add labels for DB deployments to be compliant with Istio
and kiali requirements
Issue-ID: OOM-3230
Change-Id: I937d9f326dae8e2c2496eace2e919aa0b8eb0171
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/common/network-name-gen')
-rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 18 | ||||
-rw-r--r-- | kubernetes/common/network-name-gen/templates/service.yaml | 5 |
2 files changed, 6 insertions, 17 deletions
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index 47f76a375f..71b7846dc9 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -16,24 +16,12 @@ apiVersion: apps/v1 kind: Deployment -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} +metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: + selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: {{ include "common.name" . }} template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} + metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: initContainers: - name: {{ include "common.name" . }}-readiness diff --git a/kubernetes/common/network-name-gen/templates/service.yaml b/kubernetes/common/network-name-gen/templates/service.yaml index 753448c5b7..aac71f7eb3 100644 --- a/kubernetes/common/network-name-gen/templates/service.yaml +++ b/kubernetes/common/network-name-gen/templates/service.yaml @@ -38,5 +38,6 @@ spec: name: {{ .Values.service.portName }} {{- end}} selector: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} + app.kubernetes.io/name: {{ include "common.name" . }} + app.kubernetes.io/instance: {{ include "common.release" . }} + |