aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-08-01 12:09:28 +0300
committerIttay Stern <ittay.stern@att.com>2019-08-06 14:49:59 +0000
commit8873e9a76430038f3e0da6c807096ab3780dd5da (patch)
treeb69d78543c8d9aea173b4e30770008311ab65ebe
parent30dfa332dfdec5c51f5a911420ede10224c7b242 (diff)
Close VID's plain text port 30238
* Move robot's health-check to https * Expose 8080 on ClusterIP only Issue-ID: VID-496 Issue-ID: OJSI-119 Change-Id: Iac5580261692576e523966945db619bff560b3e6 Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rw-r--r--kubernetes/vid/templates/service.yaml27
-rw-r--r--kubernetes/vid/values.yaml6
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