chore(workflow): change experimental_native_ingress to use_native_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.experimental_native_ingress }}
+{{ if .Values.global.use_native_ingress }}
 - apiGroups: ["extensions"]
   resources: ["ingresses"]
   verbs: ["get", "list", "watch", "create", "update", "delete"]

charts/controller/templates/controller-deployment.yaml

@@ -58,10 +58,10 @@ spec:
             # NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
             - name: "DRYCC_REGISTRY_SERVICE_HOST"
               value: "127.0.0.1"
-            # Environmental variable value for $EXPERIMENTAL_NATIVE_INGRESS
-            - name: "EXPERIMENTAL_NATIVE_INGRESS"
-              value: "{{ .Values.global.experimental_native_ingress }}"
-            - name: "EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME"
+            # Environmental variable value for $USE_NATIVE_INGRESS
+            - name: "USE_NATIVE_INGRESS"
+              value: "{{ .Values.global.use_native_ingress }}"
+            - name: "USE_NATIVE_INGRESS_HOSTNAME"
               value: "{{ .Values.platform_domain }}"
             - name: "K8S_API_VERIFY_TLS"
               value: "{{ .Values.k8s_api_verify_tls }}"

charts/controller/templates/controller-ingress-rule-http-80.yaml

@@ -1,4 +1,4 @@
-{{ if .Values.global.experimental_native_ingress }}
+{{ if .Values.global.use_native_ingress }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

charts/controller/values.yaml

@@ -55,6 +55,6 @@ global:
   # 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.
-  experimental_native_ingress: false
+  use_native_ingress: false
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false

rootfs/api/models/app.py

@@ -230,7 +230,7 @@ def create(self, *args, **kwargs):  # noqa
 
         try:
             # In order to create an ingress, we must first have a namespace.
-            if settings.EXPERIMENTAL_NATIVE_INGRESS:
+            if settings.USE_NATIVE_INGRESS:
                 if ingress == "":
                     raise ServiceUnavailable('Empty hostname')
                 try:
@@ -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.EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME)
+                                                   settings.USE_NATIVE_INGRESS_HOSTNAME)
         except KubeException as e:
             raise ServiceUnavailable('Could not create Ingress in Kubernetes') from e
         try:

rootfs/api/settings/production.py

@@ -261,9 +261,9 @@
 BUILDER_KEY = os.environ.get('DRYCC_BUILDER_KEY', random_secret)
 
 # experimental native ingress
-EXPERIMENTAL_NATIVE_INGRESS = bool(strtobool(
-    os.environ.get('EXPERIMENTAL_NATIVE_INGRESS', 'false')))
-EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME = os.environ.get('EXPERIMENTAL_NATIVE_INGRESS_HOSTNAME', '')
+USE_NATIVE_INGRESS = bool(strtobool(
+    os.environ.get('USE_NATIVE_INGRESS', 'false')))
+USE_NATIVE_INGRESS_HOSTNAME = os.environ.get('USE_NATIVE_INGRESS_HOSTNAME', '')
 
 # k8s image policies
 SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/drycc/slugrunner:canary')  # noqa