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-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java | |
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-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/KeyValueMerger.java')
-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()) { |