diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-04-30 16:05:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-30 16:05:20 +0000 |
| commit | cd608d2387f5f9c3bf99b619a5cbff3784e304d5 (patch) | |
| tree | ae742922508c29213cd70ea415e21eab47aac379 | |
| parent | 40807650419fe5eb569adaa5145494ddf265e614 (diff) | |
| parent | 346ac698b81496e6d48b9d2feec13d1df244d6f5 (diff) | |
Merge "Remove http port"
| -rw-r--r-- | kubernetes/clamp/templates/NOTES.txt | 4 | ||||
| -rw-r--r-- | kubernetes/clamp/templates/service.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/clamp/values.yaml | 10 |
3 files changed, 5 insertions, 15 deletions
diff --git a/kubernetes/clamp/templates/NOTES.txt b/kubernetes/clamp/templates/NOTES.txt index 1103affff1..e36d6a5bfb 100644 --- a/kubernetes/clamp/templates/NOTES.txt +++ b/kubernetes/clamp/templates/NOTES.txt @@ -27,6 +27,6 @@ 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 "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 }} + echo "Visit https://127.0.0.1:8443 to use your application" + kubectl port-forward $POD_NAME 8443:{{ .Values.service.internalPort }} {{- end }} diff --git a/kubernetes/clamp/templates/service.yaml b/kubernetes/clamp/templates/service.yaml index 8527ebb052..f1438a46c9 100644 --- a/kubernetes/clamp/templates/service.yaml +++ b/kubernetes/clamp/templates/service.yaml @@ -30,16 +30,10 @@ 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.portName }}2 {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} name: {{ .Values.service.portName }} - - port: {{ .Values.service.externalPort2 }} - targetPort: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.portName }}2 {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 9d5fb05daf..62ad2f9fa1 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -100,15 +100,11 @@ service: type: NodePort name: clamp portName: clamp - internalPort: 8080 - externalPort: 8080 - nodePort: 95 - portName2: clamp-ssl - internalPort2: 8443 - externalPort2: 8443 + internalPort: 8443 + externalPort: 8443 + nodePort: 58 # as of 20180904 port 58 is reserved for clamp from log/logdemonode # see https://wiki.onap.org/display/DW/OOM+NodePort+List - nodePort2: 58 ingress: |