Revert formatting changes

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 {
+type watchEvent struct{}
-	fileName  string
-	eventType podEventType
-}
 
 type sourceFile struct {
 	path           string

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(
-	fs.StringVar(&s.ImageCredentialProviderBinDir, "image-credential-provider-bin-dir", s.ImageCredentialProviderBinDir, "The path to the directory where credential provider plugin binaries are located.")
+		&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.",
+	)
 }

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)
+		}
 	}
 }