Merge pull request #386 from kmala/bug

feat(registry): use registry proxy to talk to the internal registry

Author: kmala

pkg/gitreceive/build.go

@@ -149,6 +149,7 @@ func build(
 			slugName,
 			conf.StorageType,
 			conf.DockerBuilderImage,
+			conf.RegistryProxyPort,
 			dockerBuilderImagePullPolicy,
 		)
 	} else {

pkg/gitreceive/config.go

@@ -14,10 +14,10 @@ const (
 // builder's git-receive hook.
 type Config struct {
 	// k8s service discovery env vars
-	ControllerHost string `envconfig:"DEIS_CONTROLLER_SERVICE_HOST" required:"true"`
-	ControllerPort string `envconfig:"DEIS_CONTROLLER_SERVICE_PORT" required:"true"`
-	RegistryHost   string `envconfig:"DEIS_REGISTRY_SERVICE_HOST" required:"true"`
-	RegistryPort   string `envconfig:"DEIS_REGISTRY_SERVICE_PORT" required:"true"`
+	ControllerHost    string `envconfig:"DEIS_CONTROLLER_SERVICE_HOST" required:"true"`
+	ControllerPort    string `envconfig:"DEIS_CONTROLLER_SERVICE_PORT" required:"true"`
+	RegistryHost      string `envconfig:"DEIS_REGISTRY_SERVICE_HOST" required:"true"`
+	RegistryProxyPort string `envconfig:"DEIS_REGISTRY_PROXY_PORT" default:"5555"`
 
 	GitHome                       string `envconfig:"GIT_HOME" required:"true"`
 	SSHConnection                 string `envconfig:"SSH_CONNECTION" required:"true"`

pkg/gitreceive/k8s_util.go

@@ -43,7 +43,7 @@ func dockerBuilderPod(
 	tarKey,
 	imageName,
 	storageType,
-	image string,
+	image, registryProxyPort string,
 	pullPolicy api.PullPolicy,
 ) *api.Pod {
 
@@ -55,6 +55,7 @@ func dockerBuilderPod(
 	addEnvToPod(pod, tarPath, tarKey)
 	addEnvToPod(pod, "IMG_NAME", imageName)
 	addEnvToPod(pod, builderStorage, storageType)
+	addEnvToPod(pod, "DEIS_REGISTRY_PROXY_PORT", registryProxyPort)
 
 	pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, api.VolumeMount{
 		Name:      dockerSocketName,

pkg/gitreceive/k8s_util_test.go

@@ -132,6 +132,7 @@ func TestBuildPod(t *testing.T) {
 			build.imgName,
 			build.storageType,
 			build.dockerBuilderImage,
+			"5555",
 			build.dockerBuilderImagePullPolicy,
 		)