diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-24 15:05:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-24 15:05:31 +0000 |
| commit | 7290253b8ddeda359c5dc38ea1a1c43588a4af85 (patch) | |
| tree | 15988913e763d9a153fe5d6182f3929aa9148f95 /kubernetes/portal/charts | |
| parent | a2f1699038a9438d2654f6175245304e4de34d86 (diff) | |
| parent | fe527eb5891f4b774a023df2313575e78a6ce9fe (diff) | |
Merge "fixing clusterIP service type errors"
Diffstat (limited to 'kubernetes/portal/charts')
| -rw-r--r-- | kubernetes/portal/charts/portal-app/templates/NOTES.txt | 2 | ||||
| -rw-r--r-- | kubernetes/portal/charts/portal-app/templates/service.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/portal/charts/portal-sdk/values.yaml | 1 |
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: |