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 --- .../helmchartgenerator/chartbuilder/KeyValueMerger.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java') diff --git a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java index 8a28871..fe6ff32 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java @@ -78,6 +78,7 @@ public class KeyValueMerger { Map valuesYamlKv; try { valuesYamlKv = yaml.load(new FileInputStream(valuesYamlFilePath)); + changeNameOverrideUnderServiceAccount(valuesYamlKv, chartInfo); valuesYamlKv.putAll(chartInfo.getValues()); yaml.dump(valuesYamlKv, new PrintWriter(valuesYamlFilePath)); } catch (FileNotFoundException e) { @@ -85,6 +86,18 @@ public class KeyValueMerger { } } + private void changeNameOverrideUnderServiceAccount(Map valuesYamlKv, ChartInfo chartInfo) { + if(valuesYamlKv.containsKey("serviceAccount")){ + Map serviceAccount = (Map) valuesYamlKv.get("serviceAccount"); + if(serviceAccount.containsKey("nameOverride")){ + serviceAccount.put("nameOverride", chartInfo.getMetadata().getName()); + } + } + else{ + log.warn("No serviceAccount section found in the values.yaml file. Skipping nameOverride substitution."); + } + } + private void checkIfFIleExists(String filePath, String message) { File valuesYaml = new File(filePath); if (!valuesYaml.exists()) { -- cgit 1.2.3-korg