github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 13:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused ProxyServer.EventClient field

Browse Source 
The port to Events v1 left some cruft behind.
This commit is contained in:
Dan Winship 2023-03-13 10:20:23 -04:00
parent 9754386c76
commit 8a790ac2e1
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/kube-proxy/app/server.go
View File

@ -48,7 +48,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -524,7 +523,6 @@ with the apiserver API to configure the proxy.`,
// fields are required. // fields are required.
type ProxyServer struct { type ProxyServer struct {
Client clientset.Interface Client clientset.Interface
EventClient v1core.EventsGetter
Proxier proxy.Provider Proxier proxy.Provider
Broadcaster events.EventBroadcaster Broadcaster events.EventBroadcaster
Recorder events.EventRecorder Recorder events.EventRecorder
@ -541,9 +539,9 @@ type ProxyServer struct {
localDetectorMode kubeproxyconfig.LocalMode localDetectorMode kubeproxyconfig.LocalMode
} }
// createClients creates a kube client and an event client from the given config and masterOverride. // createClient creates a kube client from the given config and masterOverride.
// TODO remove masterOverride when CLI flags are removed. // TODO remove masterOverride when CLI flags are removed.
func createClients(config componentbaseconfig.ClientConnectionConfiguration, masterOverride string) (clientset.Interface, v1core.EventsGetter, error) { func createClient(config componentbaseconfig.ClientConnectionConfiguration, masterOverride string) (clientset.Interface, error) {
var kubeConfig *rest.Config var kubeConfig *rest.Config
var err error var err error
@ -558,7 +556,7 @@ func createClients(config componentbaseconfig.ClientConnectionConfiguration, mas
&clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: masterOverride}}).ClientConfig() &clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: masterOverride}}).ClientConfig()
} }
if err != nil { if err != nil {
return nil, nil, err return nil, err
} }
kubeConfig.AcceptContentTypes = config.AcceptContentTypes kubeConfig.AcceptContentTypes = config.AcceptContentTypes
@ -568,15 +566,10 @@ func createClients(config componentbaseconfig.ClientConnectionConfiguration, mas
client, err := clientset.NewForConfig(kubeConfig) client, err := clientset.NewForConfig(kubeConfig)
if err != nil { if err != nil {
return nil, nil, err return nil, err
} }
eventClient, err := clientset.NewForConfig(kubeConfig) return client, nil
if err != nil {
return nil, nil, err
}
return client, eventClient.CoreV1(), nil
} }
func serveHealthz(hz healthcheck.ProxierHealthUpdater, errCh chan error) { func serveHealthz(hz healthcheck.ProxierHealthUpdater, errCh chan error) {
@ -659,7 +652,7 @@ func (s *ProxyServer) Run() error {
} }
} }
if s.Broadcaster != nil && s.EventClient != nil { if s.Broadcaster != nil {
stopCh := make(chan struct{}) stopCh := make(chan struct{})
s.Broadcaster.StartRecordingToSink(stopCh) s.Broadcaster.StartRecordingToSink(stopCh)
} }

3
cmd/kube-proxy/app/server_others.go
View File

@ -101,7 +101,7 @@ func newProxyServer(
return nil, err return nil, err
} }
client, eventClient, err := createClients(config.ClientConnection, master) client, err := createClient(config.ClientConnection, master)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -338,7 +338,6 @@ func newProxyServer(
return &ProxyServer{ return &ProxyServer{
Client: client, Client: client,
EventClient: eventClient,
Proxier: proxier, Proxier: proxier,
Broadcaster: eventBroadcaster, Broadcaster: eventBroadcaster,
Recorder: recorder, Recorder: recorder,

3
cmd/kube-proxy/app/server_windows.go
View File

@ -65,7 +65,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string
metrics.SetShowHidden() metrics.SetShowHidden()
} }
client, eventClient, err := createClients(config.ClientConnection, master) client, err := createClient(config.ClientConnection, master)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -143,7 +143,6 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, master string
return &ProxyServer{ return &ProxyServer{
Client: client, Client: client,
EventClient: eventClient,
Proxier: proxier, Proxier: proxier,
Broadcaster: eventBroadcaster, Broadcaster: eventBroadcaster,
Recorder: recorder, Recorder: recorder,

1
pkg/proxy/kubemark/hollow_proxy.go
View File

@ -125,7 +125,6 @@ func NewHollowProxyOrDie(
return &HollowProxy{ return &HollowProxy{
ProxyServer: &proxyapp.ProxyServer{ ProxyServer: &proxyapp.ProxyServer{
Client: client, Client: client,
EventClient: eventClient,
Proxier: proxier, Proxier: proxier,
Broadcaster: broadcaster, Broadcaster: broadcaster,
Recorder: recorder, Recorder: recorder,