48b4d6d30c
By removing the default "localhost:8080" behavior several paths in client config began returning err == ErrEmptyConfig rather than err == nil. The code checking for in cluster config was wrong - the logic should be: 1. If loading the underlying config returns a non-empty error, fail 2. If the underlying config is not equal to the default config, return that config (it's got user input) 3. If it is possible to use in cluster config, do so 4. Otherwise return the default config (and or default EmptyConfig error).
144 lines
4.9 KiB
Go
144 lines
4.9 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package clientcmd
|
|
|
|
import (
|
|
"io"
|
|
"reflect"
|
|
"sync"
|
|
|
|
"k8s.io/kubernetes/pkg/client/restclient"
|
|
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
|
|
)
|
|
|
|
// DeferredLoadingClientConfig is a ClientConfig interface that is backed by a client config loader.
|
|
// It is used in cases where the loading rules may change after you've instantiated them and you want to be sure that
|
|
// the most recent rules are used. This is useful in cases where you bind flags to loading rule parameters before
|
|
// the parse happens and you want your calling code to be ignorant of how the values are being mutated to avoid
|
|
// passing extraneous information down a call stack
|
|
type DeferredLoadingClientConfig struct {
|
|
loader ClientConfigLoader
|
|
overrides *ConfigOverrides
|
|
fallbackReader io.Reader
|
|
|
|
clientConfig ClientConfig
|
|
loadingLock sync.Mutex
|
|
|
|
// provided for testing
|
|
icc InClusterConfig
|
|
}
|
|
|
|
// InClusterConfig abstracts details of whether the client is running in a cluster for testing.
|
|
type InClusterConfig interface {
|
|
ClientConfig
|
|
Possible() bool
|
|
}
|
|
|
|
// NewNonInteractiveDeferredLoadingClientConfig creates a ConfigClientClientConfig using the passed context name
|
|
func NewNonInteractiveDeferredLoadingClientConfig(loader ClientConfigLoader, overrides *ConfigOverrides) ClientConfig {
|
|
return &DeferredLoadingClientConfig{loader: loader, overrides: overrides, icc: inClusterClientConfig{}}
|
|
}
|
|
|
|
// NewInteractiveDeferredLoadingClientConfig creates a ConfigClientClientConfig using the passed context name and the fallback auth reader
|
|
func NewInteractiveDeferredLoadingClientConfig(loader ClientConfigLoader, overrides *ConfigOverrides, fallbackReader io.Reader) ClientConfig {
|
|
return &DeferredLoadingClientConfig{loader: loader, overrides: overrides, icc: inClusterClientConfig{}, fallbackReader: fallbackReader}
|
|
}
|
|
|
|
func (config *DeferredLoadingClientConfig) createClientConfig() (ClientConfig, error) {
|
|
if config.clientConfig == nil {
|
|
config.loadingLock.Lock()
|
|
defer config.loadingLock.Unlock()
|
|
|
|
if config.clientConfig == nil {
|
|
mergedConfig, err := config.loader.Load()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var mergedClientConfig ClientConfig
|
|
if config.fallbackReader != nil {
|
|
mergedClientConfig = NewInteractiveClientConfig(*mergedConfig, config.overrides.CurrentContext, config.overrides, config.fallbackReader, config.loader)
|
|
} else {
|
|
mergedClientConfig = NewNonInteractiveClientConfig(*mergedConfig, config.overrides.CurrentContext, config.overrides, config.loader)
|
|
}
|
|
|
|
config.clientConfig = mergedClientConfig
|
|
}
|
|
}
|
|
|
|
return config.clientConfig, nil
|
|
}
|
|
|
|
func (config *DeferredLoadingClientConfig) RawConfig() (clientcmdapi.Config, error) {
|
|
mergedConfig, err := config.createClientConfig()
|
|
if err != nil {
|
|
return clientcmdapi.Config{}, err
|
|
}
|
|
|
|
return mergedConfig.RawConfig()
|
|
}
|
|
|
|
// ClientConfig implements ClientConfig
|
|
func (config *DeferredLoadingClientConfig) ClientConfig() (*restclient.Config, error) {
|
|
mergedClientConfig, err := config.createClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// load the configuration and return on non-empty errors and if the
|
|
// content differs from the default config
|
|
mergedConfig, err := mergedClientConfig.ClientConfig()
|
|
switch {
|
|
case err != nil && !IsEmptyConfig(err):
|
|
// return on any error except empty config
|
|
return nil, err
|
|
case mergedConfig != nil:
|
|
// if the configuration has any settings at all, we cannot use ICC
|
|
// TODO: we need to discriminate better between "empty due to env" and
|
|
// "empty due to defaults"
|
|
// TODO: this shouldn't be a global - the client config rules should be
|
|
// handling this.
|
|
defaultConfig, err := DefaultClientConfig.ClientConfig()
|
|
if err == nil && !reflect.DeepEqual(mergedConfig, defaultConfig) {
|
|
return mergedConfig, nil
|
|
}
|
|
}
|
|
|
|
// check for in-cluster configuration and use it
|
|
if config.icc.Possible() {
|
|
return config.icc.ClientConfig()
|
|
}
|
|
|
|
// return the result of the merged client config
|
|
return mergedConfig, err
|
|
}
|
|
|
|
// Namespace implements KubeConfig
|
|
func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) {
|
|
mergedKubeConfig, err := config.createClientConfig()
|
|
if err != nil {
|
|
return "", false, err
|
|
}
|
|
|
|
return mergedKubeConfig.Namespace()
|
|
}
|
|
|
|
// ConfigAccess implements ClientConfig
|
|
func (config *DeferredLoadingClientConfig) ConfigAccess() ConfigAccess {
|
|
return config.loader
|
|
}
|