Using .values.service.name for service URL

Use .values.service.name to get the service URL prefix
Using common.namepace was an error

Issue-ID: AAF-162
Change-Id: I11daa933b9f3a767aea7eac512bd09f4589fcde5
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

5 files changed, 5 insertions, 8 deletions

diff --git a/charts/sms/charts/vault/templates/service.yaml b/charts/sms/charts/vault/templates/service.yaml
index cb2f286..1ba8580 100644
--- a/charts/sms/charts/vault/templates/service.yaml
+++ b/charts/sms/charts/vault/templates/service.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.fullname" . }}
+  name: {{ .Values.service.name }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.fullname" . }}
diff --git a/charts/sms/charts/vault/values.yaml b/charts/sms/charts/vault/values.yaml
index c65e6e1..331bc43 100644
--- a/charts/sms/charts/vault/values.yaml
+++ b/charts/sms/charts/vault/values.yaml
@@ -85,7 +85,7 @@ persistence:
 
 service:
   type: NodePort
-  name: vault
+  name: aaf-sms-db
   internalPort: 8200
   nodePort: 44
 
diff --git a/charts/sms/templates/deployment.yaml b/charts/sms/templates/deployment.yaml
index 66c649c..e5381a0 100644
--- a/charts/sms/templates/deployment.yaml
+++ b/charts/sms/templates/deployment.yaml
@@ -36,9 +36,6 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/sms/bin/sms"]
         workingDir: /sms/
-        env:
-        - name: {{ .Values.config.smsdburlenv }}
-          value: "http://{{ include "common.namespace" . }}-smsdb:8200"
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         {{- if eq .Values.liveness.enabled true }}
diff --git a/charts/sms/templates/service.yaml b/charts/sms/templates/service.yaml
index cb2f286..1ba8580 100644
--- a/charts/sms/templates/service.yaml
+++ b/charts/sms/templates/service.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.fullname" . }}
+  name: {{ .Values.service.name }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.fullname" . }}
diff --git a/charts/sms/values.yaml b/charts/sms/values.yaml
index 3db9b9a..92ef2ac 100644
--- a/charts/sms/values.yaml
+++ b/charts/sms/values.yaml
@@ -37,7 +37,7 @@ debugEnabled: false
 # application configuration
 # Example:
 config:
-  smsdburlenv: "SMSDB_URL"
+  smsdbaddress: "http://aaf-sms-db:8200"
   cafile: "/sms/auth/selfsignedca.pem"
   servercert: "/sms/auth/server.cert"
   serverkey: "/sms/auth/server.key"
@@ -68,7 +68,7 @@ readiness:
 
 service:
   type: NodePort
-  name: sms
+  name: aaf-sms
   internalPort: 10443
   nodePort: 43