Skip to content
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

Jump to bottom

Add: if the default value is not specified, looks for values.yaml in … #574

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add: if the default value is not specified, looks for values.yaml in … #574

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
15 changes: 15 additions & 0 deletions cmd/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"log"
"os"
"path/filepath"
"slices"
"strconv"
"strings"
Expand Down Expand Up @@ -212,6 +213,17 @@ func newChartCommand() *cobra.Command {

diff.release = args[0]
diff.chart = args[1]

// helm by default looks for values.yaml in the chart. See #566
// Looking for chart/values.yaml if valueFiles is empty
if len(diff.valueFiles) == 0 {
defaultValuePath := filepath.Join(diff.chart, "values.yaml")
_, err := os.Stat(defaultValuePath)
if !os.IsNotExist(err) {
diff.valueFiles = append(diff.valueFiles, defaultValuePath)
}
}

return diff.runHelm3()
},
FParseErrWhitelist: cobra.FParseErrWhitelist{
Expand All @@ -234,6 +246,9 @@ func newChartCommand() *cobra.Command {
// Support for kube-version was re-enabled and ported from helm2 to helm3 on https://github.com/helm/helm/pull/9040
f.StringVar(&diff.kubeVersion, "kube-version", "", "Kubernetes version used for Capabilities.KubeVersion")
f.VarP(&diff.valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
// Add string for the default value
defaultValueFiles := valueFiles{"CHART/values.yaml"}
f.Lookup("values").DefValue = defaultValueFiles.String()
f.StringArrayVar(&diff.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
f.StringArrayVar(&diff.stringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
f.StringArrayVar(&diff.jsonValues, "set-json", []string{}, "set JSON values on the command line (can specify multiple or separate values with commas: key1=jsonval1,key2=jsonval2)")
Expand Down
Loading