diff options
| author |   KAPIL SINGAL <ks220y@att.com> | 2021-04-11 01:41:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-04-11 01:41:01 +0000 |
| commit | a77e4502d0fc7f899cd0b89bcd874d270d1c55e7 (patch) | |
| tree | fb01a00bff63a16836cdc5d9599c9caa7cdda5d8 | |
| parent | 2ae58f64353043198762ca42a8b364be142ffa6b (diff) | |
| parent | 5d9ac2bf09f44885df819d5182ba48c37be66ac6 (diff) | |
Merge "Fixed templating of values in k8s components"
3 files changed, 3 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt index 5e853d05f..80531b13d 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt @@ -355,7 +355,7 @@ open class K8sProfileUploadComponent( val fileContent = templatedFile.bufferedReader().readText() val finalFileContent = BlueprintVelocityTemplateService.generateContent( fileContent, - params, true + params.toString(), true ) if (!destinationFolder.exists()) Files.createDirectories(destinationFolder.toPath()) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigTemplateComponent.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigTemplateComponent.kt index 87a4d4e27..ceb4e80e7 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigTemplateComponent.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigTemplateComponent.kt @@ -258,7 +258,7 @@ open class K8sConfigTemplateComponent( val fileContent = templateFile.bufferedReader().readText() val finalFileContent = BlueprintVelocityTemplateService.generateContent( fileContent, - params, true + params.toString(), true ) if (!destinationFolder.exists()) Files.createDirectories(destinationFolder.toPath()) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigValueComponent.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigValueComponent.kt index ba145cd9c..7a487f205 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigValueComponent.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sConfigValueComponent.kt @@ -227,7 +227,7 @@ open class K8sConfigValueComponent( val fileContent = templateFile.bufferedReader().readText() return BlueprintVelocityTemplateService.generateContent( fileContent, - params, true + params.toString(), true ) } |