chore(controller): support image pull secrets by ptype

Author: jianxiaoguo

rootfs/api/models/app.py

@@ -626,12 +626,12 @@ def autoscale(self, proc_type, autoscale):
                 # let the user know about any other errors
                 raise ServiceUnavailable(str(e)) from e
 
-    def image_pull_secret(self, namespace, registry, image):
+    def image_pull_secret(self, namespace, ptype, registry, image):
         """
         Take registry information and set as an imagePullSecret for an RC / Deployment
         http://kubernetes.io/docs/user-guide/images/#specifying-imagepullsecrets-on-a-pod
         """
-        docker_config, name, create = self._get_private_registry_config(image, registry)
+        docker_config, name, create = self._get_private_registry_config(ptype, image, registry)
         if create is None:
             return
         elif create:
@@ -1122,8 +1122,8 @@ def _build_env_vars(self, release, ptype):
             default_env['PORT'] = port
         return default_env
 
-    def _get_private_registry_config(self, image, registry=None):
-        name = settings.REGISTRY_SECRET_PREFIX
+    def _get_private_registry_config(self, ptype, image, registry=None):
+        name = settings.REGISTRY_SECRET_PREFIX + '-' + ptype
         if registry:
             # try to get the hostname information
             hostname = registry.get('hostname', None)
@@ -1209,7 +1209,7 @@ def _gather_app_settings(self, release, app_settings, ptype, replicas, volumes=N
         registry = config.registry.get(ptype, {})
         # create image pull secret if needed
         image_pull_secret_name = self.image_pull_secret(
-            self.id, registry, release.get_deploy_image(ptype))
+            self.id, ptype, registry, release.get_deploy_image(ptype))
 
         # only web is routable
         # https://www.drycc.cc/applications/managing-app-processes/#default-process-types

rootfs/api/tests/test_app.py

@@ -543,24 +543,24 @@ def test_list_ordering(self, mock_requests):
         self.assertEqual(apps[3]['id'], 'zulu')
 
     def test_get_private_registry_config(self, mock_requests):
-        registry = {'username': 'test', 'password': 'test'}
+        registry = {"web": {'username': 'test', 'password': 'test'}}
         auth = bytes('{}:{}'.format("test", "test"), 'UTF-8')
         encAuth = base64.b64encode(auth).decode(encoding='UTF-8')
         image = 'test/test'
 
-        docker_config, name, create = App()._get_private_registry_config(image, registry)
+        docker_config, name, create = App()._get_private_registry_config("web", image, registry.get("web", {}))  # noqa
         dockerConfig = json.loads(docker_config)
         expected = {"https://index.docker.io/v1/": {"auth": encAuth}}
         self.assertEqual(dockerConfig.get('auths'), expected)
-        self.assertEqual(name, "private-registry")
+        self.assertEqual(name, "private-registry-web")
         self.assertEqual(create, True)
 
         image = "quay.io/test/test"
-        docker_config, name, create = App()._get_private_registry_config(image, registry)
+        docker_config, name, create = App()._get_private_registry_config("web", image, registry.get("web", {}))  # noqa
         dockerConfig = json.loads(docker_config)
         expected = {"quay.io": {"auth": encAuth}}
         self.assertEqual(dockerConfig.get('auths'), expected)
-        self.assertEqual(name, "private-registry")
+        self.assertEqual(name, "private-registry-web")
         self.assertEqual(create, True)
 
     @override_settings(REGISTRY_LOCATION="off-cluster")
@@ -569,20 +569,20 @@ def test_get_private_registry_config_off_cluster(self, mock_requests):
         auth = bytes('{}:{}'.format("test", "test"), 'UTF-8')
         encAuth = base64.b64encode(auth).decode(encoding='UTF-8')
         image = "test.com/test/test"
-        docker_config, name, create = App()._get_private_registry_config(image, registry)
+        docker_config, name, create = App()._get_private_registry_config("web", image, registry.get("web", {}))  # noqa
         dockerConfig = json.loads(docker_config)
         expected = {"https://index.docker.io/v1/": {
             "auth": encAuth
         }}
         self.assertEqual(dockerConfig.get('auths'), expected)
-        self.assertEqual(name, "private-registry-off-cluster")
+        self.assertEqual(name, "private-registry-web-off-cluster")
         self.assertEqual(create, True)
 
     @override_settings(REGISTRY_LOCATION="ecra")
     def test_get_private_registry_config_bad_registry_location(self, mock_requests):
         registry = {}
         image = "test.com/test/test"
-        docker_config, name, create = App()._get_private_registry_config(image, registry)
+        docker_config, name, create = App()._get_private_registry_config("web", image, registry)
         self.assertEqual(docker_config, None)
         self.assertEqual(name, None)
         self.assertEqual(create, None)