2 files changed, 9 insertions, 8 deletions
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index a802cb1466..3174dae242 100644
--- a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -41,15 +41,15 @@ spec:
      containers:
      - env:
        - name: MSB_PROTO
-         value: {{ .Values.config.msbprotocol }}
+         value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
        - name: MSB_ADDR
          value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
        - name: MSB_PORT
-         value: "{{ .Values.config.msbPort }}"
+         value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.msbPort }}{{ else }}{{ .Values.config.msbPlainPort }}{{ end }}"
        - name: AAI_ADDR
-         value: aai.{{ include "common.namespace" . }}
+         value: "aai.{{ include "common.namespace" . }}"
        - name: AAI_PORT
-         value: "{{ .Values.config.aai.port }}"
+         value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.aai.aaiPort }}{{ else }}{{ .Values.config.aai.aaiPlainPort }}{{ end }}"
        - name: AAI_SCHEMA_VERSION
          value: "{{ .Values.config.aai.schemaVersion }}"
        - name: AAI_USERNAME
@@ -57,7 +57,7 @@ spec:
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
        - name: SSL_ENABLED
-         value: "{{ .Values.config.ssl_enabled }}"
+         value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}"
        name: {{ include "common.name" . }}
        volumeMounts:
        - mountPath: "{{ .Values.log.path }}"
diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index 7b606a5492..4ed7a64ecb 100644
--- a/kubernetes/multicloud/components/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -31,11 +31,12 @@ istioSidecar: true
 # application configuration
 config:
   ssl_enabled: false
-  msbprotocol: https
   msbgateway: msb-iag
   msbPort: 443
+  msbPlainPort: 80
   aai:
-    port: 8443
+    aaiPort: 8443
+    aaiPlainPort: 8080
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -59,7 +60,7 @@ liveness:
 service:
   type: ClusterIP
   name: multicloud-pike
-  portName: multicloud-pike
+  portName: http
   externalPort: 9007
   internalPort: 9007
   nodePort: 96