Merge pull request teamhephy#8 from jianxiaoguo/master

chore(Certificate):upgrade version cert-manager.io/v1alpha2
duanhongyi · Aug 6, 2020 · b5eed3c · b5eed3c
2 parents d1ce991 + 11c3253
commit b5eed3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/charts/controller/templates/controller-certificate.yaml b/charts/controller/templates/controller-certificate.yaml
@@ -11,6 +11,8 @@ spec:
     kind: ClusterIssuer
   dnsNames:
   - drycc.{{ .Values.platform_domain }}
+#  privateKey:
+#    rotationPolicy: Always
   # acme:
   #   config:
   #   - http01:

diff --git a/rootfs/scheduler/resources/certificate.py b/rootfs/scheduler/resources/certificate.py
@@ -3,7 +3,7 @@
 
 
 class Certificate(Resource):
-    api_version = 'certmanager.k8s.io/v1alpha1'
+    api_version = 'cert-manager.io/v1alpha2'
     api_prefix = 'apis'
 
     def manifest(self, api_version, namespace, name, ingress_class, hosts, version=None):
@@ -21,16 +21,19 @@ def manifest(self, api_version, namespace, name, ingress_class, hosts, version=N
                     "kind": "ClusterIssuer"
                 },
                 "dnsNames": hosts,
-                "acme": {
-                    "config": [
-                        {
-                            "http01": {
-                                "ingressClass": ingress_class
-                            },
-                            "domains": hosts
-                        }
-                    ]
-                }
+                # "privateKey": {
+                #     "rotationPolicy": "Always"
+                # }
+                # "acme": {
+                #     "config": [
+                #         {
+                #             "http01": {
+                #                 "ingressClass": ingress_class
+                #             },
+                #             "domains": hosts
+                #         }
+                #     ]
+                # }
             }
         }
         if version: