From fc55fbf5e322a8ba35b93cfc9af50b2ea3f52995 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Wed, 19 Jul 2023 14:48:39 +0200 Subject: [POLICY] Correct container ports in Nexus and GUI Use templates in deployment.yaml to fix container port settings Issue-ID: OOM-3231 Change-Id: I4802ad318ec87fd55980483caa86a1ab7f018693 Signed-off-by: Andreas Geissler --- kubernetes/policy/components/policy-gui/templates/deployment.yaml | 3 +-- .../policy/components/policy-nexus/templates/deployment.yaml | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml index 7a573d0356..69b5e37ed4 100644 --- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml @@ -69,8 +69,7 @@ spec: env: - name: CLAMP_URL value: http://policy-clamp-runtime-acm:6969 - 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 eq .Values.liveness.enabled true }} diff --git a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml index b18be93805..ec579d8088 100755 --- a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml @@ -36,19 +36,18 @@ spec: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.externalPort }} + ports: {{ include "common.containerPorts" . | nindent 12 }} {{- if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: - port: {{ .Values.service.externalPort }} + port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end -}} readinessProbe: httpGet: path: {{ .Values.readiness.path }} - port: {{ .Values.service.externalPort }} + port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} volumeMounts: -- cgit 1.2.3-korg