github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31660 from mtaufen/un-ref-KubeletConfiguration-on-kubelet

Browse Source 
Automatic merge from submit-queue

Make kubeletConfiguration field on Kubelet struct a value type
This commit is contained in:
Kubernetes Submit Queue
2016-08-30 10:46:48 -07:00
committed by GitHub
parent 1dfd6ab0c1 ceb00add97
commit ec061b81d0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -179,7 +179,7 @@ type Option func(*Kubelet)
// bootstrapping interface for kubelet, targets the initialization protocol
type KubeletBootstrap interface {
GetConfiguration() *componentconfig.KubeletConfiguration
GetConfiguration() componentconfig.KubeletConfiguration
BirthCry()
StartGarbageCollection()
ListenAndServe(address net.IP, port uint, tlsOptions *server.TLSOptions, auth server.AuthInterface, enableDebuggingHandlers bool)
@@ -745,7 +745,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
// Finally, put the most recent version of the config on the Kubelet, so
// people can see how it was configured.
klet.kubeletConfiguration = kubeCfg
klet.kubeletConfiguration = *kubeCfg
return klet, nil
}
@@ -759,7 +759,7 @@ type nodeLister interface {
// Kubelet is the main kubelet implementation.
type Kubelet struct {
kubeletConfiguration *componentconfig.KubeletConfiguration
kubeletConfiguration componentconfig.KubeletConfiguration
hostname string
nodeName string
@@ -3043,7 +3043,7 @@ func (kl *Kubelet) PortForward(podFullName string, podUID types.UID, port uint16
}
// GetConfiguration returns the KubeletConfiguration used to configure the kubelet.
func (kl *Kubelet) GetConfiguration() *componentconfig.KubeletConfiguration {
func (kl *Kubelet) GetConfiguration() componentconfig.KubeletConfiguration {
return kl.kubeletConfiguration
}