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] Fix resources indent
[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
6142baa
..
e0a0ffd
100644
(file)
--- a/
kubernetes/common/postgres/templates/_deployment.tpl
+++ b/
kubernetes/common/postgres/templates/_deployment.tpl
@@
-1,6
+1,8
@@
{{/*
# Copyright © 2018 Amdocs, AT&T, Bell Canada
# Copyright © 2020 Samsung Electronics
{{/*
# Copyright © 2018 Amdocs, AT&T, Bell Canada
# Copyright © 2020 Samsung Electronics
+# Copyright © 2021 Orange
+# Modifications Copyright (C) 2021 Bell Canada.
# #
# # Licensed under the Apache License, Version 2.0 (the "License");
# # you may not use this file except in compliance with the License.
# #
# # Licensed under the Apache License, Version 2.0 (the "License");
# # you may not use this file except in compliance with the License.
@@
-31,6
+33,8
@@
metadata:
name: "{{ index $dot.Values "container" "name" $pgMode }}"
spec:
replicas: 1
name: "{{ index $dot.Values "container" "name" $pgMode }}"
spec:
replicas: 1
+ strategy:
+ type: Recreate
selector:
matchLabels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
selector:
matchLabels:
app: {{ include "common.name" $dot }}-{{ $pgMode }}
@@
-41,6
+45,8
@@
spec:
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"
initContainers:
- command:
- sh
initContainers:
- command:
- sh
@@
-57,6
+63,8
@@
spec:
env:
- name: PG_PRIMARY_USER
value: primaryuser
env:
- name: PG_PRIMARY_USER
value: primaryuser
+ - name: MODE
+ value: postgres
- name: PG_PRIMARY_PASSWORD_INPUT
{{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
- name: PG_USER
- name: PG_PRIMARY_PASSWORD_INPUT
{{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
- name: PG_USER
@@
-116,12
+124,14
@@
spec:
value: /tmp
- name: PG_PRIMARY_USER
value: primaryuser
value: /tmp
- name: PG_PRIMARY_USER
value: primaryuser
+ - name: MODE
+ value: postgres
- name: PG_MODE
value: {{ $pgMode }}
- name: PG_PRIMARY_HOST
- name: PG_MODE
value: {{ $pgMode }}
- name: PG_PRIMARY_HOST
- value: "{{ $dot.Values.
container.name.primary
}}"
+ value: "{{ $dot.Values.
service.name2
}}"
- name: PG_REPLICA_HOST
- name: PG_REPLICA_HOST
- value: "{{ $dot.Values.
container.name.replica
}}"
+ value: "{{ $dot.Values.
service.name3
}}"
- name: PG_PRIMARY_PORT
value: "{{ $dot.Values.service.internalPort }}"
- name: PG_PRIMARY_PASSWORD
- name: PG_PRIMARY_PORT
value: "{{ $dot.Values.service.internalPort }}"
- name: PG_PRIMARY_PASSWORD
@@
-134,6
+144,8
@@
spec:
value: "{{ $dot.Values.config.pgDatabase }}"
- name: PG_ROOT_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
value: "{{ $dot.Values.config.pgDatabase }}"
- name: PG_ROOT_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
+ - name: PGDATA_PATH_OVERRIDE
+ value: "{{ $dot.Values.config.pgDataPath }}"
volumeMounts:
- name: config
mountPath: /pgconf/pool_hba.conf
volumeMounts:
- name: config
mountPath: /pgconf/pool_hba.conf
@@
-146,7
+158,7
@@
spec:
- mountPath: /backup
name: {{ include "common.fullname" $dot }}-backup
readOnly: true
- mountPath: /backup
name: {{ include "common.fullname" $dot }}-backup
readOnly: true
- resources: {{ include "common.resources" $dot | nindent 1
2
}}
+ resources: {{ include "common.resources" $dot | nindent 1
0
}}
{{- if $dot.Values.nodeSelector }}
nodeSelector:
{{ toYaml $dot.Values.nodeSelector | indent 10 }}
{{- if $dot.Values.nodeSelector }}
nodeSelector:
{{ toYaml $dot.Values.nodeSelector | indent 10 }}