chore(workflow-manager): del workflow-manager

duanhongyi · duanhongyi · commit ca966fe6d6b3 · 2020-08-05T17:25:20.000+08:00
diff --git a/charts/controller/templates/controller-deployment.yaml b/charts/controller/templates/controller-deployment.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:
diff --git a/rootfs/registry/dockerclient.py b/rootfs/registry/dockerclient.py
@@ -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

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