Content-Length: 399474 | pFad | http://github.com/kubernetes/kubernetes/pull/131975/files

11 WIP: kubectl: Fix in-cluster config not loaded with certain flags specified by tchap · Pull Request #131975 · kubernetes/kubernetes · GitHub
Skip to content

WIP: kubectl: Fix in-cluster config not loaded with certain flags specified #131975

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: kubectl: Fix in-cluster config not loaded with certain flags specified #131975

Show file tree
Hide file tree
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
31 changes: 18 additions & 13 deletions staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ type DeferredLoadingClientConfig struct {
overrides *ConfigOverrides
fallbackReader io.Reader

clientConfig ClientConfig
loadingLock sync.Mutex
clientConfig ClientConfig
clientConfigNoOverrides ClientConfig
loadingLock sync.Mutex

// provided for testing
icc InClusterConfig
Expand All @@ -59,16 +60,16 @@ func NewInteractiveDeferredLoadingClientConfig(loader ClientConfigLoader, overri
return &DeferredLoadingClientConfig{loader: loader, overrides: overrides, icc: &inClusterClientConfig{overrides: overrides}, fallbackReader: fallbackReader}
}

func (config *DeferredLoadingClientConfig) createClientConfig() (ClientConfig, error) {
func (config *DeferredLoadingClientConfig) createClientConfig() (ClientConfig, ClientConfig, error) {
config.loadingLock.Lock()
defer config.loadingLock.Unlock()

if config.clientConfig != nil {
return config.clientConfig, nil
if config.clientConfig != nil && config.clientConfigNoOverrides != nil {
return config.clientConfig, config.clientConfigNoOverrides, nil
}
mergedConfig, err := config.loader.Load()
if err != nil {
return nil, err
return nil, nil, err
}

var currentContext string
Expand All @@ -80,11 +81,12 @@ func (config *DeferredLoadingClientConfig) createClientConfig() (ClientConfig, e
} else {
config.clientConfig = NewNonInteractiveClientConfig(*mergedConfig, currentContext, config.overrides, config.loader)
}
return config.clientConfig, nil
config.clientConfigNoOverrides = NewNonInteractiveClientConfig(*mergedConfig, "", nil, config.loader)
return config.clientConfig, config.clientConfigNoOverrides, nil
}

func (config *DeferredLoadingClientConfig) RawConfig() (clientcmdapi.Config, error) {
mergedConfig, err := config.createClientConfig()
mergedConfig, _, err := config.createClientConfig()
if err != nil {
return clientcmdapi.Config{}, err
}
Expand All @@ -94,7 +96,7 @@ func (config *DeferredLoadingClientConfig) RawConfig() (clientcmdapi.Config, err

// ClientConfig implements ClientConfig
func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, error) {
mergedClientConfig, err := config.createClientConfig()
mergedClientConfig, mergedClientConfigNoOverrides, err := config.createClientConfig()
if err != nil {
return nil, err
}
Expand All @@ -109,9 +111,12 @@ func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, e
return nil, err
}
case mergedConfig != nil:
// the configuration is valid, but if this is equal to the defaults we should try
// in-cluster configuration
if !config.loader.IsDefaultConfig(mergedConfig) {
mergedConfigNoOverrides, err := mergedClientConfigNoOverrides.ClientConfig()
if err != nil {
return mergedConfig, nil
}

if mergedConfigNoOverrides != nil && !config.loader.IsDefaultConfig(mergedConfigNoOverrides) {
return mergedConfig, nil
}
}
Expand All @@ -128,7 +133,7 @@ func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, e

// Namespace implements KubeConfig
func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) {
mergedKubeConfig, err := config.createClientConfig()
mergedKubeConfig, _, err := config.createClientConfig()
if err != nil {
return "", false, err
}
Expand Down
34 changes: 22 additions & 12 deletions staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ limitations under the License.
package clientcmd

import (
"errors"
"fmt"
"testing"

"github.com/google/go-cmp/cmp"

restclient "k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
Expand Down Expand Up @@ -195,17 +198,23 @@ func TestInClusterConfig(t *testing.T) {
}

for name, test := range testCases {
c := &DeferredLoadingClientConfig{icc: test.icc}
c.loader = &ClientConfigLoadingRules{DefaultClientConfig: test.defaultConfig}
c.clientConfig = test.clientConfig

cfg, err := c.ClientConfig()
if test.icc.called != test.checkedICC {
t.Errorf("%s: unexpected in-cluster-config call %t", name, test.icc.called)
}
if err != test.err || cfg != test.result {
t.Errorf("%s: unexpected result: %v %#v", name, err, cfg)
}
t.Run(name, func(t *testing.T) {
c := &DeferredLoadingClientConfig{icc: test.icc}
c.loader = &ClientConfigLoadingRules{DefaultClientConfig: test.defaultConfig}
c.clientConfig = test.clientConfig
c.clientConfigNoOverrides = test.clientConfig

cfg, err := c.ClientConfig()
if test.icc.called != test.checkedICC {
t.Errorf("Unexpected in-cluster-config call %t", test.icc.called)
}
if !errors.Is(err, test.err) {
t.Errorf("Unexpected error: %v", err)
}
if !cmp.Equal(cfg, test.result) {
t.Errorf("Unexpected result:\n%s", cmp.Diff(test.result, cfg))
}
})
}
}

Expand Down Expand Up @@ -328,12 +337,13 @@ func TestInClusterConfigNamespace(t *testing.T) {
t.Run(name, func(t *testing.T) {
c := &DeferredLoadingClientConfig{icc: test.icc, overrides: test.overrides}
c.clientConfig = test.clientConfig
c.clientConfigNoOverrides = test.clientConfig

ns, overridden, err := c.Namespace()
if test.icc.called != test.checkedICC {
t.Errorf("%s: unexpected in-cluster-config call %t", name, test.icc.called)
}
if err != test.err || ns != test.result || overridden != test.overridden {
if !errors.Is(err, test.err) || ns != test.result || overridden != test.overridden {
t.Errorf("%s: unexpected result: %v %s %t", name, err, ns, overridden)
}
})
Expand Down








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/kubernetes/kubernetes/pull/131975/files

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy