From 58662a319d2e1f2a53eeceb06469658e4b070c50 Mon Sep 17 00:00:00 2001 From: Radoslaw Chmiel Date: Thu, 2 Jun 2022 19:37:35 +0200 Subject: [SDNC] SDNC ServiceMesh compatibility SDNC charts and properties file changes to make it work with servicemesh Issue-ID: OOM-2983 Signed-off-by: Radoslaw Chmiel Change-Id: I30bf8948f65d6a1b912c3f840ca44cead03bdc96 --- .../sdnc/components/sdnc-ansible-server/values.yaml | 2 +- .../sdnc/components/sdnc-web/templates/deployment.yaml | 16 +++++++++------- kubernetes/sdnc/components/sdnc-web/values.yaml | 10 +++++++++- .../resources/config/ueb-listener.properties | 5 +++++ 4 files changed, 24 insertions(+), 9 deletions(-) (limited to 'kubernetes/sdnc/components') diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index c89f03b824..7689dcc5e9 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -101,7 +101,7 @@ readiness: service: type: ClusterIP name: sdnc-ansible-server - portName: sdnc-ansible-server + portName: http internalPort: 8000 externalPort: 8000 diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml index 21416c9b5f..03432d3b63 100644 --- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml @@ -49,32 +49,34 @@ spec: {{ if .Values.liveness.enabled }} livenessProbe: tcpSocket: - port: {{ .Values.service.internalPort }} + port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end }} readinessProbe: tcpSocket: - port: {{ .Values.service.internalPort }} + port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: WEBPROTOCOL - value: {{ .Values.config.webProtocol }} + value: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webProtocol .Values.config.webPlainProtocol }} - name: WEBPORT - value: {{ .Values.config.webPort | quote }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webPort .Values.config.webPlainPort | quote }} - name: SDNRPROTOCOL - value: {{ .Values.config.sdnrProtocol }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrProtocol .Values.config.sdnrPlainProtocol }} - name: SDNRHOST - value: {{ .Values.config.sdnrHost }}.{{ include "common.namespace" . }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrHost .Values.config.sdnrPlainHost }}.{{ include "common.namespace" . }} - name: SDNRPORT - value: {{ .Values.config.sdnrPort | quote }} + value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrPort .Values.config.sdnrPlainPort | quote }} + {{ if (include "common.needTLS" .) }} - name: SSL_CERT_DIR value: {{ .Values.config.sslCertDir }} - name: SSL_CERTIFICATE value: {{ .Values.config.sslCertiticate }} - name: SSL_CERTIFICATE_KEY value: {{ .Values.config.sslCertKey }} + {{ end }} {{ if .Values.config.transportpce.enabled }} - name: TRPCEURL value: {{ .Values.config.transportpce.transportpceUrl }} diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index c066b5e0c7..ecc5573f28 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -29,10 +29,15 @@ pullPolicy: Always config: sdncChartName: sdnc webProtocol: HTTPS + webPlainProtocol: HTTP webPort: 8443 + webPlainPort: 8080 sdnrProtocol: https + sdnrPlainProtocol: http sdnrHost: "sdnc" + sdnrPlainHost: "sdnc" sdnrPort: "8443" + sdnrPlainPort : "8080" sslCertDir: "/opt/app/osaaf/local/certs" sslCertiticate: "cert.pem" sslCertKey: "key.pem" @@ -100,9 +105,12 @@ service: # for liveness and readiness probe only # internalPort: internalPort: 8443 + internalPlainPort: 8080 ports: - - name: "sdnc-web" + - name: http-sdnc-web port: "8443" + plain_port: "8080" + port_protocol: http nodePort: "05" #ingress: diff --git a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties index 946773b18b..45a80af8a6 100644 --- a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties +++ b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties @@ -1,4 +1,9 @@ +{{- if (include "common.needTLS" .) }} org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Release.Namespace}}:8443 +{{- else }} +org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Release.Namespace}}:8080 +org.onap.ccsdk.sli.northbound.uebclient.use-https=false +{{- end }} org.onap.ccsdk.sli.northbound.uebclient.consumer-group=sdc-OpenSource-Env1-sdnc-dockero org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdc-COpenSource-Env11-sdnc-dockero org.onap.ccsdk.sli.northbound.uebclient.environment-name=AUTO -- cgit 1.2.3-korg