Code Review
/
ric-plt
/
ric-dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Kong ingress controller to version 1.4. It fixes the occasional 404 error.
[ric-plt/ric-dep.git]
/
helm
/
infrastructure
/
subcharts
/
kong
/
templates
/
service-kong-proxy.yaml
diff --git
a/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
b/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
index
ff3454a
..
1102eb4
100755
(executable)
--- a/
helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
+++ b/
helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
@@
-7,10
+7,7
@@
metadata:
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
- app: {{ template "kong.name" . }}
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
+ {{- include "kong.metaLabels" . | nindent 4 }}
spec:
type: {{ .Values.proxy.type }}
{{- if eq .Values.proxy.type "LoadBalancer" }}
spec:
type: {{ .Values.proxy.type }}
{{- if eq .Values.proxy.type "LoadBalancer" }}
@@
-41,7
+38,7
@@
spec:
{{- if or .Values.proxy.tls.enabled }}
- name: kong-proxy-tls
port: {{ .Values.proxy.tls.servicePort }}
{{- if or .Values.proxy.tls.enabled }}
- name: kong-proxy-tls
port: {{ .Values.proxy.tls.servicePort }}
- targetPort: {{ .Values.proxy.tls.containerPort }}
+ targetPort: {{ .Values.proxy.tls.
overrideServiceTargetPort | default .Values.proxy.tls.
containerPort }}
{{- if (and (eq .Values.proxy.type "NodePort") (not (empty .Values.proxy.tls.nodePort))) }}
nodePort: {{ .Values.proxy.tls.nodePort }}
{{- end }}
{{- if (and (eq .Values.proxy.type "NodePort") (not (empty .Values.proxy.tls.nodePort))) }}
nodePort: {{ .Values.proxy.tls.nodePort }}
{{- end }}
@@
-50,8
+47,8
@@
spec:
{{- if .Values.proxy.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.proxy.externalTrafficPolicy }}
{{- end }}
{{- if .Values.proxy.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.proxy.externalTrafficPolicy }}
{{- end }}
-
+ {{- if .Values.proxy.clusterIP }}
+ clusterIP: {{ .Values.proxy.clusterIP }}
+ {{- end }}
selector:
selector:
- app: {{ template "kong.name" . }}
- release: {{ .Release.Name }}
- component: app
+ {{- include "kong.selectorLabels" . | nindent 4 }}