Merge pull request #920 from kmala/bug

fix(registry): Use proper hostname for dockerhub images

Author: kmala

rootfs/scheduler/__init__.py

@@ -642,31 +642,35 @@ def _set_container(self, namespace, container_name, data, **kwargs):  # noqa
         else:
             self._default_readiness_probe(data, kwargs.get('build_type'), env.get('PORT', None))
 
-    def _set_image_secret(self, data, namespace, **kwargs):
-        """
-        Take registry information and set as an imagePullSecret for an RC / Deployment
-        http://kubernetes.io/docs/user-guide/images/#specifying-imagepullsecrets-on-a-pod
-        """
-        registry = kwargs.get('registry', {})
-        if not registry:
-            return
-
+    def _get_private_registry_config(self, registry, image):
         # try to get the hostname information
         hostname = registry.get('hostname', None)
         if not hostname:
-            hostname, _ = docker_auth.split_repo_name(kwargs.get('image'))
+            hostname, _ = docker_auth.split_repo_name(image)
+        if hostname == docker_auth.INDEX_NAME:
+            hostname = "https://index.docker.io/v1/"
 
         # create / update private registry secret
         auth = bytes('{}:{}'.format(registry.get('username'), registry.get('password')), 'UTF-8')
         # value has to be a base64 encoded JSON
         docker_config = json.dumps({
             "auths": {
                 hostname: {
-                    "auth": base64.b64encode(auth).decode(encoding='UTF-8'),
-                    "email": 'not@valid.id'
+                    "auth": base64.b64encode(auth).decode(encoding='UTF-8')
                 }
             }
         })
+        return docker_config
+
+    def _set_image_secret(self, data, namespace, **kwargs):
+        """
+        Take registry information and set as an imagePullSecret for an RC / Deployment
+        http://kubernetes.io/docs/user-guide/images/#specifying-imagepullsecrets-on-a-pod
+        """
+        registry = kwargs.get('registry', {})
+        if not registry:
+            return
+        docker_config = self._get_private_registry_config(registry, kwargs.get('image'))  # noqa
         secret_data = {'.dockerconfigjson': docker_config}
 
         secret_name = 'private-registry'

rootfs/scheduler/tests/test_scheduler.py

@@ -7,6 +7,8 @@
 from django.test import TestCase
 
 from scheduler import mock
+import base64
+import json
 
 
 class SchedulerTest(TestCase):
@@ -66,3 +68,25 @@ def test_set_container_limits(self):
         self.assertEqual(data['resources']['limits']['cpu'], '500m', 'CPU should be lower cased')
         # make sure first char of Memory is upper cased
         self.assertEqual(data['resources']['limits']['memory'], '1024Mi', 'Memory should be upper cased')  # noqa
+
+    def test_get_private_registry_config(self):
+        registry = {'username': 'test', 'password': 'test'}
+        auth = bytes('{}:{}'.format("test", "test"), 'UTF-8')
+        encAuth = base64.b64encode(auth).decode(encoding='UTF-8')
+        image = 'test/test'
+
+        dockerConfig = self.scheduler_client._get_private_registry_config(registry, image)
+        dockerConfig = json.loads(dockerConfig)
+        expected = {"https://index.docker.io/v1/": {
+            "auth": encAuth
+        }}
+        self.assertEqual(dockerConfig.get('auths'), expected)
+
+        image = "quay.io/test/test"
+
+        dockerConfig = self.scheduler_client._get_private_registry_config(registry, image)
+        dockerConfig = json.loads(dockerConfig)
+        expected = {"quay.io": {
+            "auth": encAuth
+        }}
+        self.assertEqual(dockerConfig.get('auths'), expected)