From c644ab480d2a764ee242cca14f96ea28a181bcad Mon Sep 17 00:00:00 2001 From: Rajamohan Raj Date: Tue, 31 Mar 2020 01:30:03 +0000 Subject: 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 Change-Id: Id4fddda69b5276b2409d835723b11367400ab6ea --- .../vnfs/comp-app/collection/app1/profile/override_values.yaml | 2 +- kud/tests/vnfs/comp-app/collection/app2/helm/prometheus/values.yaml | 6 +++++- .../vnfs/comp-app/collection/app2/profile/override_values.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'kud/tests/vnfs/comp-app') 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 -- cgit 1.2.3-korg