|
10 | 10 | {{- range $mapping := $app.harness.uri_role_mapping }} |
11 | 11 | {{- if and (hasKey $mapping "white-listed") (index $mapping "white-listed") }} |
12 | 12 | {{- $uri := $mapping.uri }} |
13 | | - {{- if eq $uri "/" }} |
14 | | - - path: / |
15 | | - pathType: Exact |
16 | | - backend: |
17 | | - service: |
18 | | - name: {{ $app.harness.service.name | quote }} |
19 | | - port: |
20 | | - number: {{ $app.harness.service.port | default 80 }} |
21 | | - {{- else if hasSuffix "/*" $uri }} |
22 | | - {{- $cleanPath := trimSuffix "/*" $uri }} |
23 | | - {{- $pathWithoutSlash := trimPrefix "/" $cleanPath }} |
| 13 | + {{- if and (ne $uri "/") (ne $uri "/*") }} |
| 14 | + {{- if hasSuffix "/*" $uri }} |
| 15 | + {{- $cleanPath := trimSuffix "/*" $uri }} |
| 16 | + {{- $pathWithoutSlash := trimPrefix "/" $cleanPath }} |
24 | 17 | - path: {{ printf "%s%s" $app.harness.gateway.path $pathWithoutSlash }} |
25 | 18 | pathType: Prefix |
26 | 19 | backend: |
27 | 20 | service: |
28 | 21 | name: {{ $app.harness.service.name | quote }} |
29 | 22 | port: |
30 | 23 | number: {{ $app.harness.service.port | default 80 }} |
31 | | - {{- else if (not (contains "*" $uri)) }} |
32 | | - {{- $pathWithoutSlash := trimPrefix "/" $uri }} |
| 24 | + {{- else if (not (contains "*" $uri)) }} |
| 25 | + {{- $pathWithoutSlash := trimPrefix "/" $uri }} |
33 | 26 | - path: {{ printf "%s%s" $app.harness.gateway.path $pathWithoutSlash }} |
34 | 27 | pathType: Exact |
35 | 28 | backend: |
36 | 29 | service: |
37 | 30 | name: {{ $app.harness.service.name | quote }} |
38 | 31 | port: |
39 | 32 | number: {{ $app.harness.service.port | default 80 }} |
| 33 | + {{- end }} |
40 | 34 | {{- end }} |
41 | 35 | {{- end }} |
42 | 36 | {{- end }} |
|
68 | 62 | {{- $mainapp := .Values.mainapp }} |
69 | 63 | {{- range $app := .Values.apps }} |
70 | 64 | {{- if or $app.harness.subdomain $app.harness.domain $app.harness.aliases (and $mainapp (and $app.harness.name (eq $app.harness.name $mainapp))) }} |
71 | | - {{- $appIngressName := default $app.harness.name $app.harness.service.name }} |
| 65 | + {{- $appIngressName := default $app.harness.service.name $app.harness.name }} |
72 | 66 | --- |
73 | 67 | apiVersion: networking.k8s.io/v1 |
74 | 68 | kind: Ingress |
|
0 commit comments