diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index cfbcde6ae5..56ee54eb5b 100644 --- a/stable/spinnaker/Chart.yaml +++ b/stable/spinnaker/Chart.yaml @@ -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: diff --git a/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml b/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml index ea0efdb8c7..dc06629041 100644 --- a/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml +++ b/stable/spinnaker/templates/configmap/additional-profile-configmaps.yaml @@ -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" -}} diff --git a/stable/spinnaker/templates/ingress/deck.yaml b/stable/spinnaker/templates/ingress/deck.yaml index cb5946e728..20f5288965 100644 --- a/stable/spinnaker/templates/ingress/deck.yaml +++ b/stable/spinnaker/templates/ingress/deck.yaml @@ -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: / diff --git a/stable/spinnaker/templates/ingress/gate.yaml b/stable/spinnaker/templates/ingress/gate.yaml index 26e4ed169d..27d987f68c 100644 --- a/stable/spinnaker/templates/ingress/gate.yaml +++ b/stable/spinnaker/templates/ingress/gate.yaml @@ -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: /