[fix] inject module registry to values (#667)

Signed-off-by: Stepan Paksashvili <stepan.paksashvili@flant.com>

Author: ipaqsa

pkg/module_manager/models/modules/values_storage.go

@@ -44,6 +44,7 @@ type ValuesStorage struct {
 	// result of the merging all input values
 	resultValues utils.Values
 }
+
 type Registry struct {
 	Base      string `json:"base" yaml:"base"`
 	DockerCfg string `json:"dockercfg" yaml:"dockercfg"`
@@ -183,9 +184,18 @@ func (vs *ValuesStorage) InjectRegistryValue(registry *Registry) {
 	vs.lock.Lock()
 	defer vs.lock.Unlock()
 
-	vs.schemaStorage.InjectRegistrySpec()
+	// inject spec to values schema
+	vs.schemaStorage.InjectRegistrySpec(validation.ValuesSchema)
+	// inject spec to helm schema
+	vs.schemaStorage.InjectRegistrySpec(validation.HelmValuesSchema)
+
+	if vs.staticValues == nil {
+		vs.staticValues = utils.Values{}
+	}
+
+	vs.staticValues["registry"] = registry
 
-	vs.resultValues["registry"] = registry
+	_ = vs.calculateResultValues()
 }
 
 // GetConfigValues returns only user defined values

pkg/values/validation/schemas.go

@@ -161,12 +161,16 @@ func validateObject(dataObj interface{}, s *spec.Schema, rootName string) error
 }
 
 // InjectRegistrySpec mutates the module schema to add a strict-typed "registry" field
-func (st *SchemaStorage) InjectRegistrySpec() {
-	scheme := st.Schemas[ValuesSchema]
-	if scheme == nil || len(scheme.Properties) == 0 {
+func (st *SchemaStorage) InjectRegistrySpec(schemaType SchemaType) {
+	scheme := st.Schemas[schemaType]
+	if scheme == nil {
 		return
 	}
 
+	if len(scheme.Properties) == 0 {
+		scheme.Properties = make(map[string]spec.Schema)
+	}
+
 	scheme.Properties["registry"] = spec.Schema{
 		SchemaProps: spec.SchemaProps{
 			Type:                 spec.StringOrArray{"object"},