From 5846a6e2d0faa43d5abf23d79bd556508bb87d2d Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 30 Mar 2023 17:26:14 +0200 Subject: [AAI] Update Service definitions to support Ingress case Fix the service definitions to automatically change NodePorts to ClusterIPs in case of Ingress enabled Issue-ID: OOM-3111 Signed-off-by: Andreas Geissler Change-Id: I27fbcc917190f1df3d39f1bfc789664bb55809a2 --- .../components/aai-babel/templates/deployment.yaml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'kubernetes/aai/components/aai-babel/templates/deployment.yaml') diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml index 7a6b6f1639..397e8fd556 100644 --- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml @@ -19,18 +19,9 @@ 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: - matchLabels: - app: {{ include "common.name" . }} + selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} strategy: type: {{ .Values.updateStrategy.type }} @@ -40,18 +31,13 @@ spec: maxSurge: {{ .Values.updateStrategy.maxSurge }} {{- end }} template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} + metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: - initContainers: containers: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} + ports: {{ include "common.containerPorts" . | nindent 12 }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{ if .Values.liveness.enabled }} -- cgit 1.2.3-korg