diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-08-06 17:13:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-06 17:13:41 +0000 |
| commit | 25c79191ddd7b211085f7eab5156984a79f3a699 (patch) | |
| tree | 945e493b965ee12f5d638c60543781e3f53ae980 | |
| parent | 14d30a11ba9e4f8b7c122812c0a3b1a86fc23ae1 (diff) | |
| parent | 8873e9a76430038f3e0da6c807096ab3780dd5da (diff) | |
Merge "Close VID's plain text port 30238" into staging
| -rw-r--r-- | kubernetes/vid/templates/service.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/vid/values.yaml | 6 |
2 files changed, 23 insertions, 10 deletions
diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml index 36b35e40da..1e465c95e0 100644 --- a/kubernetes/vid/templates/service.yaml +++ b/kubernetes/vid/templates/service.yaml @@ -29,17 +29,32 @@ spec: - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} name: {{ .Values.service.portName }} - - port: {{ .Values.service.internalPort2 }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.portName2 }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} name: {{ .Values.service.portName }} - - port: {{ .Values.service.externalPort2 }} - targetPort: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.portName2 }} {{- end}} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "common.servicename" . }}-http + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: ClusterIP + selector: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + ports: + - name: {{ .Values.service.portName }}-http + port: {{ .Values.service.externalHttpPort }} + targetPort: {{ .Values.service.internalHttpPort }} + protocol: TCP diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index f4e79e4b0a..74a8c6c1ce 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -86,10 +86,8 @@ service: externalPort: 8443 internalPort: 8443 nodePort: "00" - portName2: vid-http - externalPort2: 8080 - internalPort2: 8080 - nodePort2: "38" + externalHttpPort: 8080 + internalHttpPort: 8080 ingress: enabled: false |