From bb0cf4c985cfbb03080e2ed255d9cc456f312c06 Mon Sep 17 00:00:00 2001 From: Chahdro Date: Tue, 12 Mar 2024 08:29:01 -0400 Subject: [PATCH] fix: Adjust chart templates to handle hostNetwork set to true (#9864) * fix(kyverno-chart): Adjust templates to handle hostNetwork set to true Signed-off-by: Chahdra Konlack * Change containerPort of cleanup-controller to use server port instead Signed-off-by: Chahdra Konlack --------- Signed-off-by: Chahdra Konlack Co-authored-by: shuting --- charts/kyverno/templates/admission-controller/deployment.yaml | 4 ++-- charts/kyverno/templates/admission-controller/service.yaml | 2 +- charts/kyverno/templates/cleanup-controller/deployment.yaml | 4 ++-- charts/kyverno/templates/cleanup-controller/service.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/kyverno/templates/admission-controller/deployment.yaml b/charts/kyverno/templates/admission-controller/deployment.yaml index 7eaea1ff7f..dae95c4093 100644 --- a/charts/kyverno/templates/admission-controller/deployment.yaml +++ b/charts/kyverno/templates/admission-controller/deployment.yaml @@ -189,10 +189,10 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} ports: - - containerPort: 9443 + - containerPort: {{ .Values.admissionController.webhookServer.port }} name: https protocol: TCP - - containerPort: 8000 + - containerPort: {{ .Values.admissionController.metering.port }} name: metrics-port protocol: TCP {{ if .Values.admissionController.profiling.enabled }} diff --git a/charts/kyverno/templates/admission-controller/service.yaml b/charts/kyverno/templates/admission-controller/service.yaml index dd1a7ebdda..597b79fff0 100644 --- a/charts/kyverno/templates/admission-controller/service.yaml +++ b/charts/kyverno/templates/admission-controller/service.yaml @@ -36,7 +36,7 @@ metadata: spec: ports: - port: {{ .Values.admissionController.metricsService.port }} - targetPort: 8000 + targetPort: {{ .Values.admissionController.metering.port }} protocol: TCP name: metrics-port {{- if and (eq .Values.admissionController.metricsService.type "NodePort") (not (empty .Values.admissionController.metricsService.nodePort)) }} diff --git a/charts/kyverno/templates/cleanup-controller/deployment.yaml b/charts/kyverno/templates/cleanup-controller/deployment.yaml index 07d5a98724..41f33bac97 100644 --- a/charts/kyverno/templates/cleanup-controller/deployment.yaml +++ b/charts/kyverno/templates/cleanup-controller/deployment.yaml @@ -80,10 +80,10 @@ spec: image: {{ include "kyverno.cleanup-controller.image" (dict "globalRegistry" .Values.global.image.registry "image" .Values.cleanupController.image "defaultTag" .Chart.AppVersion) | quote }} imagePullPolicy: {{ .Values.cleanupController.image.pullPolicy }} ports: - - containerPort: 9443 + - containerPort: {{ .Values.cleanupController.server.port }} name: https protocol: TCP - - containerPort: 8000 + - containerPort: {{ .Values.cleanupController.metering.port }} name: metrics protocol: TCP {{ if .Values.cleanupController.profiling.enabled }} diff --git a/charts/kyverno/templates/cleanup-controller/service.yaml b/charts/kyverno/templates/cleanup-controller/service.yaml index 94981d5c56..7d61b924c1 100644 --- a/charts/kyverno/templates/cleanup-controller/service.yaml +++ b/charts/kyverno/templates/cleanup-controller/service.yaml @@ -39,7 +39,7 @@ metadata: spec: ports: - port: {{ .Values.cleanupController.metricsService.port }} - targetPort: 8000 + targetPort: {{ .Values.cleanupController.metering.port }} protocol: TCP name: metrics-port {{- if and (eq .Values.cleanupController.metricsService.type "NodePort") (not (empty .Values.cleanupController.metricsService.nodePort)) }}