diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-04-09 19:01:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-09 19:01:38 +0000 |
| commit | cdda4e20f3904dcb193625350c91d596a0bc4197 (patch) | |
| tree | ed16cd35f2b11a646403f51d9b588ba1b4c49a3a /kubernetes/log/charts/log-logstash/templates/service.yaml | |
| parent | d96413f48c8a5709a54bdb22a565035313ecef02 (diff) | |
| parent | 2cf26840e1173501739c159ce1066874a02cf839 (diff) | |
Merge "Add missing NodePorts to log components"
Diffstat (limited to 'kubernetes/log/charts/log-logstash/templates/service.yaml')
| -rw-r--r-- | kubernetes/log/charts/log-logstash/templates/service.yaml | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/kubernetes/log/charts/log-logstash/templates/service.yaml b/kubernetes/log/charts/log-logstash/templates/service.yaml index ca71aa2224..cdc2ea8e77 100644 --- a/kubernetes/log/charts/log-logstash/templates/service.yaml +++ b/kubernetes/log/charts/log-logstash/templates/service.yaml @@ -27,19 +27,40 @@ spec: type: {{ .Values.service.type }} ports: {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.externalPort }} + - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} name: {{ .Values.service.name }} - - port: {{ .Values.service.internalPortHttp }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPortHttp }} - name: {{ .Values.service.name }}-http {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} name: {{ .Values.service.name }} - - port: {{ .Values.service.externalPortHttp }} - targetPort: {{ .Values.service.internalPortHttp }} - name: {{ .Values.service.name }}-http + {{- end}} + selector: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.service.name2 }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + annotations: +spec: + type: {{ .Values.service.type2 }} + ports: + {{if eq .Values.service.type2 "NodePort" -}} + - port: {{ .Values.service.internalPort2 }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} + name: {{ .Values.service.name2 }} + {{- else -}} + - port: {{ .Values.service.externalPort2 }} + targetPort: {{ .Values.service.internalPort2 }} + name: {{ .Values.service.name2 }} {{- end}} selector: app: {{ include "common.name" . }} |