[MULTICLOUD] Service mesh compatibility

Patch on MC charts dedicated to make http/https calls depending
on configuration for TLS. Include an updated version of the
framework-artifactbroker

Issue-ID: OOM-3015

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I03deae9dcea703540fe6e3a81ddba20505f246f1

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index f71255b..2750f5f 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/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 }}"
@@ -78,7 +78,7 @@ spec:
          httpGet:
            path: /api/multicloud-fcaps/v1/healthcheck
            port: {{ .Values.service.internalPort }}
-           scheme: HTTPS
+           scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
          periodSeconds: {{ .Values.liveness.periodSeconds }}
          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml
index fabe32e..e73a942 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml
@@ -32,7 +32,7 @@ metadata:
       "url": "/api/multicloud-fcaps/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     },
     {
@@ -41,7 +41,7 @@ metadata:
       "url": "/api/multicloud-fcaps/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     }
     ]'

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 21be9d3..b9e90af 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -26,16 +26,17 @@ image: onap/multicloud/openstack-fcaps:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
-istioSidecar: false
+istioSidecar: true
 
 # application configuration
 config:
   ssl_enabled: true
-  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-fcaps
-  portName: multicloud-fcaps
+  portName: http
   externalPort: 9011
   internalPort: 9011
   nodePort: 87

diff --git a/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json b/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
index 2ce2d85..cf81879 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
+++ b/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
@@ -5,7 +5,7 @@
         "port":9014,
         "userName":"healthcheck",
         "password":"zb!XztG34",
-        "https":true
+        "https":{{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
     },
     "receptionHandlerParameters":{
         "SDCReceptionHandler":{
@@ -27,7 +27,7 @@
         "sdcConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
             "parameters":{
-            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:8443",
+            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
                 "messageBusAddress": [
                     "message-router.{{ include "common.namespace" . }}"
                  ],
@@ -54,7 +54,12 @@
                 "keystorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false
+                "isUseHttpsWithDmaap": false,
+                "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
+                "httpsproxyHost": "null",
+                "httpproxyHost": "null",
+                "httpsproxyPort": 8181,
+                "httpproxyPort": 8080
             }
         }
     },
@@ -62,7 +67,7 @@
         "k8sConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup",
             "parameters":{
-                "useHttps": true,
+                "useHttps": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
                 "hostname": "pdp",
                 "port": 8081,
                 "userName": "testpdp",

diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index e63be9c..c9912ff 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -73,6 +73,7 @@ spec:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
       - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: framework-artifactbroker
         command: ["/opt/app/distribution/bin/artifact-dist.sh"]
         args: ["/opt/app/distribution/etc/mounted/config.json"]

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index b152af2..36cb701 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -18,7 +18,7 @@
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
+  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
 
 #################################################################
 # Application configuration defaults.
@@ -54,7 +54,7 @@ readiness:
 service:
   type: ClusterIP
   name: multicloud-k8s
-  portName: multicloud-k8s
+  portName: http
   internalPort: 9015
   externalPort: 9015
   nodePort: 98

diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index a802cb1..3174dae 100644 (file)
--- 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 7b606a5..4ed7a64 100644 (file)
--- 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

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
index 757041c..78373c8 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
@@ -53,7 +53,7 @@ persistence:
 service:
   type: ClusterIP
   name: multicloud-prometheus
-  portName: multicloud-prometheus
+  portName: http
   internalPort: 9090
   externalPort: 9090
 

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
index da0727c..ebc5384 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
@@ -5,7 +5,7 @@
         "port":9014,
         "userName":"healthcheck",
         "password":"zb!XztG34",
-        "https":true
+        "https":{{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
     },
     "receptionHandlerParameters":{
         "SDCReceptionHandler":{
@@ -27,7 +27,7 @@
         "sdcConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
             "parameters":{
-            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:8443",
+                "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
                 "messageBusAddress": [
                     "message-router.{{ include "common.namespace" . }}"
                  ],
@@ -53,7 +53,12 @@
                 "keystorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false
+                "isUseHttpsWithDmaap": false,
+                "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
+                "httpsproxyHost": "null",
+                "httpproxyHost": "null",
+                "httpsproxyPort": 8181,
+                "httpproxyPort": 8080
             }
         }
     },

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index 2524cd8..7f17806 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/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 }}"
@@ -79,7 +79,7 @@ spec:
           httpGet:
             path: /api/multicloud-starlingx/v0/swagger.json
             port: {{ .Values.service.internalPort }}
-            scheme: HTTPS
+            scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
           timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
index cf67f10..5c30c26 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
@@ -32,7 +32,7 @@ metadata:
       "url": "/api/multicloud-starlingx/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     },
     {
@@ -41,7 +41,7 @@ metadata:
       "url": "/api/multicloud-starlingx/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     }
     ]'

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index e59f34a..1232c3b 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -17,7 +17,7 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
+  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
 
 #################################################################
 # Application configuration defaults.
@@ -33,11 +33,12 @@ istioSidecar: false
 # application configuration
 config:
   ssl_enabled: true
-  msbprotocol: https
   msbgateway: msb-iag
   msbPort: 443
+  msbPlainPort: 80
   aai:
-    port: 8443
+    aaiPort: 8443
+    aaiPlainPort: 8080
     schemaVersion: v13
     username: AAI
     password: AAI

diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
index 1d27d6e..c5c368c 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
@@ -41,14 +41,16 @@ spec:
     spec:
      containers:
      - env:
+       - name: MSB_PROTO
+         value: "{{ if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
        - name: MSB_ADDR
-         value: "{{ .Values.config.msbgateway }}"
+         value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
        - name: MSB_PORT
-         value: "{{ .Values.config.msbPort }}.{{ include "common.namespace" . }}"
+         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

diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/kubernetes/multicloud/components/multicloud-vio/values.yaml
index 17643ba..3b852df 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/values.yaml
@@ -23,7 +23,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/vio:1.4.1
+image: onap/multicloud/vio:1.4.2
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -32,9 +32,11 @@ istioSidecar: true
 # application configuration
 config:
   msbgateway: msb-iag
-  msbPort: 80
+  msbPort: 443
+  msbPlainPort: 80
   aai:
-    port: 8443
+    aaiPort: 8443
+    aaiPlainPort: 8080
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -58,7 +60,7 @@ liveness:
 service:
   type: ClusterIP
   name: multicloud-vio
-  portName: multicloud-vio
+  portName: http
   externalPort: 9004
   internalPort: 9004
   nodePort: 92

diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
index 655076a..e346376 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
@@ -5,7 +5,7 @@
         "port":9014,
         "userName":"healthcheck",
         "password":"zb!XztG34",
-        "https":true
+        "https":{{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
     },
     "receptionHandlerParameters":{
         "SDCReceptionHandler":{
@@ -27,7 +27,7 @@
         "sdcConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
             "parameters":{
-            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:8443",
+                "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
                 "messageBusAddress": [
                     "message-router.{{ include "common.namespace" . }}"
                  ],
@@ -53,7 +53,12 @@
                 "keystorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false
+                "isUseHttpsWithDmaap": false,
+                "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
+                "httpsproxyHost": "null",
+                "httpproxyHost": "null",
+                "httpsproxyPort": 8181,
+                "httpproxyPort": 8080
             }
         }
     },

diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index 7656632..8eadcf6 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -50,15 +50,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
@@ -66,7 +66,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 }}"
@@ -88,7 +88,7 @@ spec:
           httpGet:
             path: /api/multicloud-titaniumcloud/v1/swagger.json
             port: {{ .Values.service.internalPort }}
