Merge "[CDS] Service mesh compatibility"

4 files changed, 7 insertions, 9 deletions

diff --git a/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
index 7ef5959a1b..3710f5f510 100644
--- a/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
@@ -1,6 +1,6 @@
 listenerservice:
   config:
-    asdcAddress: sdc-be.{{include "common.namespace" .}}:8443 #SDC-BE
+    asdcAddress: sdc-be.{{include "common.namespace" .}}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }} #SDC-BE
     messageBusAddress: message-router.{{include "common.namespace" .}} #Message-Router
     user: cds #SDC-username
     password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U #SDC-password
@@ -14,7 +14,7 @@ listenerservice:
     keyStorePath:
     activateServerTLSAuth : false
     isUseHttpsWithDmaap: false
-    isUseHttpsWithSDC: true
+    isUseHttpsWithSDC: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
     archivePath: /opt/app/onap/sdc-listener/
     grpcAddress: cds-blueprints-processor-grpc
     grpcPort: 9111
@@ -24,14 +24,11 @@ listenerservice:
     httpsProxyPort: 0
     httpProxyPort: 0
 
-
-
 cdslistener:
   healthcheck:
     baseUrl: http://localhost:9000/
     mapping-service-name-with-service-link: "[SDC Listener service,/api/v1/sdclistener/healthcheck]"
 
-
 management:
   endpoint:
     health:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index 4ac847005e..3a6d76165b 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -63,18 +63,19 @@ spec:
             value: {{ .Values.config.appConfigDir }}
           ports:
           - containerPort: {{ .Values.service.http.internalPort }}
+            name: {{ .Values.service.http.portName }}
           {{ if .Values.liveness.enabled }}
           livenessProbe:
             httpGet:
               path: /api/v1/sdclistener/healthcheck
-              port: {{ .Values.service.http.internalPort }}
+              port: {{ .Values.service.http.portName }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{end}}
           readinessProbe:
             httpGet:
               path: /api/v1/sdclistener/healthcheck
-              port: {{ .Values.service.http.internalPort }}
+              port: {{ .Values.service.http.portName }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
index af837f2b3a..42bd2b33e9 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
@@ -31,7 +31,7 @@ spec:
       {{- if eq .Values.service.type "NodePort"}}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       {{- end}}
-      name: {{ .Values.service.http.portName | default "http" }}
+      name: {{ .Values.service.http.portName | default "http" }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index ac1e3b4dde..1499ad5b04 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -62,7 +62,7 @@ readiness:
 service:
   type: ClusterIP
   http:
-    portName: cds-sdc-listener-http
+    portName: http
     internalPort: 8080
     externalPort: 8080