summaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
authorRajamohan Raj <rajamohan.raj@intel.com>2020-03-31 01:30:03 +0000
committerRajamohan Raj <rajamohan.raj@intel.com>2020-04-11 00:51:20 +0000
commitc644ab480d2a764ee242cca14f96ea28a181bcad (patch)
tree02f9e0bdc96110e26188878b34bd1ce6802e4ecb /kud
parent335c7cca38eb804c2977e4dd9af9efa0ea7ef82b (diff)
Resolve the helm templates
Resolving the helm templates for each of the apps in the compositeApp by utilizing the helm libraries and thus getting the sorted templates with all values rendered. This is a subtask of adding instantiation APIs. Issue-ID: MULTICLOUD-1041 Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com> Change-Id: Id4fddda69b5276b2409d835723b11367400ab6ea
Diffstat (limited to 'kud')
-rwxr-xr-xkud/tests/plugin_collection_v2.sh12
-rw-r--r--kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml2
-rw-r--r--kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml6
-rw-r--r--kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml2
4 files changed, 16 insertions, 6 deletions
diff --git a/kud/tests/plugin_collection_v2.sh b/kud/tests/plugin_collection_v2.sh
index 068864d7..5af4c00b 100755
--- a/kud/tests/plugin_collection_v2.sh
+++ b/kud/tests/plugin_collection_v2.sh
@@ -71,6 +71,7 @@ clusterLabelName2="east-us2"
deploymentIntentGroupName="test_deployment_intent_group"
deploymentIntentGroupNameDesc="test_deployment_intent_group_desc"
+releaseName="test"
chart_name="edgex"
profile_name="test_profile"
@@ -344,20 +345,20 @@ payload="$(cat <<EOF
},
"spec":{
"profile":"${main_composite_profile_name}",
- "version":"${composite_app_version}",
+ "version":"${releaseName}",
"override-values":[
{
"app-name":"${app1_name}",
"values":
{
- "imageRepository":"registry.hub.docker.com"
+ "collectd_prometheus.service.name":"collectd-override-by-set-value"
}
},
{
"app-name":"${app2_name}",
"values":
{
- "imageRepository":"registry.hub.docker.com"
+ "service.name":"Prometheus-override-by-set-value"
}
}
]
@@ -390,3 +391,8 @@ EOF
call_api -d "${payload}" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/intents"
# END: Adding intents to an intent group
+#BEGIN: Instantiation
+print_msg "Getting the sorted templates for each of the apps.."
+call_api -d "" "${base_url}/projects/${project_name}/composite-apps/${composite_app_name}/${composite_app_version}/deployment-intent-groups/${deploymentIntentGroupName}/instantiate"
+# END: Instantiation
+
diff --git a/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml b/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml
index 304ae5de..3a99b73b 100644
--- a/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml
+++ b/kud/tests/vnfs/comp-app/collection/app1/profile/override_values.yaml
@@ -1,7 +1,7 @@
collectd_prometheus:
service:
type: ClusterIP
- name: collectd-override
+ name: collectd-override-by-file
port: 9103
targetPort: 9103
selector:
diff --git a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml
index e35c6735..19bf0477 100644
--- a/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml
+++ b/kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml
@@ -37,10 +37,11 @@ prometheus:
- port: cadvisor-prometheus
interval: 10s
path: /metrics
-
+
resources: {}
service:
type: ClusterIP
+ name: Prometheus-value-file
annotations: {}
labels: {}
clusterIP: ""
@@ -67,3 +68,6 @@ prometheus:
#type: NodePort
sessionAffinity: ""
+
+global:
+ imagePullSecrets: "" \ No newline at end of file
diff --git a/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml b/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml
index 6743ac5b..ec551668 100644
--- a/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml
+++ b/kud/tests/vnfs/comp-app/collection/app2/profile/override_values.yaml
@@ -1,6 +1,6 @@
service:
type: ClusterIP
- name: Prometheus
+ name: Prometheus-override-by-file
annotations: {}
labels: {}
clusterIP: "" \ No newline at end of file