Merge branch 'master' into OZG-3539-mail-notifications

src/main/helm/templates/_helpers.tpl

@@ -54,7 +54,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.grpc_client_user-manager_address" -}}
-{{ printf "%s.%s:9000" ( coalesce .Values.usermanagerName "user-manager" ) .Release.Namespace }}
+{{ printf "dns:///%s.%s:9000" ( coalesce .Values.usermanagerName "user-manager" ) .Release.Namespace }}
 {{- end -}}
 
 {{- define "app.spring_cloud_config_administration_address" -}}

src/test/helm/deployment_defaults_env_test.yaml

@@ -53,7 +53,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_user-manager_address
-            value: user-manager.sh-helm-test:9000
+            value: dns:///user-manager.sh-helm-test:9000
 
   - it: should have service binding root
     set: