chore(ingress): renmae use_native_ingress to use_ingress

Author: duanhongyi

charts/controller/templates/controller-clusterrole.yaml

@@ -50,7 +50,7 @@ rules:
 - apiGroups: ["extensions", "autoscaling"]
   resources: ["horizontalpodautoscalers"]
   verbs: ["get", "list", "create", "update", "delete"]
-{{ if .Values.global.use_native_ingress }}
+{{ if .Values.global.use_ingress }}
 - apiGroups: ["extensions"]
   resources: ["ingresses"]
   verbs: ["get", "list", "watch", "create", "update", "delete"]

charts/controller/templates/controller-deployment.yaml

@@ -60,13 +60,13 @@ spec:
               value: "127.0.0.1"
             # Environmental variable value for $USE_NATIVE_INGRESS
             - name: "USE_NATIVE_INGRESS"
-              value: "{{ .Values.global.use_native_ingress }}"
-            - name: "USE_NATIVE_INGRESS_HOSTNAME"
+              value: "{{ .Values.global.use_ingress }}"
+            - name: "INGRESS_HOSTNAME"
               value: "{{ .Values.platform_domain }}"
             - name: "K8S_API_VERIFY_TLS"
               value: "{{ .Values.k8s_api_verify_tls }}"
             - name: "DRYCC_REGISTRY_SERVICE_PORT"
-              value: "{{ .Values.global.host_port }}"
+              value: "{{ .Values.global.registry_service_port }}"
             - name: "APP_STORAGE"
               value: "{{ .Values.global.storage}}"
             - name: "DRYCC_REGISTRY_LOCATION"

…tes/controller-ingress-rule-http-80.yaml …roller/templates/controller-ingress.yamlcharts/controller/templates/controller-ingress-rule-http-80.yaml renamed to charts/controller/templates/controller-ingress.yaml charts/controller/templates/controller-ingress-rule-http-80.yaml renamed to charts/controller/templates/controller-ingress.yaml

@@ -1,9 +1,9 @@
-{{ if .Values.global.use_native_ingress }}
+{{ if .Values.global.use_ingress }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   namespace: "{{ .Release.Namespace }}"
-  name: "controller-api-server-ingress-http"
+  name: "controller-api-server-ingress"
   labels:
     app: "controller"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

charts/controller/values.yaml

@@ -47,14 +47,14 @@ global:
   # - gcr: Use Google's GCR
   registry_location: "on-cluster"
   # The host port to which registry proxy binds to
-  host_port: 5555
+  registry_service_port: 5555
   # Prefix for the imagepull secret created when using private registry
   secret_prefix: "private-registry"
   # Experimental feature to toggle using kubernetes ingress instead of the Drycc router.
   #
   # Valid values are:
   # - true: The drycc controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
   # - false: The default mode, and the default behavior of Drycc workflow.
-  use_native_ingress: false
+  use_ingress: false
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false

rootfs/api/models/app.py

@@ -239,7 +239,7 @@ def create(self, *args, **kwargs):  # noqa
                     self.log("creating Ingress {}".format(namespace), level=logging.INFO)
                     self._scheduler.ingress.create(ingress,
                                                    namespace,
-                                                   settings.USE_NATIVE_INGRESS_HOSTNAME)
+                                                   settings.INGRESS_HOSTNAME)
         except KubeException as e:
             raise ServiceUnavailable('Could not create Ingress in Kubernetes') from e
         try:

rootfs/api/settings/production.py

@@ -263,7 +263,7 @@
 # experimental native ingress
 USE_NATIVE_INGRESS = bool(strtobool(
     os.environ.get('USE_NATIVE_INGRESS', 'false')))
-USE_NATIVE_INGRESS_HOSTNAME = os.environ.get('USE_NATIVE_INGRESS_HOSTNAME', '')
+INGRESS_HOSTNAME = os.environ.get('INGRESS_HOSTNAME', '')
 
 # k8s image policies
 SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/drycc/slugrunner:canary')  # noqa