chore(registry): rename DRYCC_REGISTRY_SERVICE to DRYCC_REGISTRY_PROXY

Author: duanhongyi

charts/controller/templates/controller-deployment.yaml

@@ -56,7 +56,7 @@ spec:
             - name: REGISTRATION_MODE
               value: {{ .Values.registration_mode }}
             # 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"
             # Environmental variable value for $INGRESS_CLASS
             - name: "DRYCC_INGRESS_CLASS"
@@ -65,14 +65,14 @@ spec:
               value: "{{ .Values.platform_domain }}"
             - name: "K8S_API_VERIFY_TLS"
               value: "{{ .Values.k8s_api_verify_tls }}"
-            - name: "DRYCC_REGISTRY_SERVICE_PORT"
+            - name: "DRYCC_REGISTRY_PROXY_PORT"
               value: "{{ .Values.global.registry_service_port }}"
             - name: "APP_STORAGE"
               value: "{{ .Values.global.storage}}"
             - 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 }}"
             - name: "IMAGE_PULL_POLICY"
               value: "{{ .Values.app_pull_policy }}"
             - name: "TZ"

charts/controller/values.yaml

@@ -53,7 +53,7 @@ global:
   # The host port to which registry proxy binds to
   registry_service_port: 5555
   # Prefix for the imagepull secret created when using private registry
-  secret_prefix: "private-registry"
+  registry_secret_prefix: "private-registry"
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false
   # Please check `kubernetes.io/ingress.class`

rootfs/api/settings/production.py

@@ -337,8 +337,8 @@
 KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = os.environ.get('KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC', '')  # noqa
 
 # registry settings
-REGISTRY_HOST = os.environ.get('DRYCC_REGISTRY_SERVICE_HOST', '127.0.0.1')
-REGISTRY_PORT = os.environ.get('DRYCC_REGISTRY_SERVICE_PORT', 5000)
+REGISTRY_HOST = os.environ.get('DRYCC_REGISTRY_PROXY_HOST', '127.0.0.1')
+REGISTRY_PORT = os.environ.get('DRYCC_REGISTRY_PROXY_PORT', 5000)
 REGISTRY_URL = '{}:{}'.format(REGISTRY_HOST, REGISTRY_PORT)
 REGISTRY_LOCATION = os.environ.get('DRYCC_REGISTRY_LOCATION', 'on-cluster')
 REGISTRY_SECRET_PREFIX = os.environ.get('DRYCC_REGISTRY_SECRET_PREFIX', 'private-registry')