From 14693baf122b5bb7d34a1d5bec8db32a8d88f4d7 Mon Sep 17 00:00:00 2001 From: Dhrumin Desai Date: Mon, 8 Nov 2021 10:51:52 -0500 Subject: updated dependencies to 9.x-0 and added ServiceAccount.nameOverride substitution check in hemlchart generator Issue-ID: DCAEGEN2-2960 Change-Id: I8d0db7a5ad404df241ca01acbd419a9f10a84792 Signed-off-by: Dhrumin Desai --- .../src/test/input/blueprint/base/Chart.yaml | 15 +++++++++------ .../src/test/input/blueprint/base/values.yaml | 6 ++++++ .../HelmChartGeneratorApplicationTests.java | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'mod2/helm-generator/helmchartgenerator-cli/src/test') diff --git a/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/Chart.yaml b/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/Chart.yaml index 239978f..a7e98c1 100644 --- a/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/Chart.yaml +++ b/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/Chart.yaml @@ -15,25 +15,28 @@ # ============LICENSE_END========================================================= apiVersion: v2 -appVersion: "Honolulu" +appVersion: "Istanbul" description: TBD name: TBD version: TBD dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: readinessCheck - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: dcaegen2-services-common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: postgres - version: ~8.x-0 + version: ~9.x-0 repository: '@local' condition: postgres.enabled + - name: serviceAccount + version: ~9.x-0 + repository: '@local' diff --git a/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/values.yaml b/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/values.yaml index e83afd3..ea82bbe 100644 --- a/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/values.yaml +++ b/mod2/helm-generator/helmchartgenerator-cli/src/test/input/blueprint/base/values.yaml @@ -94,3 +94,9 @@ resources: cpu: 2 memory: 2Gi unlimited: {} + +serviceAccount: + nameOverride: TBD + roles: + - read + diff --git a/mod2/helm-generator/helmchartgenerator-cli/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/HelmChartGeneratorApplicationTests.java b/mod2/helm-generator/helmchartgenerator-cli/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/HelmChartGeneratorApplicationTests.java index 122a535..fa750fb 100644 --- a/mod2/helm-generator/helmchartgenerator-cli/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/HelmChartGeneratorApplicationTests.java +++ b/mod2/helm-generator/helmchartgenerator-cli/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/HelmChartGeneratorApplicationTests.java @@ -26,7 +26,7 @@ import org.springframework.test.context.junit.jupiter.DisabledIf; * Disabling the test as it is using 'helm' command from the local environment. */ @DisabledIf("true") -@SpringBootTest(args = {"src/test/input-new/specs/ves.json", "src/test/input-new/blueprint", "src/test/output/charts", "--distribute"}) +@SpringBootTest(args = {"src/test/input/specs/ves.json", "src/test/input/blueprint", "src/test/output/charts", "--distribute"}) class HelmChartGeneratorApplicationTests { @Test -- cgit 1.2.3-korg