Merge pull request #159 from Cryptophobia/master

chore(charts): rm experimental from ingress

Author: Cryptophobia

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.native_ingress }}
 - apiGroups: ["networking.k8s.io"]
   resources: ["ingresses"]
   verbs: ["get", "list", "watch", "create", "update", "delete"]

charts/controller/templates/controller-deployment.yaml

@@ -58,10 +58,10 @@ spec:
             # NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
             - name: "DEIS_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 $NATIVE_INGRESS
+            - name: "NATIVE_INGRESS"
+              value: "{{ .Values.global.native_ingress }}"
+            - name: "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.native_ingress }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

charts/controller/values.yaml

@@ -66,11 +66,11 @@ global:
   # - 600
   # - "None"
   # conn_max_age: 600
-  # Experimental feature to toggle using kubernetes ingress instead of the Deis router.
+  # Feature to toggle using kubernetes ingress instead of the Deis router.
   #
   # Valid values are:
   # - true: The deis 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 Deis workflow.
-  experimental_native_ingress: false
+  native_ingress: false
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false

rootfs/api/models/app.py

@@ -229,7 +229,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.NATIVE_INGRESS:
                 if ingress == "":
                     raise ServiceUnavailable('Empty hostname')
                 try:
@@ -238,7 +238,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.NATIVE_INGRESS_HOSTNAME)
         except KubeException as e:
             raise ServiceUnavailable('Could not create Ingress in Kubernetes') from e
         try:

rootfs/api/settings/production.py

@@ -270,10 +270,10 @@
 SECRET_KEY = os.environ.get('DEIS_SECRET_KEY', random_secret)
 BUILDER_KEY = os.environ.get('DEIS_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', '')
+# native ingress
+NATIVE_INGRESS = bool(strtobool(
+    os.environ.get('NATIVE_INGRESS', 'false')))
+NATIVE_INGRESS_HOSTNAME = os.environ.get('NATIVE_INGRESS_HOSTNAME', '')
 
 # k8s image policies
 SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/deisci/slugrunner:canary')  # noqa