From 718fb74a15842d2bf178d3ad44a5d73d2986433b Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 9 Mar 2023 09:44:02 +0100 Subject: [MULTICLOUD] Cleanup charts and add Ingress configs Remove AAF/TLS configurations and enable NodePort/Ingress configuration for MC services Issue-ID: OOM-3117 Signed-off-by: Andreas Geissler Change-Id: I9e3c7dfa3b15202a6e0f4cad7a3cdf616198e644 --- .../multicloud-k8s/templates/deployment.yaml | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml') diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml index ed6b64c198..325dbb0308 100644 --- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml +++ b/kubernetes/multicloud/components/multicloud-k8s/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: - matchLabels: - app: {{ include "common.name" . }} + selector: {{- include "common.selectors" . | nindent 4 }} replicas: {{ .Values.replicaCount }} template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ include "common.release" . }} + metadata: {{- include "common.templateMetadata" . | nindent 6 }} spec: containers: - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} @@ -41,8 +29,7 @@ spec: name: {{ include "common.name" . }} command: ["/opt/multicloud/k8splugin/k8plugin"] workingDir: /opt/multicloud/k8splugin - ports: - - containerPort: {{ .Values.service.internalPort }} + ports: {{ include "common.containerPorts" . | nindent 10 }} {{- if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: -- cgit 1.2.3-korg