From 44a6b20d9e7a45b0639dc6d35639e8ae77a7c778 Mon Sep 17 00:00:00 2001 From: Ido Heyvi Date: Mon, 3 Feb 2025 14:03:19 +0200 Subject: [PATCH] bug: fix admission_controller template cabundle cert, for non cert-manager usage Signed-off-by: Ido Heyvi --- .../network-operator/templates/admission_controller.yaml | 4 ++-- deployment/network-operator/values.yaml | 5 +++++ hack/templates/values/values.template | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deployment/network-operator/templates/admission_controller.yaml b/deployment/network-operator/templates/admission_controller.yaml index a8246e60b..a619c028d 100644 --- a/deployment/network-operator/templates/admission_controller.yaml +++ b/deployment/network-operator/templates/admission_controller.yaml @@ -76,7 +76,7 @@ webhooks: namespace: {{ .Release.Namespace }} path: /validate-mellanox-com-v1alpha1-hostdevicenetwork {{- if not .Values.operator.admissionController.useCertManager }} - caBundle: {{ .Values.operator.admissionController.certificate.tlsCrt | b64enc | quote }} + caBundle: {{ .Values.operator.admissionController.certificate.caCrt | b64enc | quote }} {{- end }} failurePolicy: Fail name: vhostdevicenetwork.kb.io @@ -99,7 +99,7 @@ webhooks: namespace: {{ .Release.Namespace }} path: /validate-mellanox-com-v1alpha1-nicclusterpolicy {{- if not .Values.operator.admissionController.useCertManager }} - caBundle: {{ .Values.operator.admissionController.certificate.tlsCrt | b64enc | quote }} + caBundle: {{ .Values.operator.admissionController.certificate.caCrt | b64enc | quote }} {{- end }} failurePolicy: Fail name: vnicclusterpolicy.kb.io diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml index 715f438e2..bbfb4fa2d 100644 --- a/deployment/network-operator/values.yaml +++ b/deployment/network-operator/values.yaml @@ -275,6 +275,11 @@ operator: # -- Use cert-manager for generating self-signed certificate. useCertManager: true # certificate: + # caCrt: | + # -----BEGIN CERTIFICATE----- + # MIIMIICLDCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G + # ... + # -----END CERTIFICATE----- # tlsCrt: | # -----BEGIN CERTIFICATE----- # MIIMIICLDCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G diff --git a/hack/templates/values/values.template b/hack/templates/values/values.template index ec30a2b56..81a7a5c97 100644 --- a/hack/templates/values/values.template +++ b/hack/templates/values/values.template @@ -275,6 +275,11 @@ operator: # -- Use cert-manager for generating self-signed certificate. useCertManager: true # certificate: + # caCrt: | + # -----BEGIN CERTIFICATE----- + # MIIMIICLDCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G + # ... + # -----END CERTIFICATE----- # tlsCrt: | # -----BEGIN CERTIFICATE----- # MIIMIICLDCCAdKgAwIBAgIBADAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G