Merge pull request #15 from Pure-AdamuKaapan/SSLFix

Fixed location of 'host' in ingress rules
PureStorage-OpenConnect · Oct 8, 2019 · 8fe434a · 8fe434a
2 parents 51bf0c4 + 6c9b689
commit 8fe434a
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 54 deletions.
diff --git a/deploy/helm/pure1-unplugged/charts/api-server/templates/ingress.yaml b/deploy/helm/pure1-unplugged/charts/api-server/templates/ingress.yaml
@@ -25,12 +25,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /api/?(.*)
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/auth-server/templates/api-token-ingress.yaml b/deploy/helm/pure1-unplugged/charts/auth-server/templates/api-token-ingress.yaml
@@ -25,12 +25,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /auth/api-token(/?.*)
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/auth-server/templates/main-ingress.yaml b/deploy/helm/pure1-unplugged/charts/auth-server/templates/main-ingress.yaml
@@ -23,12 +23,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /auth/?(.*)
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/dex/templates/ingress.yaml b/deploy/helm/pure1-unplugged/charts/dex/templates/ingress.yaml
@@ -21,12 +21,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /dex
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/swagger-server/templates/ingress.yaml b/deploy/helm/pure1-unplugged/charts/swagger-server/templates/ingress.yaml
@@ -27,12 +27,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /swagger/?(.*)
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/web-content/templates/dash-ingress.yaml b/deploy/helm/pure1-unplugged/charts/web-content/templates/dash-ingress.yaml
@@ -24,12 +24,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /
             backend:

diff --git a/deploy/helm/pure1-unplugged/charts/web-content/templates/login-ingress.yaml b/deploy/helm/pure1-unplugged/charts/web-content/templates/login-ingress.yaml
@@ -23,12 +23,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /login
             backend:

diff --git a/deploy/helm/pure1-unplugged/templates/elasticsearch-ingress.yaml b/deploy/helm/pure1-unplugged/templates/elasticsearch-ingress.yaml
@@ -24,12 +24,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /elasticsearch/?(.*)
             backend:

diff --git a/deploy/helm/pure1-unplugged/templates/kibana-ingress.yaml b/deploy/helm/pure1-unplugged/templates/kibana-ingress.yaml
@@ -24,12 +24,12 @@ spec:
       {{- end }}
 
   rules:
-    - http:
-        {{- if $domainName }}
-        host: {{ $domainName }}
-        {{ else }}
-        # host:  ## Not specified because global.PublicAddress is an IP address
-        {{ end -}}
+    - {{- if $domainName }}
+      host: {{ $domainName }}
+      {{ else }}
+      # host:  ## Not specified because global.PublicAddress is an IP address
+      {{ end -}}
+      http:
         paths:
           - path: /kibana/?(.*)
             backend: