summaryrefslogtreecommitdiffstats
path: root/charts
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-04-11 08:47:08 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-11 08:47:08 +0000
commit99c7f07e20496b54f9e9136bbcf723bf0f17327c (patch)
tree16b673bf3443b9692dd9f381677a7e5212c8fd35 /charts
parent80e1647892dc4f815017c83dd9c6e36d60803ad4 (diff)
parentfaa0c9cd583e97af349aa8ecbbac93638185b373 (diff)
Merge "Using .values.service.name for service URL"
Diffstat (limited to 'charts')
-rw-r--r--charts/sms/charts/vault/templates/service.yaml2
-rw-r--r--charts/sms/charts/vault/values.yaml2
-rw-r--r--charts/sms/templates/deployment.yaml3
-rw-r--r--charts/sms/templates/service.yaml2
-rw-r--r--charts/sms/values.yaml4
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