summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2018-10-16 09:56:34 -0400
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2018-10-23 14:31:50 +0000
commitfe527eb5891f4b774a023df2313575e78a6ce9fe (patch)
treeac3064082afff98643be3f991a434222f6743375 /kubernetes/portal
parent10bac96f181857350b0ed1a662abc2c39472406e (diff)
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 <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/portal')
-rw-r--r--kubernetes/portal/charts/portal-app/templates/NOTES.txt2
-rw-r--r--kubernetes/portal/charts/portal-app/templates/service.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/values.yaml1
3 files changed, 3 insertions, 2 deletions
diff --git a/kubernetes/portal/charts/portal-app/templates/NOTES.txt b/kubernetes/portal/charts/portal-app/templates/NOTES.txt
index 1aa4c41458..9a67a4c9bb 100644
--- a/kubernetes/portal/charts/portal-app/templates/NOTES.txt
+++ b/kubernetes/portal/charts/portal-app/templates/NOTES.txt
@@ -13,7 +13,7 @@
export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ template "so.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ template "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
{{- end }}
diff --git a/kubernetes/portal/charts/portal-app/templates/service.yaml b/kubernetes/portal/charts/portal-app/templates/service.yaml
index 9d7073243d..0813682d95 100644
--- a/kubernetes/portal/charts/portal-app/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/service.yaml
@@ -36,7 +36,7 @@ metadata:
spec:
type: {{ .Values.service.type }}
ports:
- {{- if or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer") }}
+ {{ if or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer") -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 3c4468b7f9..772f191929 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -58,6 +58,7 @@ service:
name: portal-sdk
portName: portal-sdk
internalPort: 8080
+ externalPort: 8080
nodePort: 12
mariadb: