diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-05-24 13:11:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-24 13:11:50 +0000 |
| commit | 57326c615966a14f24d7b7a5ac84e51c1b73e0b0 (patch) | |
| tree | b571aad2584869bd8c56775bb1b7cea501e58d65 /kubernetes/aai/charts/aai-search-data | |
| parent | e7e1e1787c3cf923e3f0f15469b9db99742d4b8e (diff) | |
| parent | 2d4426e022588345d2f1eea6aa609f236dd6b595 (diff) | |
Merge "Fix Incorrect AAI services"
Diffstat (limited to 'kubernetes/aai/charts/aai-search-data')
| -rw-r--r-- | kubernetes/aai/charts/aai-search-data/templates/service.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-search-data/values.yaml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/aai/charts/aai-search-data/templates/service.yaml b/kubernetes/aai/charts/aai-search-data/templates/service.yaml index 41bc163696..e342a9a688 100644 --- a/kubernetes/aai/charts/aai-search-data/templates/service.yaml +++ b/kubernetes/aai/charts/aai-search-data/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.name" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -14,10 +14,10 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/aai/charts/aai-search-data/values.yaml b/kubernetes/aai/charts/aai-search-data/values.yaml index 4e47d37134..c6f42bd38b 100644 --- a/kubernetes/aai/charts/aai-search-data/values.yaml +++ b/kubernetes/aai/charts/aai-search-data/values.yaml @@ -41,7 +41,7 @@ readiness: service: type: ClusterIP - name: aai-search-data + portName: aai-search-data internalPort: 9509 ingress: |