Skip to content

Commit b8e207e

Browse files
authored
Merge pull request #316 from kris-nova/byo-ingress
feat(ingress) Experimental Native Ingress
2 parents e16e7d8 + 018e469 commit b8e207e

5 files changed

+16
-0
lines changed

charts/router/templates/router-deployment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not .Values.global.experimental_native_ingress }}
12
apiVersion: extensions/v1beta1
23
kind: Deployment
34
metadata:
@@ -88,3 +89,4 @@ spec:
8889
port: 9090
8990
initialDelaySeconds: 1
9091
timeoutSeconds: 1
92+
{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}

charts/router/templates/router-dhparam-secret.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not .Values.global.experimental_native_ingress }}
12
apiVersion: v1
23
kind: Secret
34
metadata:
@@ -7,3 +8,4 @@ metadata:
78
type: Opaque
89
data:
910
dhparam: {{ if not (empty .Values.dhparam) }}{{ .Values.dhparam | b64enc}}{{ else }}LS0tLS1CRUdJTiBESCBQQVJBTUVURVJTLS0tLS0KTUlJQkNBS0NBUUVBNGJPMlpCOTRYVVh3YjlSL0QxM0xFZ2d6V1U2Y0hZSXJzakdseVhUSkZHZmdsaFl5TUtnUQpKRXFsTjd5RWs0UUNVV25iTEtDU2F4anZCTVNqbWlTR3VvajNWRDlYRTVDaGx2SzlGQVp6alFGMFZ2VzdkNDJmCnNkNmlmcUYwSUV0R2lxWDRpTzhtWmhYZVJrc3BYekZXYkhyTklaanBCdmc5VDhmczY0ZCtDU2l2SXBqWWRVQ1UKQWRhNTViRDdLeWJkTWdJMFZza21jL3RpclN5SkIwZDVmUnYraG1vMW9pOG92Rm9vUFp2cS9HWGxPOHlRRzRZTgppWXdWYmU5c29wQ3lYNzEzaUtlM0pBQ29JWnUxZXgrRjVhbU53U3E3Rk9xb2JqK3Z2cURRM0Q2WEJaanczT3NuClFRWmVhTWYyMDVwOERWbFpWLzRqQUtQeEpUQkxyejh6c3dJQkFnPT0KLS0tLS1FTkQgREggUEFSQU1FVEVSUy0tLS0tCg=={{ end }}
11+
{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
{{- if not .Values.global.experimental_native_ingress }}
12
apiVersion: v1
23
kind: ServiceAccount
34
metadata:
45
name: deis-router
56
labels:
67
heritage: deis
8+
{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}

charts/router/templates/router-service.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not .Values.global.experimental_native_ingress }}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -26,3 +27,4 @@ spec:
2627
- name: healthz
2728
port: 9090
2829
targetPort: 9090
30+
{{ end }}{{/* if not .Values.global.experimental_native_ingress */}}

charts/router/values.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,11 @@ host_port:
2424

2525
# Service type default to LoadBalancer
2626
# service_type: LoadBalancer
27+
28+
global:
29+
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
30+
#
31+
# Valid values are:
32+
# - true: The Deis router will NOT be deployed. Inherently workflow will not be usable until a Kubernetes ingress controller is installed.
33+
# - false: The default mode, and the default behavior of Deis workflow.
34+
experimental_native_ingress: false

0 commit comments

Comments
 (0)