chore(controller): use env replace creds volume

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -1,21 +1,15 @@
 {{/* Generate controller deployment envs */}}
-{{- define "controller.envs" -}}
-{{ $redisNodeCount := .Values.redis.replicas | int }}
+{{- define "controller.envs" }}
 env:
 - name: REGISTRATION_MODE
   value: {{ .Values.registrationMode }}
-# NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
-- name: "DRYCC_REGISTRY_PROXY_HOST"
-  value: "127.0.0.1"
 # Environmental variable value for $INGRESS_CLASS
 - name: "DRYCC_INGRESS_CLASS"
   value: "{{ .Values.global.ingressClass }}"
 - name: "DRYCC_PLATFORM_DOMAIN"
   value: "{{ .Values.global.platformDomain }}"
 - name: "K8S_API_VERIFY_TLS"
   value: "{{ .Values.k8sApiVerifyTls }}"
-- name: "DRYCC_REGISTRY_PROXY_PORT"
-  value: "{{ .Values.global.registryProxyPort }}"
 - name: "DRYCC_REGISTRY_LOCATION"
   value: "{{ .Values.global.registryLocation }}"
 - name: "DRYCC_REGISTRY_SECRET_PREFIX"
@@ -75,16 +69,11 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
-{{- if eq .Values.global.redisLocation "on-cluster"}}
-- name: DRYCC_REDIS_ADDRS
-  value: "{{range $i := until $redisNodeCount}}drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:6379{{if lt (add 1 $i) $redisNodeCount}},{{end}}{{end}}"
-{{- else if eq .Values.global.redisLocation "off-cluster" }}
 - name: DRYCC_REDIS_ADDRS
   valueFrom:
     secretKeyRef:
       name: redis-creds
       key: addrs
-{{- end }}
 - name: DRYCC_REDIS_PASSWORD
   valueFrom:
     secretKeyRef:

rootfs/api/models/release.py

@@ -39,34 +39,7 @@ def __str__(self):
 
     @property
     def image(self):
-        if (settings.REGISTRY_LOCATION != 'on-cluster'):
-            return self.build.image
-        # Builder pushes to internal registry, exclude SHA based images from being returned
-        registry = self.config.registry
-        if (
-            registry.get('username', None) and
-            registry.get('password', None) and
-            # SHA means it came from a git push (builder)
-            not self.build.sha and
-            # hostname tells Builder where to push images
-            not registry.get('hostname', None)
-        ):
-            return self.build.image
-
-        # return image if it is already in a registry, test host and then host + port
-        if (
-            self.build.image.startswith(settings.REGISTRY_HOST) or
-            self.build.image.startswith(settings.REGISTRY_URL)
-        ):
-            return self.build.image
-
-        # Sort out image information based on build type
-        if self.build.type == 'dockerfile' or self.build.type == 'buildpack':
-            # DockerFile or buildpack
-            return '{}/{}:git-{}'.format(settings.REGISTRY_URL, self.app.id, str(self.build.sha))
-        elif self.build.type == 'image':
-            # Drycc Pull, docker image in local registry
-            return self.build.image
+        return self.build.image
 
     def new(self, user, config, build, summary=None, source_version='latest'):
         """

rootfs/api/settings/production.py

@@ -390,9 +390,6 @@
 )
 
 # registry settings
-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')
 

rootfs/api/tests/test_build.py

@@ -7,7 +7,6 @@
 
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
-from django.conf import settings
 from django.test.utils import override_settings
 from unittest import mock
 from rest_framework.authtoken.models import Token
@@ -560,7 +559,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         # post an image as a build using registry hostname
         url = "/v2/apps/{app_id}/builds".format(**locals())
-        image = '{}/autotest/example'.format(settings.REGISTRY_HOST)
+        image = '127.0.0.1:5000/autotest/example'
         body = {'image': image, 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
@@ -571,7 +570,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         # post an image as a build using registry hostname + port
         url = "/v2/apps/{app_id}/builds".format(**locals())
-        image = '{}/autotest/example'.format(settings.REGISTRY_URL)
+        image = '127.0.0.1:5000/autotest/example'
         body = {'image': image, 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)