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
/
common
/
postgres
/
templates
/
_deployment.tpl
diff --git
a/kubernetes/common/postgres/templates/_deployment.tpl
b/kubernetes/common/postgres/templates/_deployment.tpl
index
a4eb110
..
aae5da9
100644
(file)
--- a/
kubernetes/common/postgres/templates/_deployment.tpl
+++ b/
kubernetes/common/postgres/templates/_deployment.tpl
@@
-27,6
+27,12
@@
metadata:
namespace: {{ include "common.namespace" $dot }}
labels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
namespace: {{ include "common.namespace" $dot }}
labels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
+ app.kubernetes.io/name: {{ include "common.name" $dot }}-{{ $pgMode }}
+ {{- if $dot.Chart.AppVersion }}
+ version: "{{ $dot.Chart.AppVersion | replace "+" "_" }}"
+ {{- else }}
+ version: "{{ $dot.Chart.Version | replace "+" "_" }}"
+ {{- end }}
chart: {{ $dot.Chart.Name }}-{{ $dot.Chart.Version | replace "+" "_" }}
release: {{ include "common.release" $dot }}
heritage: {{ $dot.Release.Service }}
chart: {{ $dot.Chart.Name }}-{{ $dot.Chart.Version | replace "+" "_" }}
release: {{ include "common.release" $dot }}
heritage: {{ $dot.Release.Service }}
@@
-42,11
+48,16
@@
spec:
metadata:
labels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
metadata:
labels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
+ app.kubernetes.io/name: {{ include "common.name" $dot }}-{{ $pgMode }}
+ {{- if $dot.Chart.AppVersion }}
+ version: "{{ $dot.Chart.AppVersion | replace "+" "_" }}"
+ {{- else }}
+ version: "{{ $dot.Chart.Version | replace "+" "_" }}"
+ {{- end }}
release: {{ include "common.release" $dot }}
name: "{{ index $dot.Values "container" "name" $pgMode }}"
spec:
release: {{ include "common.release" $dot }}
name: "{{ index $dot.Values "container" "name" $pgMode }}"
spec:
- imagePullSecrets:
- - name: "{{ include "common.namespace" $dot }}-docker-registry-key"
+ {{- include "common.imagePullSecrets" $dot | nindent 6 }}
initContainers:
- command:
- sh
initContainers:
- command:
- sh