Merge pull request #316 from kris-nova/byo-ingress

feat(ingress) Experimental Native Ingress
deis · Mar 30, 2017 · b8e207e · b8e207e
2 parents e16e7d8 + 018e469
commit b8e207e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/charts/router/templates/router-deployment.yaml b/charts/router/templates/router-deployment.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.experimental_native_ingress }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -88,3 +89,4 @@ spec:
             port: 9090
           initialDelaySeconds: 1
           timeoutSeconds: 1
+{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}
diff --git a/charts/router/templates/router-dhparam-secret.yaml b/charts/router/templates/router-dhparam-secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.experimental_native_ingress }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,3 +8,4 @@ metadata:
 type: Opaque
 data:
   dhparam: {{ if not (empty .Values.dhparam) }}{{ .Values.dhparam | b64enc}}{{ else }}LS0tLS1CRUdJTiBESCBQQVJBTUVURVJTLS0tLS0KTUlJQkNBS0NBUUVBNGJPMlpCOTRYVVh3YjlSL0QxM0xFZ2d6V1U2Y0hZSXJzakdseVhUSkZHZmdsaFl5TUtnUQpKRXFsTjd5RWs0UUNVV25iTEtDU2F4anZCTVNqbWlTR3VvajNWRDlYRTVDaGx2SzlGQVp6alFGMFZ2VzdkNDJmCnNkNmlmcUYwSUV0R2lxWDRpTzhtWmhYZVJrc3BYekZXYkhyTklaanBCdmc5VDhmczY0ZCtDU2l2SXBqWWRVQ1UKQWRhNTViRDdLeWJkTWdJMFZza21jL3RpclN5SkIwZDVmUnYraG1vMW9pOG92Rm9vUFp2cS9HWGxPOHlRRzRZTgppWXdWYmU5c29wQ3lYNzEzaUtlM0pBQ29JWnUxZXgrRjVhbU53U3E3Rk9xb2JqK3Z2cURRM0Q2WEJaanczT3NuClFRWmVhTWYyMDVwOERWbFpWLzRqQUtQeEpUQkxyejh6c3dJQkFnPT0KLS0tLS1FTkQgREggUEFSQU1FVEVSUy0tLS0tCg=={{ end }}
+{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}
diff --git a/charts/router/templates/router-service-account.yaml b/charts/router/templates/router-service-account.yaml
@@ -1,6 +1,8 @@
+{{- if not .Values.global.experimental_native_ingress }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: deis-router
   labels:
     heritage: deis
+{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}
diff --git a/charts/router/templates/router-service.yaml b/charts/router/templates/router-service.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.experimental_native_ingress }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -26,3 +27,4 @@ spec:
     - name: healthz
       port: 9090
       targetPort: 9090
+{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}
diff --git a/charts/router/values.yaml b/charts/router/values.yaml
@@ -24,3 +24,11 @@ host_port:
 
 # Service type default to LoadBalancer 
 # service_type: LoadBalancer
+
+global:
+  # Experimental feature to toggle using kubernetes ingress instead of the Deis router.
+  #
+  # Valid values are:
+  # - true: The Deis router will NOT be deployed. Inherently workflow will not be usable until a Kubernetes ingress controller is installed.
+  # - false: The default mode, and the default behavior of Deis workflow.
+  experimental_native_ingress: false