[stable/spinnaker] ensure spinnaker works behind nsx-t ingress (#15213)

VMware NSX-T ingress requires a `/*` pattern for the path, this allows the user
to specify the type of ingress controller via annotations to ensure
correct behavior.

Signed-off-by: Christopher Banck <cbanck@pivotal.io>
This commit is contained in:
Christopher Banck
2019-07-02 10:01:08 -07:00
committed by Kubernetes Prow Robot
parent f8500ca19d
commit 48fe4c3660
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
name: spinnaker
version: 1.13.1
version: 1.13.2
appVersion: 1.12.5
home: http://spinnaker.io/
sources:
@@ -19,7 +19,7 @@ Render profiles for each service by merging predefined defaults with values pass
{{- /* Defaults: Add special settings for gate if GCE or ALB ingress is used */}}
{{- /* https://github.com/spinnaker/spinnaker/issues/1630#issuecomment-467359999 */}}
{{- if index $.Values.ingress "annotations" -}}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" "nsx" }}
{{- $tomcatProxySettings := dict -}}
{{- $_ := set $tomcatProxySettings "protocolHeader" "X-Forwarded-Proto" -}}
{{- $_ := set $tomcatProxySettings "remoteIpHeader" "X-Forwarded-For" -}}
+1 -1
View File
@@ -15,7 +15,7 @@ spec:
http:
paths:
{{- if index $.Values.ingress "annotations" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" "nsx" }}
- path: /*
{{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
- path: /
+1 -1
View File
@@ -15,7 +15,7 @@ spec:
http:
paths:
{{- if index $.Values.ingress "annotations" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" "nsx" }}
- path: /*
{{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
- path: /