diff options
| author |   Tony Hansen <tony@att.com> | 2021-11-09 15:44:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-11-09 15:44:00 +0000 |
| commit | 505e40be9035ba6c979d5d1ccbff777ead3f2fbe (patch) | |
| tree | e8eaac611ce66096d0b74f9a3f9180fa52d62687 /mod2/helm-generator/helmchartgenerator-cli | |
| parent | c6f1b58aae6ecddeb4d2a615e017c625c7e29bfa (diff) | |
| parent | 14693baf122b5bb7d34a1d5bec8db32a8d88f4d7 (diff) | |
Merge "updated dependencies to 9.x-0 and added ServiceAccount.nameOverride substitution check in hemlchart generator"
Diffstat (limited to 'mod2/helm-generator/helmchartgenerator-cli')
3 files changed, 16 insertions, 7 deletions
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 |