diff options
Diffstat (limited to 'kubernetes/multicloud/components/multicloud-k8s')
3 files changed, 12 insertions, 6 deletions
diff --git a/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json b/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json index 2ce2d8564b..cf818798d4 100644 --- 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 e63be9c81c..c9912ffd17 100644 --- 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 b152af282e..36cb701a9b 100644 --- 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 |