Skip to content

fix: config_context and proxy_url ignored when config_path is not set #1781

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

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

fix: config_context and proxy_url ignored when config_path is not set #1781

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
25 changes: 17 additions & 8 deletions helm/kubeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,23 @@ func (m *Meta) NewKubeConfig(ctx context.Context, namespace string) (*KubeConfig
} else {
loader.Precedence = expandedPaths
}
}

// Check ConfigContext
if !kubernetesConfig.ConfigContext.IsNull() {
overrides.CurrentContext = kubernetesConfig.ConfigContext.ValueString()
// Context overrides apply regardless of whether an explicit config_path is set,
// so that users can switch context on the default kubeconfig without specifying a path.
if !kubernetesConfig.ConfigContext.IsNull() {
if v := kubernetesConfig.ConfigContext.ValueString(); v != "" {
overrides.CurrentContext = v
}
if !kubernetesConfig.ConfigContextAuthInfo.IsNull() {
overrides.Context.AuthInfo = kubernetesConfig.ConfigContextAuthInfo.ValueString()
}
if !kubernetesConfig.ConfigContextAuthInfo.IsNull() {
if v := kubernetesConfig.ConfigContextAuthInfo.ValueString(); v != "" {
overrides.Context.AuthInfo = v
}
if !kubernetesConfig.ConfigContextCluster.IsNull() {
overrides.Context.Cluster = kubernetesConfig.ConfigContextCluster.ValueString()
}
if !kubernetesConfig.ConfigContextCluster.IsNull() {
if v := kubernetesConfig.ConfigContextCluster.ValueString(); v != "" {
overrides.Context.Cluster = v
}
}

Expand Down Expand Up @@ -185,7 +192,9 @@ func (m *Meta) NewKubeConfig(ctx context.Context, namespace string) (*KubeConfig
overrides.AuthInfo.Token = kubernetesConfig.Token.ValueString()
}
if !kubernetesConfig.ProxyURL.IsNull() {
overrides.ClusterDefaults.ProxyURL = kubernetesConfig.ProxyURL.ValueString()
if v := kubernetesConfig.ProxyURL.ValueString(); v != "" {
overrides.ClusterInfo.ProxyURL = v
}
}

if kubernetesConfig.Exec != nil {
Expand Down
Loading