浏览代码

HUE-9094 [k8s] Upgrade cert manager to v0.11.0

Romain 6 年之前
父节点
当前提交
35aea96b54

+ 7 - 4
tools/kubernetes/helm/hue/templates/clusterissuer-letsencrypt-prod.yaml

@@ -1,8 +1,8 @@
 {{- if and .Values.ingress.create (eq .Values.ingress.type "nginx-ssl") -}}
-apiVersion: certmanager.k8s.io/v1alpha1
+apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-hue-prod
+  name: letsencrypt-prod
 spec:
   acme:
     # The ACME server URL
@@ -11,7 +11,10 @@ spec:
     email: {{ .Values.ingress.email }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: letsencrypt-hue-prod
+      name: letsencrypt-prod
     # Enable the HTTP-01 challenge provider
-    http01: {}
+    solvers:
+    - http01:
+        ingress:
+          class: nginx
 {{- end -}}

+ 5 - 2
tools/kubernetes/helm/hue/templates/clusterissuer-letsencrypt-staging.yaml

@@ -1,5 +1,5 @@
 {{- if and .Values.ingress.create (eq .Values.ingress.type "nginx-ssl-staging") -}}
-apiVersion: certmanager.k8s.io/v1alpha1
+apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
  name: letsencrypt-staging
@@ -13,5 +13,8 @@ spec:
    privateKeySecretRef:
      name: letsencrypt-staging
    # Enable the HTTP-01 challenge provider
-   http01: {}
+   solvers:
+    - http01:
+        ingress:
+          class: nginx
 {{- end -}}

+ 2 - 2
tools/kubernetes/helm/hue/templates/ingress-https.yaml

@@ -5,8 +5,8 @@ metadata:
   name: hue
   annotations:
     kubernetes.io/ingress.class: nginx
-    certmanager.k8s.io/cluster-issuer: letsencrypt-hue-prod
-    certmanager.k8s.io/acme-challenge-type: http01
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    cert-manager.io/acme-challenge-type: http01
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer-ingress"