Skip to content

Fix values bug #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RottenRat wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix values bug #716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions pkg/module_manager/models/modules/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ const (
helmModuleServiceName = "helm-module"
)

type globalValuesGetter interface {
GetValues(bool) utils.Values
}

// HelmModule representation of the module, which has Helm Chart and could be installed with the helm lib
type HelmModule struct {
// Name of the module
Expand All @@ -49,6 +53,8 @@ type HelmModule struct {
dependencies *HelmModuleDependencies
validator HelmValuesValidator

globalValuesGetter globalValuesGetter

logger *log.Logger

additionalLabels map[string]string
Expand Down Expand Up @@ -93,14 +99,15 @@ func NewHelmModule(bm *BasicModule, namespace string, tmpDir string, deps *HelmM
}

hm := &HelmModule{
name: bm.GetName(),
defaultNamespace: namespace,
path: bm.Path,
values: chartValues,
tmpDir: tmpDir,
dependencies: deps,
validator: validator,
additionalLabels: additionalLabels,
name: bm.GetName(),
defaultNamespace: namespace,
path: bm.Path,
values: chartValues,
tmpDir: tmpDir,
dependencies: deps,
validator: validator,
globalValuesGetter: bm.dc.GlobalValuesGetter,
additionalLabels: additionalLabels,
}

for _, opt := range opts {
Expand Down Expand Up @@ -396,7 +403,13 @@ func (hm *HelmModule) shouldRunHelmUpgrade(helmClient client.HelmClient, release
}

func (hm *HelmModule) PrepareValuesYamlFile() (string, error) {
data, err := hm.values.YamlBytes()
chartValues := map[string]interface{}{
"global": hm.globalValuesGetter.GetValues(false),
utils.ModuleNameToValuesKey(hm.name): hm.values[utils.ModuleNameToValuesKey(hm.name)],
}
values := utils.Values(chartValues)

data, err := values.YamlBytes()
if err != nil {
return "", err
}
Expand All @@ -409,7 +422,7 @@ func (hm *HelmModule) PrepareValuesYamlFile() (string, error) {

hm.logger.Debug("Prepared module helm values info",
slog.String("moduleName", hm.name),
slog.String("values", hm.values.DebugString()))
slog.String("values", values.DebugString()))

return path, nil
}
Expand Down
Loading