Merge pull request #89 from stakater/update-charts

Update Charts
stakater · May 13, 2022 · a20fec7 · a20fec7
2 parents 508e3e5 + 00e4c6a
commit a20fec7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/charts/jira-service-desk-operator/templates/certificate.yaml b/charts/jira-service-desk-operator/templates/certificate.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.webhook.enabled }}
 
 {{- if not (.Capabilities.APIVersions.Has "cert-manager.io/v1") -}}
-    {{- fail "cert-manager is not installed" }}
+    {{- fail "cert-manager/v1 CRDs not installed" }}
 {{ end }}
 ---
 apiVersion: cert-manager.io/v1

diff --git a/charts/jira-service-desk-operator/templates/deployment.yaml b/charts/jira-service-desk-operator/templates/deployment.yaml
@@ -75,7 +75,6 @@ spec:
         ports:
         - containerPort: 9443
           name: webhook-server
-          port: 443
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:

diff --git a/charts/jira-service-desk-operator/templates/mutating-webhook.yaml b/charts/jira-service-desk-operator/templates/mutating-webhook.yaml
@@ -1,15 +1,16 @@
 {{- if .Values.webhook.enabled -}}
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "jira-service-desk-operator.fullname" . }}-serving-cert
   creationTimestamp: null
   name: {{ include "jira-service-desk-operator.fullname" . }}-mutating-webhook-configuration
 webhooks:
-- clientConfig:
-    caBundle: Cg==
+- admissionReviewVersions:
+  - v1
+  clientConfig:
     service:
       name: {{ include "jira-service-desk-operator.fullname" . }}-webhook-service
       namespace: {{ .Release.Namespace }}
@@ -26,8 +27,10 @@ webhooks:
     - UPDATE
     resources:
     - customers
-- clientConfig:
-    caBundle: Cg==
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
     service:
       name: {{ include "jira-service-desk-operator.fullname" . }}-webhook-service
       namespace: {{ .Release.Namespace }}
@@ -44,4 +47,5 @@ webhooks:
     - UPDATE
     resources:
     - projects
+  sideEffects: None
 {{- end -}}
diff --git a/charts/jira-service-desk-operator/templates/validating-webhook.yaml b/charts/jira-service-desk-operator/templates/validating-webhook.yaml
@@ -1,15 +1,16 @@
 {{- if .Values.webhook.enabled -}}
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "jira-service-desk-operator.fullname" . }}-serving-cert
   creationTimestamp: null
   name: {{ include "jira-service-desk-operator.fullname" . }}-validating-webhook-configuration
 webhooks:
-  - clientConfig:
-      caBundle: Cg==
+  - admissionReviewVersions:
+    - v1
+    clientConfig:
       service:
         name: {{ include "jira-service-desk-operator.fullname" . }}-webhook-service
         namespace: {{ .Release.Namespace }}
@@ -26,8 +27,10 @@ webhooks:
       - UPDATE
       resources:
       - customers
-  - clientConfig:
-      caBundle: Cg==
+    sideEffects: None
+  - admissionReviewVersions:
+    - v1
+    clientConfig:
       service:
         name: {{ include "jira-service-desk-operator.fullname" . }}-webhook-service
         namespace: {{ .Release.Namespace }}
@@ -44,6 +47,7 @@ webhooks:
       - UPDATE
       resources:
       - projects
+    sideEffects: None
 {{- end -}}