Merge remote-tracking branch 'upstream/master'

Author: lijianguo

charts/controller/templates/controller-certificate.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   secretName: drycc-controller-auto-tls
   issuerRef:
-    name: drycc-letsencrypt
+    name: drycc-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
   - drycc.{{ .Values.platform_domain }}

charts/controller/templates/controller-cluster-issuer.yaml

@@ -124,7 +124,7 @@ spec:
                   name: database-creds
                   key: password
             - name: RESERVED_NAMES
-              value: "drycc, drycc-builder, drycc-workflow-manager, grafana"
+              value: "drycc, drycc-builder, grafana"
             - name: WORKFLOW_NAMESPACE
               valueFrom:
                 fieldRef:

charts/controller/templates/controller-deployment.yaml

@@ -163,7 +163,7 @@ def check_blacklist(repo):
     """Check a Docker repository name for collision with drycc/* components."""
     blacklisted = [  # NOTE: keep this list up to date!
         'builder', 'controller', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry',
-        'router', 'slugbuilder', 'slugrunner', 'workflow', 'workflow-manager',
+        'router', 'slugbuilder', 'slugrunner', 'workflow',
     ]
     if any("drycc/{}".format(c) in repo for c in blacklisted):
         raise PermissionDenied("Repository name {} is not allowed, as it is reserved by Drycc".format(repo))  # noqa

rootfs/registry/dockerclient.py

@@ -15,7 +15,7 @@ def manifest(self, namespace, name, ingress_class, hosts, version=None):
             "spec": {
                 "secretName": "%s-auto-tls" % name,
                 "issuerRef": {
-                    "name": "drycc-letsencrypt",
+                    "name": "drycc-cluster-issuer",
                     "kind": "ClusterIssuer"
                 },
                 "dnsNames": hosts,