public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #383. Deprecated `context` directive in favor of helmDefaults.kubeContext (#401)

This commit is contained in:
Anatoly Rugalev 2018-11-22 06:39:03 +03:00 committed by KUOKA Yusuke
parent b3e27db8b3
commit b41b44c313
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -970,11 +970,11 @@ func (a *app) loadDesiredStateFromYaml(yaml []byte, file string, namespace strin
} }
if a.kubeContext != "" { if a.kubeContext != "" {
if st.Context != "" { if st.HelmDefaults.KubeContext != "" {
log.Printf("err: Cannot use option --kube-context and set attribute context.") log.Printf("err: Cannot use option --kube-context and set attribute helmDefaults.kubeContext.")
os.Exit(1) os.Exit(1)
} }
st.Context = a.kubeContext st.HelmDefaults.KubeContext = a.kubeContext
} }
if namespace != "" { if namespace != "" {
if st.Namespace != "" { if st.Namespace != "" {

4
state/create.go
View File

@ -101,6 +101,10 @@ func (c *creator) CreateFromYaml(content []byte, file string, env string) (*Helm
state.DeprecatedReleases = []ReleaseSpec{} state.DeprecatedReleases = []ReleaseSpec{}
} }
if state.DeprecatedContext != "" && state.HelmDefaults.KubeContext == "" {
state.HelmDefaults.KubeContext = state.DeprecatedContext
}
state.logger = c.logger state.logger = c.logger
e, err := state.loadEnv(env, c.readFile) e, err := state.loadEnv(env, c.readFile)

2
state/state.go
View File

@ -32,7 +32,7 @@ type HelmState struct {
FilePath string FilePath string
HelmDefaults HelmSpec `yaml:"helmDefaults"` HelmDefaults HelmSpec `yaml:"helmDefaults"`
Helmfiles []string `yaml:"helmfiles"` Helmfiles []string `yaml:"helmfiles"`
Context string `yaml:"context"` DeprecatedContext string `yaml:"context"`
DeprecatedReleases []ReleaseSpec `yaml:"charts"` DeprecatedReleases []ReleaseSpec `yaml:"charts"`
Namespace string `yaml:"namespace"` Namespace string `yaml:"namespace"`
Repositories []RepositorySpec `yaml:"repositories"` Repositories []RepositorySpec `yaml:"repositories"`

10
state/state_test.go
View File

@ -116,7 +116,7 @@ func TestHelmState_applyDefaultsTo(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
state := &HelmState{ state := &HelmState{
basePath: tt.fields.BaseChartPath, basePath: tt.fields.BaseChartPath,
Context: tt.fields.Context, DeprecatedContext: tt.fields.Context,
DeprecatedReleases: tt.fields.DeprecatedReleases, DeprecatedReleases: tt.fields.DeprecatedReleases,
Namespace: tt.fields.Namespace, Namespace: tt.fields.Namespace,
Repositories: tt.fields.Repositories, Repositories: tt.fields.Repositories,
@ -380,10 +380,10 @@ func TestHelmState_flagsForUpgrade(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
state := &HelmState{ state := &HelmState{
basePath: "./", basePath: "./",
Context: "default", DeprecatedContext: "default",
Releases: []ReleaseSpec{*tt.release}, Releases: []ReleaseSpec{*tt.release},
HelmDefaults: tt.defaults, HelmDefaults: tt.defaults,
} }
helm := helmexec.New(logger, "default") helm := helmexec.New(logger, "default")
args, err := state.flagsForUpgrade(helm, tt.release) args, err := state.flagsForUpgrade(helm, tt.release)