From 6ff8a92ad97f77e0794347d8f0941c79bbe6cd74 Mon Sep 17 00:00:00 2001 From: Tomas Pizarro Date: Wed, 5 Sep 2018 15:14:33 +0200 Subject: [PATCH] [stable/mongodb] Fix issue starting mongodb replica set with persisted data (#7546) Signed-off-by: tompizmor --- stable/mongodb/Chart.yaml | 2 +- .../templates/statefulset-arbiter-rs.yaml | 16 +++++----------- .../templates/statefulset-primary-rs.yaml | 2 +- .../templates/statefulset-secondary-rs.yaml | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml index 71f7d4e86f..02f923fa81 100644 --- a/stable/mongodb/Chart.yaml +++ b/stable/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 4.2.3 +version: 4.3.0 appVersion: 4.0.2 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/stable/mongodb/templates/statefulset-arbiter-rs.yaml b/stable/mongodb/templates/statefulset-arbiter-rs.yaml index 722670bf25..c64db3d442 100644 --- a/stable/mongodb/templates/statefulset-arbiter-rs.yaml +++ b/stable/mongodb/templates/statefulset-arbiter-rs.yaml @@ -60,7 +60,7 @@ spec: value: {{ .Values.replicaSet.name | quote }} {{- if .Values.replicaSet.useHostnames }} - name: MONGODB_ADVERTISED_HOSTNAME - value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- if .Values.usePassword }} - name: MONGODB_PRIMARY_ROOT_PASSWORD @@ -84,11 +84,8 @@ spec: value: {{ default "" .Values.mongodbExtraFlags | join " " }} {{- if .Values.livenessProbe.enabled }} livenessProbe: - exec: - command: - - mongo - - --eval - - "db.adminCommand('ping')" + tcpSocket: + port: mongodb initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} @@ -97,11 +94,8 @@ spec: {{- end }} {{- if .Values.readinessProbe.enabled }} readinessProbe: - exec: - command: - - mongo - - --eval - - "db.adminCommand('ping')" + tcpSocket: + port: mongodb initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} diff --git a/stable/mongodb/templates/statefulset-primary-rs.yaml b/stable/mongodb/templates/statefulset-primary-rs.yaml index cc78a6a551..411c0a99a0 100644 --- a/stable/mongodb/templates/statefulset-primary-rs.yaml +++ b/stable/mongodb/templates/statefulset-primary-rs.yaml @@ -58,7 +58,7 @@ spec: value: {{ .Values.replicaSet.name | quote }} {{- if .Values.replicaSet.useHostnames }} - name: MONGODB_ADVERTISED_HOSTNAME - value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} - name: MONGODB_USERNAME value: {{ .Values.mongodbUsername | quote }} diff --git a/stable/mongodb/templates/statefulset-secondary-rs.yaml b/stable/mongodb/templates/statefulset-secondary-rs.yaml index 586681c146..490b75f089 100644 --- a/stable/mongodb/templates/statefulset-secondary-rs.yaml +++ b/stable/mongodb/templates/statefulset-secondary-rs.yaml @@ -61,7 +61,7 @@ spec: value: {{ .Values.replicaSet.name | quote }} {{- if .Values.replicaSet.useHostnames }} - name: MONGODB_ADVERTISED_HOSTNAME - value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.cluster.local" {{- end }} {{- if .Values.usePassword }} - name: MONGODB_PRIMARY_ROOT_PASSWORD