chore(registry): remove registry_secret_prefix

Author: duanhongyi

charts/controller/templates/controller-deployment.yaml

@@ -71,8 +71,6 @@ spec:
               value: "{{ .Values.global.storage}}"
             - name: "DRYCC_REGISTRY_LOCATION"
               value: "{{ .Values.global.registry_location }}"
-            - name: "DRYCC_REGISTRY_SECRET_PREFIX"
-              value: "{{ .Values.global.registry_secret_prefix }}"
             - name: "IMAGE_PULL_POLICY"
               value: "{{ .Values.app_pull_policy }}"
             - name: "TZ"

charts/controller/values.yaml

@@ -47,13 +47,9 @@ global:
   # Valid values are:
   # - on-cluster: Run registry within the Kubernetes cluster
   # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,quay.io,self-hosted)
-  # - ecr: Use Amazon's ECR
-  # - gcr: Use Google's GCR
   registry_location: "on-cluster"
   # The host port to which registry proxy binds to
   registry_service_port: 5555
-  # Prefix for the imagepull secret created when using 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/models/app.py

@@ -1076,7 +1076,6 @@ def image_pull_secret(self, namespace, registry, image):
         return name
 
     def _get_private_registry_config(self, image, registry=None):
-        name = settings.REGISTRY_SECRET_PREFIX
         if registry:
             # try to get the hostname information
             hostname = registry.get('hostname', None)
@@ -1097,8 +1096,6 @@ def _get_private_registry_config(self, image, registry=None):
             if hostname == '':
                 hostname = 'https://index.docker.io/v1/'
             name = name + '-' + settings.REGISTRY_LOCATION
-        elif settings.REGISTRY_LOCATION in ['ecr', 'gcr']:
-            return None, name + '-' + settings.REGISTRY_LOCATION, False
         else:
             return None, None, None
 

rootfs/api/settings/production.py

@@ -341,7 +341,6 @@
 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')
 
 # logger settings
 LOGGER_HOST = os.environ.get('DRYCC_LOGGER_SERVICE_HOST', '127.0.0.1')