Fix wrong ca bundle for admission webhook

Signed-off-by: Timothy Lee <ctiml@infuseai.io>

Author: ctiml

chart/templates/_helper.tpl

@@ -247,7 +247,7 @@ primehub deployment
 primehub admission
 */}}
 {{- define "primehub-admission.webhook-certs.manage" -}}
-{{- $data := (dict "cert" "" "key" "" "test" "") }}
+{{- $data := (dict "cacert" "" "cert" "" "key" "") }}
 {{- $secretData := (lookup "v1" "Secret" .Release.Namespace "primehub-admission-webhook-certs").data -}}
 {{- if $secretData }}
   {{- if hasKey $secretData "cert.pem" }}
@@ -256,17 +256,16 @@ primehub admission
   {{- if hasKey $secretData "key.pem" }}
     {{- $_ := set $data "key" (index $secretData "key.pem" | quote) }}
   {{- end -}}
-  {{- $_ := set $data "test" "from secret" }}
 {{- else }}
   {{- $ca := genCA "primehub-admission-webhook-certs" 3650 }}
+  {{- $_ := set $data "cacert" ($ca.Cert | b64enc | quote) }}
   {{- $cn := "primehub-admission" }}
   {{- $altName1 := printf "%s.%s" $cn .Release.Namespace }}
   {{- $altName2 := printf "%s.%s.svc" $cn .Release.Namespace }}
   {{- $altNames := (list $altName1 $altName2) }}
   {{- $cert := genSignedCert $cn nil $altNames 3650 $ca }}
-  {{- $_ := set $data "cert" ($ca.Cert | b64enc | quote) }}
-  {{- $_ := set $data "key" ($ca.Key | b64enc | quote) }}
-  {{- $_ := set $data "test" "gen ca" }}
+  {{- $_ := set $data "cert" ($cert.Cert | b64enc | quote) }}
+  {{- $_ := set $data "key" ($cert.Key | b64enc | quote) }}
 {{- end -}}
 {{- $data | toYaml -}}
 {{- end -}}

chart/templates/admission/webhook.yaml

@@ -12,7 +12,7 @@ webhooks:
         name: primehub-admission
         namespace: {{ .Release.Namespace }}
         path: "/image-mutation"
-      caBundle: {{ get $data "cert" }}
+      caBundle: {{ get $data "cacert" }}
     rules:
       - operations: [ "CREATE" ]
         apiGroups: ["*"]
@@ -36,7 +36,7 @@ webhooks:
         name: primehub-admission
         namespace: {{ .Release.Namespace }}
         path: /pvc-check
-      caBundle: {{ get $data "cert" }}
+      caBundle: {{ get $data "cacert" }}
     rules:
       - operations: [ "CREATE" ]
         apiGroups: ["*"]
@@ -60,7 +60,7 @@ webhooks:
         name: primehub-admission
         namespace: {{ .Release.Namespace }}
         path: "/"
-      caBundle: {{ get $data "cert" }}
+      caBundle: {{ get $data "cacert" }}
     rules:
       - operations: [ "CREATE" ]
         apiGroups: ["*"]
@@ -84,7 +84,7 @@ webhooks:
         name: primehub-admission
         namespace: {{ .Release.Namespace }}
         path: /license-check
-      caBundle: {{ get $data "cert" }}
+      caBundle: {{ get $data "cacert" }}
     failurePolicy: Ignore
     namespaceSelector:
       matchLabels: