diff options
author | Dhrumin Desai <dd303q@att.com> | 2021-11-08 10:51:52 -0500 |
---|---|---|
committer | Dhrumin Desai <dd303q@att.com> | 2021-11-09 09:11:22 -0500 |
commit | 14693baf122b5bb7d34a1d5bec8db32a8d88f4d7 (patch) | |
tree | b6956a9ca88d92cf201c6f85d35d46650d0523f7 /mod2/helm-generator/helmchartgenerator-core/src/main | |
parent | f98abd8de6b9457a7edcd3457e664bd9200de2bf (diff) |
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 <dd303q@att.com>
Diffstat (limited to 'mod2/helm-generator/helmchartgenerator-core/src/main')
-rw-r--r-- | mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java | 13 |
1 files changed, 13 insertions, 0 deletions
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<String, Object> 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<String, Object> valuesYamlKv, ChartInfo chartInfo) { + if(valuesYamlKv.containsKey("serviceAccount")){ + Map<String,Object> serviceAccount = (Map<String, Object>) 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()) { |