Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Make imagePullSecrets configurable
[oom.git]
/
kubernetes
/
aai
/
templates
/
deployment.yaml
diff --git
a/kubernetes/aai/templates/deployment.yaml
b/kubernetes/aai/templates/deployment.yaml
index
dc0dad8
..
5a7f38c
100644
(file)
--- a/
kubernetes/aai/templates/deployment.yaml
+++ b/
kubernetes/aai/templates/deployment.yaml
@@
-23,6
+23,12
@@
metadata:
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
+ app.kubernetes.io/name: {{ include "common.name" . }}
+ {{- if .Chart.AppVersion }}
+ version: "{{ .Chart.AppVersion | replace "+" "_" }}"
+ {{- else }}
+ version: "{{ .Chart.Version | replace "+" "_" }}"
+ {{- end }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
@@
-43,6
+49,12
@@
spec:
labels:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
labels:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
+ app.kubernetes.io/name: {{ include "common.name" . }}
+ {{- if .Chart.AppVersion }}
+ version: "{{ .Chart.AppVersion | replace "+" "_" }}"
+ {{- else }}
+ version: "{{ .Chart.Version | replace "+" "_" }}"
+ {{- end }}
name: {{ include "common.release" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
name: {{ include "common.release" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@
-93,21
+105,22
@@
spec:
name: haproxy-cfg
ports:
- containerPort: {{ .Values.service.internalPort }}
name: haproxy-cfg
ports:
- containerPort: {{ .Values.service.internalPort }}
-
- containerPort: {{ .Values.service.internalPlainPort
}}
+
name: {{ .Values.service.portName
}}
- containerPort: {{ .Values.metricsService.internalPort }}
- containerPort: {{ .Values.metricsService.internalPort }}
+ name: {{ .Values.metricsService.portName }}
# disable liveness probe when breakpoints set in debugger
# so K8s doesn't restart unresponsive container
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
# disable liveness probe when breakpoints set in debugger
# so K8s doesn't restart unresponsive container
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalP
lainP
ort }}
+ port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
readinessProbe:
httpGet:
path: /aai/util/echo
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
readinessProbe:
httpGet:
path: /aai/util/echo
- port: {{ .Values.service.internalP
lainP
ort }}
+ port: {{ .Values.service.internalPort }}
scheme: HTTP
httpHeaders:
- name: X-FromAppId
scheme: HTTP
httpHeaders:
- name: X-FromAppId
@@
-142,5
+155,4
@@
spec:
- name: haproxy-cfg
configMap:
name: aai-deployment-configmap
- name: haproxy-cfg
configMap:
name: aai-deployment-configmap
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
+ {{- include "common.imagePullSecrets" . | nindent 6 }}