diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-04-11 08:47:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-11 08:47:08 +0000 |
| commit | 834512cca2308e8ee035417fd05acdec8002b9fc (patch) | |
| tree | ba3f37d2ab07265f5588dc74f9303f4a95a2bf9c | |
| parent | dca83ed4f71597d69a13bc7c788fd085a6dbf22b (diff) | |
| parent | 992e1ad6288c0b05484e54f2d881d24a74c659ca (diff) | |
Merge "Using .values.service.name for service URL"
5 files changed, 5 insertions, 8 deletions
diff --git a/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml b/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml index cb2f286a29..1ba8580840 100644 --- a/kubernetes/aaf/charts/sms/charts/vault/templates/service.yaml +++ b/kubernetes/aaf/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/kubernetes/aaf/charts/sms/charts/vault/values.yaml b/kubernetes/aaf/charts/sms/charts/vault/values.yaml index c65e6e19e4..331bc434b4 100644 --- a/kubernetes/aaf/charts/sms/charts/vault/values.yaml +++ b/kubernetes/aaf/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/kubernetes/aaf/charts/sms/templates/deployment.yaml b/kubernetes/aaf/charts/sms/templates/deployment.yaml index 66c649cab4..e5381a0f0c 100644 --- a/kubernetes/aaf/charts/sms/templates/deployment.yaml +++ b/kubernetes/aaf/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/kubernetes/aaf/charts/sms/templates/service.yaml b/kubernetes/aaf/charts/sms/templates/service.yaml index cb2f286a29..1ba8580840 100644 --- a/kubernetes/aaf/charts/sms/templates/service.yaml +++ b/kubernetes/aaf/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/kubernetes/aaf/charts/sms/values.yaml b/kubernetes/aaf/charts/sms/values.yaml index 3db9b9ace8..92ef2ac7d8 100644 --- a/kubernetes/aaf/charts/sms/values.yaml +++ b/kubernetes/aaf/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 |