summaryrefslogtreecommitdiffstats
path: root/src/k8splugin/internal/app/config_backend.go
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2021-10-25 22:21:16 +0200
committerLukasz Rajewski <lukasz.rajewski@orange.com>2021-10-25 22:21:16 +0200
commit3f0da55c0183e9da2f4658308dee1915338266aa (patch)
treec2b9b4ad06786e51bf9262cb3d0dfacad7ee9853 /src/k8splugin/internal/app/config_backend.go
parent6c28e5a7ca5a0688f5aefad010e0a3071ff6fe0b (diff)
Fix resolution of values for Config API0.9.3
Issue-ID: MULTICLOUD-1414 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Ibca5846ffe083bfc4d505c4c3c13efac2c6e2426
Diffstat (limited to 'src/k8splugin/internal/app/config_backend.go')
-rw-r--r--src/k8splugin/internal/app/config_backend.go64
1 files changed, 47 insertions, 17 deletions
diff --git a/src/k8splugin/internal/app/config_backend.go b/src/k8splugin/internal/app/config_backend.go
index 1f22922a..c365363f 100644
--- a/src/k8splugin/internal/app/config_backend.go
+++ b/src/k8splugin/internal/app/config_backend.go
@@ -461,7 +461,7 @@ func applyConfig(instanceID string, p Config, pChannel chan configResourceList,
return []helm.KubernetesResource{}, pkgerrors.Wrap(err, "Retrieving model info")
}
// Get Template and Resolve the template with values
- crl, err := resolve(rbName, rbVersion, profileName, p, releaseName)
+ crl, err := resolve(rbName, rbVersion, profileName, instanceID, p, releaseName)
if err != nil {
return []helm.KubernetesResource{}, pkgerrors.Wrap(err, "Resolve Config")
}
@@ -571,11 +571,12 @@ func scheduleResources(c chan configResourceList) {
//Resolve returns the path where the helm chart merged with
//configuration overrides resides.
-var resolve = func(rbName, rbVersion, profileName string, p Config, releaseName string) (configResourceList, error) {
+var resolve = func(rbName, rbVersion, profileName, instanceId string, p Config, releaseName string) (configResourceList, error) {
var resTemplates []helm.KubernetesResourceTemplate
- profile, err := rb.NewProfileClient().Get(rbName, rbVersion, profileName)
+ profileClient := rb.NewProfileClient()
+ profile, err := profileClient.Get(rbName, rbVersion, profileName)
if err != nil {
return configResourceList{}, pkgerrors.Wrap(err, "Reading Profile Data")
}
@@ -593,8 +594,42 @@ var resolve = func(rbName, rbVersion, profileName string, p Config, releaseName
return configResourceList{}, pkgerrors.Wrap(err, "Downloading Template")
}
+ ic := NewInstanceClient()
+ instance, err := ic.Get(instanceId)
+ if err != nil {
+ return configResourceList{}, pkgerrors.Wrap(err, "Getting Instance")
+ }
+
+ var finalReleaseName string
+
+ if releaseName == "" {
+ finalReleaseName = profile.ReleaseName
+ } else {
+ finalReleaseName = releaseName
+ }
+
+ helmClient := helm.NewTemplateClient(profile.KubernetesVersion,
+ profile.Namespace,
+ finalReleaseName)
+
+ //copy values from the instance
+ valuesArr := []string{}
+ if instance.Request.OverrideValues != nil {
+ for k, v := range instance.Request.OverrideValues {
+ valuesArr = append(valuesArr, k+"="+v)
+ }
+ }
+ valuesArr = append(valuesArr, "k8s-rb-instance-id="+instanceId)
+ rawValues, err := helmClient.ProcessValues([]string{}, valuesArr)
+ if err != nil {
+ return configResourceList{}, pkgerrors.Wrap(err, "Processing values")
+ }
+
+ for k, v := range p.Values {
+ rawValues[k] = v
+ }
//Create a temp file in the system temp folder for values input
- b, err := json.Marshal(p.Values)
+ b, err := json.Marshal(rawValues)
if err != nil {
return configResourceList{}, pkgerrors.Wrap(err, "Error Marshalling config data")
}
@@ -613,26 +648,21 @@ var resolve = func(rbName, rbVersion, profileName string, p Config, releaseName
}
defer outputfile.Close()
- chartBasePath, err := rb.ExtractTarBall(bytes.NewBuffer(def))
+ //Download and process the profile first
+ //If everything seems okay, then download the config templates
+ prYamlClient, err := profileClient.GetYamlClient(rbName, rbVersion, profileName)
if err != nil {
- return configResourceList{}, pkgerrors.Wrap(err, "Extracting Template")
+ return configResourceList{}, pkgerrors.Wrap(err, "Processing Profile Manifest")
}
- var finalReleaseName string
-
- if releaseName == "" {
- finalReleaseName = profile.ReleaseName
- } else {
- finalReleaseName = releaseName
+ chartBasePath, err := rb.ExtractTarBall(bytes.NewBuffer(def))
+ if err != nil {
+ return configResourceList{}, pkgerrors.Wrap(err, "Extracting Template")
}
- helmClient := helm.NewTemplateClient(profile.KubernetesVersion,
- profile.Namespace,
- finalReleaseName)
-
chartPath := filepath.Join(chartBasePath, t.ChartName)
resTemplates, crdList, _, err := helmClient.GenerateKubernetesArtifacts(chartPath,
- []string{outputfile.Name()},
+ []string{prYamlClient.GetValues(), outputfile.Name()},
nil)
if err != nil {
return configResourceList{}, pkgerrors.Wrap(err, "Generate final k8s yaml")