diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2022-05-17 00:26:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-05-17 00:26:41 +0000 |
| commit | 8ca75d9434288173933f6e140c829c42f7a3c5b5 (patch) | |
| tree | 5b0023b32a4e9e83c1131bfc6c724d771212b107 /kubernetes | |
| parent | c1aa68b0c1183d90e6ada524d7e16dabf51bf890 (diff) | |
| parent | 1256637d8781647464fd65529abba20c80fc73fc (diff) | |
Merge "[SDC] Fix non ssl NodePort"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/sdc/components/sdc-fe/templates/service.yaml | 20 | ||||
| -rw-r--r-- | kubernetes/sdc/components/sdc-fe/values.yaml | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/kubernetes/sdc/components/sdc-fe/templates/service.yaml b/kubernetes/sdc/components/sdc-fe/templates/service.yaml index 968a09c77e..30c3d1122f 100644 --- a/kubernetes/sdc/components/sdc-fe/templates/service.yaml +++ b/kubernetes/sdc/components/sdc-fe/templates/service.yaml @@ -39,17 +39,15 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - targetPort: {{ .Values.service.internalPort }} - {{ if (include "common.needTLS" .) }} - - port: {{ .Values.service.internalPort2 }} - targetPort: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.portName }}s - {{ if eq .Values.service.type "NodePort" -}} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - {{ end }} - {{ end }} + {{if eq .Values.service.type "NodePort" -}} + - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }} + {{- else -}} + - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.externalPort2 .Values.service.externalPort }} + targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }} + name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }} + {{- end}} selector: app: {{ include "common.name" . }} release: {{ include "common.release" . }} diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml index 6267da90f3..e86ae4c0d2 100644 --- a/kubernetes/sdc/components/sdc-fe/values.yaml +++ b/kubernetes/sdc/components/sdc-fe/values.yaml @@ -114,9 +114,10 @@ service: portName: http internalPort: 8181 externalPort: 8181 - nodePort2: "07" internalPort2: 9443 externalPort2: 9443 + nodePort: "07" + ingress: enabled: false |