Code Review
/
it
/
dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Moving dev back to LF Gerrit
[it/dep.git]
/
ric-infra
/
30-Kong
/
helm
/
kong
/
charts
/
kong
/
templates
/
controller-deployment.yaml
diff --git
a/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml
b/ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml
index
056b1d4
..
2bb7f08
100755
(executable)
--- a/
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml
+++ b/
ric-infra/30-Kong/helm/kong/charts/kong/templates/controller-deployment.yaml
@@
-1,5
+1,5
@@
{{- if (and (.Values.ingressController.enabled) (not (eq .Values.env.database "off"))) }}
{{- if (and (.Values.ingressController.enabled) (not (eq .Values.env.database "off"))) }}
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: Deployment
metadata:
name: "{{ template "kong.fullname" . }}-controller"
kind: Deployment
metadata:
name: "{{ template "kong.fullname" . }}-controller"
@@
-61,7
+61,6
@@
spec:
{{- end }}
{{- include "kong.license" . | nindent 8 }}
{{- end }}
{{- end }}
{{- include "kong.license" . | nindent 8 }}
{{- end }}
- {{- include "kong.env" . | indent 8 }}
{{- if .Values.admin.useTLS }}
- name: KONG_ADMIN_LISTEN
value: "0.0.0.0:{{ .Values.admin.containerPort }} ssl"
{{- if .Values.admin.useTLS }}
- name: KONG_ADMIN_LISTEN
value: "0.0.0.0:{{ .Values.admin.containerPort }} ssl"
@@
-82,6
+81,7
@@
spec:
- name: KONG_CASSANDRA_CONTACT_POINTS
value: {{ template "kong.cassandra.fullname" . }}
{{- end }}
- name: KONG_CASSANDRA_CONTACT_POINTS
value: {{ template "kong.cassandra.fullname" . }}
{{- end }}
+ {{- include "kong.env" . | indent 8 }}
ports:
- name: admin
containerPort: {{ .Values.admin.containerPort }}
ports:
- name: admin
containerPort: {{ .Values.admin.containerPort }}