Skip to content

K
k3s
Commit b5d92d6f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40508 from vjsamuel/master

Automatic merge from submit-queue Preventing nil pointer reference in client_config When a user tries to set the `extensions` map in the kube config, loading of the client config causes nil pointer exception because the `Context`, `Cluster`, `AuthInfo` objects are created without initializing the extensions map. This PR attempts to fix that.
parents 2e59a9cd f4289c51
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
View file @ b5d92d6f
...@@ -386,15 +386,15 @@ func (config *DirectClientConfig) getContext() (clientcmdapi.Context, error) { ...@@ -386,15 +386,15 @@ func (config *DirectClientConfig) getContext() (clientcmdapi.Context, error) {
contexts := config.config.Contexts contexts := config.config.Contexts
contextName, required := config.getContextName() contextName, required := config.getContextName()
var mergedContext clientcmdapi.Context mergedContext := clientcmdapi.NewContext()
if configContext, exists := contexts[contextName]; exists { if configContext, exists := contexts[contextName]; exists {
mergo.Merge(&mergedContext, configContext) mergo.Merge(mergedContext, configContext)
} else if required { } else if required {
return clientcmdapi.Context{}, fmt.Errorf("context %q does not exist", contextName) return clientcmdapi.Context{}, fmt.Errorf("context %q does not exist", contextName)
} }
mergo.Merge(&mergedContext, config.overrides.Context) mergo.Merge(mergedContext, config.overrides.Context)
return mergedContext, nil return *mergedContext, nil
} }
// getAuthInfo returns the clientcmdapi.AuthInfo, or an error if a required auth info is not found. // getAuthInfo returns the clientcmdapi.AuthInfo, or an error if a required auth info is not found.
...@@ -402,15 +402,15 @@ func (config *DirectClientConfig) getAuthInfo() (clientcmdapi.AuthInfo, error) { ...@@ -402,15 +402,15 @@ func (config *DirectClientConfig) getAuthInfo() (clientcmdapi.AuthInfo, error) {
authInfos := config.config.AuthInfos authInfos := config.config.AuthInfos
authInfoName, required := config.getAuthInfoName() authInfoName, required := config.getAuthInfoName()
var mergedAuthInfo clientcmdapi.AuthInfo mergedAuthInfo := clientcmdapi.NewAuthInfo()
if configAuthInfo, exists := authInfos[authInfoName]; exists { if configAuthInfo, exists := authInfos[authInfoName]; exists {
mergo.Merge(&mergedAuthInfo, configAuthInfo) mergo.Merge(mergedAuthInfo, configAuthInfo)
} else if required { } else if required {
return clientcmdapi.AuthInfo{}, fmt.Errorf("auth info %q does not exist", authInfoName) return clientcmdapi.AuthInfo{}, fmt.Errorf("auth info %q does not exist", authInfoName)
} }
mergo.Merge(&mergedAuthInfo, config.overrides.AuthInfo) mergo.Merge(mergedAuthInfo, config.overrides.AuthInfo)
return mergedAuthInfo, nil return *mergedAuthInfo, nil
} }
// getCluster returns the clientcmdapi.Cluster, or an error if a required cluster is not found. // getCluster returns the clientcmdapi.Cluster, or an error if a required cluster is not found.
...@@ -418,14 +418,14 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) { ...@@ -418,14 +418,14 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
clusterInfos := config.config.Clusters clusterInfos := config.config.Clusters
clusterInfoName, required := config.getClusterName() clusterInfoName, required := config.getClusterName()
var mergedClusterInfo clientcmdapi.Cluster mergedClusterInfo := clientcmdapi.NewCluster()
mergo.Merge(&mergedClusterInfo, config.overrides.ClusterDefaults) mergo.Merge(mergedClusterInfo, config.overrides.ClusterDefaults)
if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists { if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists {
mergo.Merge(&mergedClusterInfo, configClusterInfo) mergo.Merge(mergedClusterInfo, configClusterInfo)
} else if required { } else if required {
return clientcmdapi.Cluster{}, fmt.Errorf("cluster %q does not exist", clusterInfoName) return clientcmdapi.Cluster{}, fmt.Errorf("cluster %q does not exist", clusterInfoName)
} }
mergo.Merge(&mergedClusterInfo, config.overrides.ClusterInfo) mergo.Merge(mergedClusterInfo, config.overrides.ClusterInfo)
// An override of --insecure-skip-tls-verify=true and no accompanying CA/CA data should clear already-set CA/CA data // An override of --insecure-skip-tls-verify=true and no accompanying CA/CA data should clear already-set CA/CA data
// otherwise, a kubeconfig containing a CA reference would return an error that "CA and insecure-skip-tls-verify couldn't both be set" // otherwise, a kubeconfig containing a CA reference would return an error that "CA and insecure-skip-tls-verify couldn't both be set"
caLen := len(config.overrides.ClusterInfo.CertificateAuthority) caLen := len(config.overrides.ClusterInfo.CertificateAuthority)
...@@ -435,7 +435,7 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) { ...@@ -435,7 +435,7 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
mergedClusterInfo.CertificateAuthorityData = nil mergedClusterInfo.CertificateAuthorityData = nil
} }
return mergedClusterInfo, nil return *mergedClusterInfo, nil
} }
// inClusterClientConfig makes a config that will work from within a kubernetes cluster container environment. // inClusterClientConfig makes a config that will work from within a kubernetes cluster container environment.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment