From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Mon, 8 Nov 2021 21:44:45 +0000 (+0000)
Subject: Merge "[UUI] Automatically retrieve certificates"
X-Git-Tag: 9.0.0~28
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1ea7de0d28ec4c589c1bef04192f10d403188640;hp=e6a1a372edd6ecb6bd480e72558cbb33d0665541;p=oom.git

Merge "[UUI] Automatically retrieve certificates"
---

diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index c8c0ffa0b2..ff11da309a 100644
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -75,7 +75,7 @@ spec:
         - name: SET_NAME
           value: {{ include "common.fullname" . }}
         - name: SERVICE_NAME
-          value: {{ include "common.servicename" . }}
+          value: {{ include "common.servicename" . }}.{{ include "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
 {{- if .Values.extraEnv }}
 {{ toYaml .Values.extraEnv | indent 8 }}
 {{- end }}
diff --git a/kubernetes/common/etcd/values.yaml b/kubernetes/common/etcd/values.yaml
index 3cfd4535f1..e2334eadfe 100644
--- a/kubernetes/common/etcd/values.yaml
+++ b/kubernetes/common/etcd/values.yaml
@@ -17,6 +17,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  clusterName: cluster.local
   persistence: {}
 
 #################################################################
diff --git a/kubernetes/common/mongo/templates/statefulset.yaml b/kubernetes/common/mongo/templates/statefulset.yaml
index 11602054e8..9f24493392 100644
--- a/kubernetes/common/mongo/templates/statefulset.yaml
+++ b/kubernetes/common/mongo/templates/statefulset.yaml
@@ -72,7 +72,7 @@ spec:
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-data
-            mountPath: /var/lib/mongo
+            mountPath: /data/db
           resources: {{ include "common.resources" . | nindent 12 }}
 {{ include "common.containerSecurityContext" . | indent 10 }}
         {{- if .Values.nodeSelector }}