-            scheme: HTTPS
+            scheme: {{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
           timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}

diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
index 5a555b3..f713067 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
@@ -33,7 +33,7 @@ metadata:
       "url": "/api/multicloud-titanium_cloud/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     },
     {
@@ -42,7 +42,7 @@ metadata:
       "url": "/api/multicloud-titaniumcloud/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     },
     {
@@ -51,7 +51,7 @@ metadata:
       "url": "/api/multicloud-titaniumcloud/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     }
     ]'

diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index 1a6527b..3380293 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
+  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
   persistence: {}
 
 #################################################################
@@ -34,11 +34,12 @@ istioSidecar: true
 # application configuration
 config:
   ssl_enabled: true
-  msbprotocol: https
   msbgateway: msb-iag
   msbPort: 443
+  msbPlainPort: 80
   aai:
-    port: 8443
+    aaiPort: 8443
+    aaiPlainPort: 8080
     schemaVersion: v13
     username: AAI
     password: AAI

diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 53716e5..ff9dac1 100644 (file)
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -40,15 +40,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" . }}
+         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" . }}"
        - 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
@@ -56,7 +56,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 }}"
        resources:
 {{ include "common.resources" . | indent 12 }}
        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
@@ -80,7 +80,7 @@ spec:
          httpGet:
            path: /api/multicloud/v0/swagger.json
            port: {{ .Values.service.internalPort }}
-           scheme: HTTPS
+           scheme: "{{ if (include "common.needTLS" .) }}HTTPS{{ else }}HTTP{{ end }}"
          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
          periodSeconds: {{ .Values.liveness.periodSeconds }}
          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}

diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index 3f950db..1c483b0 100644 (file)
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.portName }}
+  name: {{ .Values.service.name }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -33,7 +33,11 @@ metadata:
       "url": "/api/multicloud/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
+      {{if (include "common.needTLS" .) -}}
       "enable_ssl": {{ .Values.config.ssl_enabled }},
+      {{- else -}}
+      "enable_ssl": false,
+      {{- end}}
       "visualRange": "1"
     },
     {
@@ -42,7 +46,7 @@ metadata:
       "url": "/api/multicloud/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     }
     ]'

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 977de08..91dfa5c 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
+  artifactImage: onap/multicloud/framework-artifactbroker:1.8.1
   prometheus:
     enabled: false
   persistence: {}
@@ -28,7 +28,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/framework:1.7.3
+image: onap/multicloud/framework:1.8.1
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -57,13 +57,14 @@ multicloud-windriver:
 # application configuration
 config:
   ssl_enabled: true
-  msbprotocol: https
   msbgateway: msb-iag
-  msbPort: 443
   logstashServiceName: log-ls
   logstashPort: 5044
+  msbPort: 443
+  msbPlainPort: 80
   aai:
-    port: 8443
+    aaiPort: 8443
+    aaiPlainPort: 8080
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -87,7 +88,7 @@ liveness:
 service:
   type: ClusterIP
   name: multicloud
-  portName: multicloud-framework
+  portName: http
   externalPort: 9001
   internalPort: 9001
   nodePort: 91