diff --git a/pkg/kubelet/config/file.go b/pkg/kubelet/config/file.go index 79e2af6ed62..20237b21bd4 100644 --- a/pkg/kubelet/config/file.go +++ b/pkg/kubelet/config/file.go @@ -34,20 +34,11 @@ import ( utilio "k8s.io/utils/io" ) -type podEventType int - const ( - podAdd podEventType = iota - podModify - podDelete - eventBufferLen = 10 ) -type watchEvent struct { - fileName string - eventType podEventType -} +type watchEvent struct{} type sourceFile struct { path string diff --git a/pkg/kubelet/config/flags.go b/pkg/kubelet/config/flags.go index 4ff13cacf0a..648eeb1d6b6 100644 --- a/pkg/kubelet/config/flags.go +++ b/pkg/kubelet/config/flags.go @@ -17,8 +17,6 @@ limitations under the License. package config import ( - "fmt" - "github.com/spf13/pflag" ) @@ -54,6 +52,16 @@ func (s *ContainerRuntimeOptions) AddFlags(fs *pflag.FlagSet) { _ = fs.MarkDeprecated("pod-infra-container-image", "will be removed in 1.35. Image garbage collector will get sandbox image information from CRI.") // Image credential provider settings. - fs.StringVar(&s.ImageCredentialProviderConfigFile, "image-credential-provider-config", s.ImageCredentialProviderConfigFile, "The path to the credential provider plugin config file.") - fs.StringVar(&s.ImageCredentialProviderBinDir, "image-credential-provider-bin-dir", s.ImageCredentialProviderBinDir, "The path to the directory where credential provider plugin binaries are located.") + fs.StringVar( + &s.ImageCredentialProviderConfigFile, + "image-credential-provider-config", + s.ImageCredentialProviderConfigFile, + "The path to the credential provider plugin config file.", + ) + fs.StringVar( + &s.ImageCredentialProviderBinDir, + "image-credential-provider-bin-dir", + s.ImageCredentialProviderBinDir, + "The path to the directory where credential provider plugin binaries are located.", + ) } diff --git a/pkg/kubelet/config/mux.go b/pkg/kubelet/config/mux.go index b2bacff5f38..a2b3e1e0a5f 100644 --- a/pkg/kubelet/config/mux.go +++ b/pkg/kubelet/config/mux.go @@ -21,6 +21,7 @@ import ( "sync" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/klog/v2" ) type merger interface { @@ -75,6 +76,8 @@ func (m *mux) ChannelWithContext(ctx context.Context, source string) chan interf func (m *mux) listen(source string, listenChannel <-chan interface{}) { for update := range listenChannel { - m.merger.Merge(source, update) + if err := m.merger.Merge(source, update); err != nil { + klog.InfoS("failed merging update", "err", err) + } } }