Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DCAEMOD] Uses new tpls for repos / images"
[oom.git]
/
kubernetes
/
common
/
mongo
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/common/mongo/templates/statefulset.yaml
b/kubernetes/common/mongo/templates/statefulset.yaml
index
0c6c9f4
..
73186b3
100644
(file)
--- a/
kubernetes/common/mongo/templates/statefulset.yaml
+++ b/
kubernetes/common/mongo/templates/statefulset.yaml
@@
-14,7
+14,7
@@
# limitations under the License.
*/}}
# limitations under the License.
*/}}
-apiVersion: apps/v1
beta1
+apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
@@
-22,21
+22,29
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
serviceName: {{ .Values.service.name }}
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
serviceName: {{ .Values.service.name }}
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
template:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
spec:
+{{ include "common.podSecurityContext" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
containers:
- name: {{ include "common.name" . }}
- image:
"{{ .Values.dockerHubRepository }}/{{ .Values.image }}"
+ image:
{{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - docker-entrypoint.sh
+ args:
+ - --nounixsocket
env:
- name: MONGO_INITDB_DATABASE
value: "{{ .Values.config.dbName }}"
env:
- name: MONGO_INITDB_DATABASE
value: "{{ .Values.config.dbName }}"
@@
-63,8
+71,8
@@
spec:
volumeMounts:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/mongo
volumeMounts:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/mongo
- resources:
-{{ include "common.
resources" . | indent 12
}}
+ resources:
{{ include "common.resources" . | nindent 12 }}
+{{ include "common.
containerSecurityContext" . | indent 10
}}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
@@
-84,7
+92,7
@@
spec:
labels:
name: {{ include "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
labels:
name: {{ include "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{
.Release.Name
}}"
+ release: "{{
include "common.release" .
}}"
heritage: "{{ .Release.Service }}"
spec:
accessModes:
heritage: "{{ .Release.Service }}"
spec:
accessModes: