From f69eae8cd18c0667a2f46102cb388bd4ae401944 Mon Sep 17 00:00:00 2001 From: Tomas Pizarro Date: Tue, 11 Sep 2018 10:35:38 +0200 Subject: [PATCH] Add ability to specify kubernetes cluster domain (#7655) Signed-off-by: tompizmor --- stable/mongodb/Chart.yaml | 2 +- stable/mongodb/templates/statefulset-arbiter-rs.yaml | 2 +- stable/mongodb/templates/statefulset-primary-rs.yaml | 2 +- stable/mongodb/templates/statefulset-secondary-rs.yaml | 2 +- stable/mongodb/values-production.yaml | 5 ++++- stable/mongodb/values.yaml | 3 +++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml index 71fe4ba030..f116a1c4d6 100644 --- a/stable/mongodb/Chart.yaml +++ b/stable/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 4.3.2 +version: 4.3.3 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 c96cf3c0fe..4ed30a16de 100644 --- a/stable/mongodb/templates/statefulset-arbiter-rs.yaml +++ b/stable/mongodb/templates/statefulset-arbiter-rs.yaml @@ -64,7 +64,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 }}.svc.cluster.local" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" {{- end }} {{- if .Values.usePassword }} - name: MONGODB_PRIMARY_ROOT_PASSWORD diff --git a/stable/mongodb/templates/statefulset-primary-rs.yaml b/stable/mongodb/templates/statefulset-primary-rs.yaml index fe0fef0664..ca5bae1047 100644 --- a/stable/mongodb/templates/statefulset-primary-rs.yaml +++ b/stable/mongodb/templates/statefulset-primary-rs.yaml @@ -62,7 +62,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 }}.svc.cluster.local" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" {{- 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 5af2541f72..d4c4a974a4 100644 --- a/stable/mongodb/templates/statefulset-secondary-rs.yaml +++ b/stable/mongodb/templates/statefulset-secondary-rs.yaml @@ -65,7 +65,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 }}.svc.cluster.local" + value: "$(MONGODB_POD_NAME).{{ template "mongodb.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" {{- end }} {{- if .Values.usePassword }} - name: MONGODB_PRIMARY_ROOT_PASSWORD diff --git a/stable/mongodb/values-production.yaml b/stable/mongodb/values-production.yaml index 66964d74fa..288daee5b9 100644 --- a/stable/mongodb/values-production.yaml +++ b/stable/mongodb/values-production.yaml @@ -60,6 +60,9 @@ securityContext: fsGroup: 1001 runAsUser: 1001 +## Kubernetes Cluster Domain +clusterDomain: cluster.local + ## Kubernetes service type service: annotations: {} @@ -87,7 +90,7 @@ replicaSet: ## Key used for replica set authentication ## # key: key - + ## Number of replicas per each node type ## replicas: diff --git a/stable/mongodb/values.yaml b/stable/mongodb/values.yaml index e7253ead13..a2be82ad7c 100644 --- a/stable/mongodb/values.yaml +++ b/stable/mongodb/values.yaml @@ -61,6 +61,9 @@ securityContext: fsGroup: 1001 runAsUser: 1001 +## Kubernetes Cluster Domain +clusterDomain: cluster.local + ## Kubernetes service type service: annotations: {}