From b1b7831a9056cb06527fb9e483348f7157934bde Mon Sep 17 00:00:00 2001 From: astorath Date: Tue, 30 Mar 2021 10:53:19 +0300 Subject: [PATCH] feat: make --kube-context override helmDefaults (#1673) This would allow cli flag `--kube-context` to override value in helmDefaults allowing to use different values in local development and CI context. Co-authored-by: Andrey Tuzhilin --- pkg/app/desired_state_file_loader.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/app/desired_state_file_loader.go b/pkg/app/desired_state_file_loader.go index 401228eb..c106d80d 100644 --- a/pkg/app/desired_state_file_loader.go +++ b/pkg/app/desired_state_file_loader.go @@ -72,9 +72,6 @@ func (ld *desiredStateLoader) Load(f string, opts LoadOpts) (*state.HelmState, e } if ld.overrideKubeContext != "" { - if st.HelmDefaults.KubeContext != "" { - return nil, errors.New("err: Cannot use option --kube-context and set attribute helmDefaults.kubeContext.") - } st.HelmDefaults.KubeContext = ld.overrideKubeContext }