@@ -642,19 +642,11 @@ def _set_container(self, namespace, container_name, data, **kwargs): # noqa
642642 else :
643643 self ._default_readiness_probe (data , kwargs .get ('build_type' ), env .get ('PORT' , None ))
644644
645- def _set_image_secret (self , data , namespace , ** kwargs ):
646- """
647- Take registry information and set as an imagePullSecret for an RC / Deployment
648- http://kubernetes.io/docs/user-guide/images/#specifying-imagepullsecrets-on-a-pod
649- """
650- registry = kwargs .get ('registry' , {})
651- if not registry :
652- return
653-
645+ def _get_private_registry_config (self , registry , image ):
654646 # try to get the hostname information
655647 hostname = registry .get ('hostname' , None )
656648 if not hostname :
657- hostname , _ = docker_auth .split_repo_name (kwargs . get ( ' image' ) )
649+ hostname , _ = docker_auth .split_repo_name (image )
658650 if hostname == docker_auth .INDEX_NAME :
659651 hostname = "https://index.docker.io/v1/"
660652
@@ -668,6 +660,17 @@ def _set_image_secret(self, data, namespace, **kwargs):
668660 }
669661 }
670662 })
663+ return docker_config
664+
665+ def _set_image_secret (self , data , namespace , ** kwargs ):
666+ """
667+ Take registry information and set as an imagePullSecret for an RC / Deployment
668+ http://kubernetes.io/docs/user-guide/images/#specifying-imagepullsecrets-on-a-pod
669+ """
670+ registry = kwargs .get ('registry' , {})
671+ if not registry :
672+ return
673+ docker_config = self ._get_private_registry_config (registry , kwargs .get ('image' )) # noqa
671674 secret_data = {'.dockerconfigjson' : docker_config }
672675
673676 secret_name = 'private-registry'
0 commit comments