diff options
Diffstat (limited to 'kubernetes/message-router')
| -rw-r--r-- | kubernetes/message-router/charts/kafka/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/message-router/templates/service.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/message-router/values.yaml | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/message-router/charts/kafka/templates/deployment.yaml b/kubernetes/message-router/charts/kafka/templates/deployment.yaml index 347442f8ef..a4e13cdab6 100644 --- a/kubernetes/message-router/charts/kafka/templates/deployment.yaml +++ b/kubernetes/message-router/charts/kafka/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: - name: KAFKA_ZOOKEEPER_CONNECT value: "{{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperPort}}" - name: KAFKA_ADVERTISED_HOST_NAME - value: "{{ include "common.fullname" . }}" + value: "{{ include "common.servicename" . }}" - name: KAFKA_BROKER_ID value: "0" - name: KAFKA_ADVERTISED_LISTENERS diff --git a/kubernetes/message-router/templates/service.yaml b/kubernetes/message-router/templates/service.yaml index 7265ecb544..45c2616ec9 100644 --- a/kubernetes/message-router/templates/service.yaml +++ b/kubernetes/message-router/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -25,7 +25,7 @@ metadata: annotations: msb.onap.org/service-info: '[ { - "serviceName": "{{ include "common.fullname" . }}", + "serviceName": "{{ include "common.servicename" . }}", "version": "v1", "url": "/", "protocol": "REST", @@ -40,14 +40,14 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }}-{{ .Values.service.externalPort }} + name: {{ .Values.service.portName }}-{{ .Values.service.externalPort }} - port: {{ .Values.service.externalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}-{{ .Values.service.externalPort2 }} + name: {{ .Values.service.portName }}-{{ .Values.service.externalPort2 }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml index d80f22ea4d..181368d885 100644 --- a/kubernetes/message-router/values.yaml +++ b/kubernetes/message-router/values.yaml @@ -68,6 +68,7 @@ readiness: service: type: NodePort name: message-router + portName: message-router externalPort: 3904 nodePort: 27 externalPort2: 3905 |