chore(registry): rename DRYCC_REGISTRY_SERVICE to DRYCC_REGISTRY_PROXY

Author: duanhongyi

charts/builder/templates/builder-deployment.yaml

@@ -43,9 +43,9 @@ spec:
 {{- end}}
           env:
             # NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
-            - name: "DRYCC_REGISTRY_SERVICE_HOST"
+            - name: "DRYCC_REGISTRY_PROXY_HOST"
               value: "127.0.0.1"
-            - name: "DRYCC_REGISTRY_SERVICE_PORT"
+            - name: "DRYCC_REGISTRY_PROXY_PORT"
               value: "{{ .Values.global.registry_service_port }}"
             - name: "HEALTH_SERVER_PORT"
               value: "8092"
@@ -56,7 +56,7 @@ spec:
             - name: "DRYCC_REGISTRY_LOCATION"
               value: "{{ .Values.global.registry_location }}"
             - name: "DRYCC_REGISTRY_SECRET_PREFIX"
-              value: "{{ .Values.global.secret_prefix }}"
+              value: "{{ .Values.global.registry_secret_prefix }}"
             # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
             - name: "GIT_LOCK_TIMEOUT"
               value: "10"

pkg/gitreceive/config.go

@@ -16,8 +16,8 @@ type Config struct {
 	// k8s service discovery env vars
 	ControllerHost       string `envconfig:"DRYCC_CONTROLLER_SERVICE_HOST" required:"true"`
 	ControllerPort       string `envconfig:"DRYCC_CONTROLLER_SERVICE_PORT" required:"true"`
-	RegistryHost         string `envconfig:"DRYCC_REGISTRY_SERVICE_HOST" required:"true"`
-	RegistryPort         string `envconfig:"DRYCC_REGISTRY_SERVICE_PORT" required:"true"`
+	RegistryHost         string `envconfig:"DRYCC_REGISTRY_PROXY_HOST" required:"true"`
+	RegistryPort         string `envconfig:"DRYCC_REGISTRY_PROXY_PORT" required:"true"`
 	RegistryLocation     string `envconfig:"DRYCC_REGISTRY_LOCATION" default:"on-cluster"`
 	RegistrySecretPrefix string `envconfig:"DRYCC_REGISTRY_SECRET_PREFIX" default:"private-registry"`
 

pkg/gitreceive/k8s_util.go

@@ -87,10 +87,10 @@ func dockerBuilderPod(
 	addEnvToPod(pod, sourceVersion, gitShortHash)
 	addEnvToPod(pod, "IMG_NAME", imageName)
 	addEnvToPod(pod, builderStorage, storageType)
-	// inject existing DRYCC_REGISTRY_SERVICE_HOST and PORT info to dockerbuilder
+	// inject existing DRYCC_REGISTRY_PROXY_HOST and PORT info to dockerbuilder
 	// see https://github.com/drycc/dockerbuilder/issues/83
-	addEnvToPod(pod, "DRYCC_REGISTRY_SERVICE_HOST", registryHost)
-	addEnvToPod(pod, "DRYCC_REGISTRY_SERVICE_PORT", registryPort)
+	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_HOST", registryHost)
+	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_PORT", registryPort)
 
 	for key, value := range registryEnv {
 		addEnvToPod(pod, key, value)