github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

use deepcopy to actually operate on a copy

Browse Source
This commit is contained in:
Michaël Lévesque-Dion 2020-12-02 14:44:11 -05:00
parent ec271c0e4f
commit 0841b13e37
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/kubelet/app/server.go
View File

@ -75,7 +75,6 @@ import (
"k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config"
kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme"
kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation"
@ -264,8 +263,13 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API
// set up signal context here in order to be reused by kubelet and docker shim // set up signal context here in order to be reused by kubelet and docker shim
ctx := genericapiserver.SetupSignalContext() ctx := genericapiserver.SetupSignalContext()
// make the kubelet's config safe for logging
config := kubeletServer.KubeletConfiguration.DeepCopy()
for k := range config.StaticPodURLHeader {
config.StaticPodURLHeader[k] = []string{"<redacted>"}
}
// log the kubelet's config for inspection // log the kubelet's config for inspection
logConfig(kubeletServer.KubeletConfiguration) klog.V(5).Infof("KubeletConfiguration: %#v", config)
// run the kubelet // run the kubelet
if err := Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate); err != nil { if err := Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate); err != nil {
@ -304,15 +308,6 @@ func newFlagSetWithGlobals() *pflag.FlagSet {
return fs return fs
} }
// logConfig logs the kubelet's configuration.
// Special care is taken to avoid logging sensitive parts of the configuration.
func logConfig(config kubeletconfig.KubeletConfiguration) {
for k := range config.StaticPodURLHeader {
config.StaticPodURLHeader[k] = []string{"<redacted>"}
}
klog.V(5).Infof("KubeletConfiguration: %#v", config)
}
// newFakeFlagSet constructs a pflag.FlagSet with the same flags as fs, but where // newFakeFlagSet constructs a pflag.FlagSet with the same flags as fs, but where
// all values have noop Set implementations // all values have noop Set implementations
func newFakeFlagSet(fs *pflag.FlagSet) *pflag.FlagSet { func newFakeFlagSet(fs *pflag.FlagSet) *pflag.FlagSet {