summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Xu <yang.xu3@huawei.com>2019-05-25 01:58:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-25 01:58:18 +0000
commit8aad0bbda98e98b5a9688cd0ccba79b62298a817 (patch)
treecb2bbf8b6335515193096348f5b875a332c2a33e
parent22726b5728a5ce4559e0cdc35830f61f3858e392 (diff)
parent80f587ac27c3dfc4f4ee4509f140d080b6e65583 (diff)
Merge "update artifactbroker for multicloud plugins"
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json75
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml16
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/values.yaml5
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json41
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json41
-rw-r--r--kubernetes/multicloud/values.yaml2
6 files changed, 140 insertions, 40 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json
new file mode 100644
index 0000000000..ebec0adc6f
--- /dev/null
+++ b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json
@@ -0,0 +1,75 @@
+{
+ "name":"SDCDistributionGroup",
+ "restServerParameters":{
+ "host":"0.0.0.0",
+ "port":9014,
+ "userName":"healthcheck",
+ "password":"zb!XztG34",
+ "https":true
+ },
+ "receptionHandlerParameters":{
+ "SDCReceptionHandler":{
+ "receptionHandlerType":"SDC",
+ "receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandler",
+ "receptionHandlerConfigurationName":"sdcConfiguration",
+ "pluginHandlerParameters":{
+ "artifactForwarders":{
+ "PAPEngineForwarder":{
+ "forwarderType":"PAPEngine",
+ "forwarderClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder",
+ "forwarderConfigurationName": "k8sConfiguration"
+ }
+ }
+ }
+ }
+ },
+ "receptionHandlerConfigurationParameters":{
+ "sdcConfiguration":{
+ "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
+ "parameters":{
+ "asdcAddress": "sdc-be:8443",
+ "messageBusAddress": [
+ "message-router"
+ ],
+ "user": "multicloud",
+ "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
+ "pollingInterval":20,
+ "pollingTimeout":30,
+ "consumerId": "multicloud-k8s-id",
+ "artifactTypes": [
+ "TOSCA_CSAR",
+ "HEAT",
+ "HEAT_ARTIFACT",
+ "HEAT_ENV",
+ "HEAT_NESTED",
+ "HEAT_VOL",
+ "OTHER",
+ "VF_MODULES_METADATA",
+ "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"
+ ],
+ "consumerGroup": "multicloud-k8s-group",
+ "environmentName": "AUTO",
+ "keystorePath": "null",
+ "keystorePassword": "null",
+ "activeserverTlsAuth": false,
+ "isFilterinEmptyResources": true,
+ "isUseHttpsWithDmaap": false
+ }
+ }
+ },
+ "artifactForwarderConfigurationParameters":{
+ "k8sConfiguration":{
+ "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup",
+ "parameters":{
+ "useHttps": true,
+ "hostname": "pdp",
+ "port": 8081,
+ "userName": "testpdp",
+ "password": "alpha123",
+ "clientAuth": "cHl0aG9uOnRlc3Q=",
+ "isManaged": true,
+ "pdpGroup": "default"
+ }
+ }
+ }
+}
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
index 846a751336..b8e0e5c3ac 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
@@ -69,6 +69,20 @@ spec:
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
+ - image: "{{ include "common.repository" . }}/{{ .Values.global.artifactImage }}"
+ name: framework-artifactbroker
+ command: ["/opt/app/distribution/bin/artifact-dist.sh"]
+ args: ["/opt/app/distribution/etc/mounted/config.json"]
+ ports:
+ - containerPort: {{ .Values.artifactbroker.internalPort }}
+ protocol: TCP
+ volumeMounts:
+ - mountPath: /opt/app/distribution/etc/mounted/config.json
+ name: {{ include "common.name" .}}
+ subPath: config.json
+ - mountPath: /data
+ name: artifact-data
+
volumes:
- name: localtime
hostPath:
@@ -76,5 +90,7 @@ spec:
- name : {{ include "common.name" . }}
configMap:
name: {{ include "common.fullname" . }}
+ - name: artifact-data
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
index 22ddd17ead..14f9b58030 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
@@ -27,7 +27,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/k8s:0.1.0
+image: onap/multicloud/k8s:0.2.0
pullPolicy: Always
# flag to enable debugging - application support required
@@ -96,6 +96,9 @@ persistence:
ingress:
enabled: false
+artifactbroker:
+ internalPort: 9014
+
# Configure resource requests and limits
flavor: large
resources:
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json b/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json
index d62fec6d85..7ca5251d40 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json
@@ -11,13 +11,13 @@
"SDCReceptionHandler":{
"receptionHandlerType":"SDC",
"receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandler",
- "receptionHandlerConfigurationName":"sdcConfiguration",
+ "receptionHandlerConfigurationName":"sdcConfiguration",
"pluginHandlerParameters":{
"artifactForwarders":{
- "PAPEngineForwarder":{
- "forwarderType":"PAPEngine",
- "forwarderClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder",
- "forwarderConfigurationName": "k8sConfiguration"
+ "DummyForwarder":{
+ "forwarderType":"DummyForwarder",
+ "forwarderClassName":"org.onap.policy.distribution.main.testclasses.DummyArtifactForwarder",
+ "forwarderConfigurationParameters": "dummyConfiguration"
}
}
}
@@ -27,43 +27,46 @@
"sdcConfiguration":{
"parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
"parameters":{
- "asdcAddress": "sdc-be:8443",
+ "asdcAddress": "sdc-be:8443",
"messageBusAddress": [
"message-router"
],
- "user": "policy",
+ "user": "multicloud",
"password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
"pollingInterval":20,
"pollingTimeout":30,
- "consumerId": "policy-id",
+ "consumerId": "multicloud-starlingx-id",
"artifactTypes": [
"TOSCA_CSAR",
"HEAT",
+ "HEAT_ARTIFACT",
"HEAT_ENV",
+ "HEAT_NESTED",
+ "HEAT_VOL",
+ "OTHER",
+ "VF_MODULES_METADATA",
"CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"
],
- "consumerGroup": "policy-group",
+ "consumerGroup": "multicloud-starlingx-group",
"environmentName": "AUTO",
"keystorePath": "null",
"keystorePassword": "null",
"activeserverTlsAuth": false,
"isFilterinEmptyResources": true,
"isUseHttpsWithDmaap": false
- }
+ }
}
},
"artifactForwarderConfigurationParameters":{
- "k8sConfiguration":{
- "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup",
+ "dummyConfiguration":{
+ "parameterClassName":"org.onap.policy.distribution.main.testclasses.DummyArtifactForwarderParameterGroup",
"parameters":{
- "useHttps": true,
- "hostname": "pdp",
+ "useHttps": false,
+ "hostname": "null",
"port": 8081,
- "userName": "testpdp",
- "password": "alpha123",
- "clientAuth": "cHl0aG9uOnRlc3Q=",
- "isManaged": true,
- "pdpGroup": "default"
+ "userName": "null",
+ "password": "null",
+ "isManaged": true
}
}
}
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json b/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json
index d62fec6d85..0647844a7c 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json
+++ b/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json
@@ -11,13 +11,13 @@
"SDCReceptionHandler":{
"receptionHandlerType":"SDC",
"receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandler",
- "receptionHandlerConfigurationName":"sdcConfiguration",
+ "receptionHandlerConfigurationName":"sdcConfiguration",
"pluginHandlerParameters":{
"artifactForwarders":{
- "PAPEngineForwarder":{
- "forwarderType":"PAPEngine",
- "forwarderClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder",
- "forwarderConfigurationName": "k8sConfiguration"
+ "DummyForwarder":{
+ "forwarderType":"DummyForwarder",
+ "forwarderClassName":"org.onap.policy.distribution.main.testclasses.DummyArtifactForwarder",
+ "forwarderConfigurationParameters": "dummyConfiguration"
}
}
}
@@ -27,43 +27,46 @@
"sdcConfiguration":{
"parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
"parameters":{
- "asdcAddress": "sdc-be:8443",
+ "asdcAddress": "sdc-be:8443",
"messageBusAddress": [
"message-router"
],
- "user": "policy",
+ "user": "multicloud",
"password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
"pollingInterval":20,
"pollingTimeout":30,
- "consumerId": "policy-id",
+ "consumerId": "multicloud-windriver-id",
"artifactTypes": [
"TOSCA_CSAR",
"HEAT",
+ "HEAT_ARTIFACT",
"HEAT_ENV",
+ "HEAT_NESTED",
+ "HEAT_VOL",
+ "OTHER",
+ "VF_MODULES_METADATA",
"CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"
],
- "consumerGroup": "policy-group",
+ "consumerGroup": "multicloud-windriver-group",
"environmentName": "AUTO",
"keystorePath": "null",
"keystorePassword": "null",
"activeserverTlsAuth": false,
"isFilterinEmptyResources": true,
"isUseHttpsWithDmaap": false
- }
+ }
}
},
"artifactForwarderConfigurationParameters":{
- "k8sConfiguration":{
- "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup",
+ "dummyConfiguration":{
+ "parameterClassName":"org.onap.policy.distribution.main.testclasses.DummyArtifactForwarderParameterGroup",
"parameters":{
- "useHttps": true,
- "hostname": "pdp",
+ "useHttps": false,
+ "hostname": "null",
"port": 8081,
- "userName": "testpdp",
- "password": "alpha123",
- "clientAuth": "cHl0aG9uOnRlc3Q=",
- "isManaged": true,
- "pdpGroup": "default"
+ "userName": "null",
+ "password": "null",
+ "isManaged": true
}
}
}
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index fdb4d9be27..d72b1a2b51 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -20,7 +20,7 @@ global:
nodePortPrefix: 302
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
- artifactImage: onap/multicloud/framework-artifactbroker:1.3.1
+ artifactImage: onap/multicloud/framework-artifactbroker:1.3.3
prometheus:
enabled: false