diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-07-17 18:55:54 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-07-18 19:01:11 +0200 |
| commit | ceac26096eeda210db046686494fdf11afbf0ab8 (patch) | |
| tree | 3bdc799a865c7fa74320cf981f0a17a36008d42e /kubernetes/aai/templates | |
| parent | e5f9156814f2571b0f4b79a4ba5789b743d837db (diff) | |
[AAI] Fix Istio compatibility and add Job ServiceAccount
Add labels for "version" and "name", add port name in deployment
Add missing Service account in Job definitions
Issue-ID: OOM-3229
Issue-ID: OOM-3228
Change-Id: I65c188f4c029b94cc0dc77ebe9e00bfc9a0cb27a
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/aai/templates')
| -rw-r--r-- | kubernetes/aai/templates/deployment.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/aai/templates/service.yaml | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index 2722412bb6..fa26837114 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -23,6 +23,12 @@ metadata: namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} + app.kubernetes.io/name: {{ include "common.name" . }} + {{- if .Chart.AppVersion }} + version: {{ .Chart.AppVersion | replace "+" "_" }} + {{- else }} + version: {{ .Chart.Version | replace "+" "_" }} + {{- end }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} heritage: {{ .Release.Service }} @@ -43,6 +49,12 @@ spec: labels: app: {{ include "common.name" . }} release: {{ include "common.release" . }} + app.kubernetes.io/name: {{ include "common.name" . }} + {{- if .Chart.AppVersion }} + version: {{ .Chart.AppVersion | replace "+" "_" }} + {{- else }} + version: {{ .Chart.Version | replace "+" "_" }} + {{- end }} name: {{ include "common.release" . }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} @@ -93,7 +105,9 @@ spec: name: haproxy-cfg ports: - containerPort: {{ .Values.service.internalPort }} + name: {{ .Values.service.portName }} - containerPort: {{ .Values.metricsService.internalPort }} + name: {{ .Values.metricsService.portName }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} diff --git a/kubernetes/aai/templates/service.yaml b/kubernetes/aai/templates/service.yaml index 5bb5c8bf28..ecbab26439 100644 --- a/kubernetes/aai/templates/service.yaml +++ b/kubernetes/aai/templates/service.yaml @@ -21,6 +21,7 @@ metadata: namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} + app.kubernetes.io/name: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} heritage: {{ .Release.Service }} @@ -46,6 +47,7 @@ metadata: namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} + app.kubernetes.io/name: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} heritage: {{ .Release.Service }} @@ -65,6 +67,7 @@ metadata: namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }}-metrics + app.kubernetes.io/name: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ include "common.release" . }} heritage: {{ .Release.Service }} |