From fe527eb5891f4b774a023df2313575e78a6ce9fe Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Tue, 16 Oct 2018 09:56:34 -0400 Subject: fixing clusterIP service type errors If you try and change the service type from a nodeport to a cluster IP things break. We never really exercise this code path in testing but if you want to experiment with a totally internal network environment you need to be able to turn off node ports. Issue-ID: OOM-1475 Change-Id: I1a0f4b0a4c390f3353e1611b6002b93e54bb5044 Signed-off-by: Mandeep Khinda --- kubernetes/so/charts/so-mariadb/templates/service.yaml | 6 +++--- kubernetes/so/charts/so-mariadb/values.yaml | 1 + kubernetes/so/values.yaml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'kubernetes/so') diff --git a/kubernetes/so/charts/so-mariadb/templates/service.yaml b/kubernetes/so/charts/so-mariadb/templates/service.yaml index c9a3f564ab..010dc71474 100755 --- a/kubernetes/so/charts/so-mariadb/templates/service.yaml +++ b/kubernetes/so/charts/so-mariadb/templates/service.yaml @@ -25,13 +25,13 @@ spec: type: {{ .Values.service.type }} ports: - name: {{ .Values.service.portName }} - {{- if eq .Values.service.type "NodePort" }} + {{ if eq .Values.service.type "NodePort" }} port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }} - {{- else -}} + {{ else }} port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - {{- end}} + {{ end }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} \ No newline at end of file diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml index 9587c4a4cd..fa16a7b11e 100755 --- a/kubernetes/so/charts/so-mariadb/values.yaml +++ b/kubernetes/so/charts/so-mariadb/values.yaml @@ -81,6 +81,7 @@ service: type: NodePort portName: mariadb internalPort: 3306 + externalPort: 3306 nodePort: 52 ingress: enabled: false diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index 223cff10e0..5a6d16710b 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -39,6 +39,7 @@ service: type: NodePort nodePort: 77 internalPort: 8080 + externalPort: 8080 portName: so-apih-port updateStrategy: type: RollingUpdate -- cgit 1.2.3-korg