|
1 | 1 | {{- $ingress := .Values.ingress -}} |
2 | 2 | {{- if $ingress.enabled -}} |
3 | 3 | {{- $apiVersion := "networking.k8s.io/v1" -}} |
| 4 | +{{- $fullName := ( include "keycloak.fullname" . ) -}} |
4 | 5 | apiVersion: {{ $apiVersion }} |
5 | 6 | kind: Ingress |
6 | 7 | metadata: |
7 | | - name: {{ include "keycloak.fullname" . }} |
| 8 | + name: {{ $fullName }} |
8 | 9 | namespace: {{ .Release.Namespace }} |
9 | 10 | {{- with $ingress.annotations }} |
10 | 11 | annotations: |
@@ -43,17 +44,17 @@ spec: |
43 | 44 | pathType: {{ .pathType }} |
44 | 45 | backend: |
45 | 46 | service: |
46 | | - name: {{ include "keycloak.fullname" $ }}-http |
| 47 | + name: {{ default (printf "%s-http" $fullName) (.serviceName) }} |
47 | 48 | port: |
48 | | - name: {{ $ingress.servicePort }} |
| 49 | + name: {{ default ($ingress.servicePort) (.servicePort) }} |
49 | 50 | {{- end }} |
50 | 51 | {{- end }} |
51 | 52 | {{- if $ingress.console.enabled }} |
52 | 53 | --- |
53 | 54 | apiVersion: {{ $apiVersion }} |
54 | 55 | kind: Ingress |
55 | 56 | metadata: |
56 | | - name: {{ include "keycloak.fullname" . }}-console |
| 57 | + name: {{ $fullName }}-console |
57 | 58 | namespace: {{ .Release.Namespace }} |
58 | 59 | {{- with $ingress.console.annotations }} |
59 | 60 | annotations: |
@@ -106,9 +107,9 @@ spec: |
106 | 107 | pathType: {{ .pathType }} |
107 | 108 | backend: |
108 | 109 | service: |
109 | | - name: {{ include "keycloak.fullname" $ }}-http |
| 110 | + name: {{ default (printf "%s-http" $fullName) (.serviceName) }} |
110 | 111 | port: |
111 | | - name: {{ $ingress.servicePort }} |
| 112 | + name: {{ default ($ingress.servicePort) (.servicePort) }} |
112 | 113 | {{- end }} |
113 | 114 | {{- end }} |
114 | 115 | {{- end -}} |
|
0 commit comments