Merge pull request #160 from jingyuanliang/klog

Switch from "github.com/golang/glog" to "k8s.io/klog/v2"

cmd/ip-masq-agent/ip-masq-agent.go

@@ -31,10 +31,9 @@ import (
 	"k8s.io/component-base/version/verflag"
 	"k8s.io/ip-masq-agent/cmd/ip-masq-agent/testing/fakefs"
 	"k8s.io/ip-masq-agent/pkg/version"
+	"k8s.io/klog/v2"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	utilexec "k8s.io/utils/exec"
-
-	"github.com/golang/glog"
 )
 
 const (
@@ -129,12 +128,13 @@ func NewMasqDaemon(c *MasqConfig) *MasqDaemon {
 }
 
 func main() {
+	klog.InitFlags(nil)
 	flag.Parse()
 
-	glog.Infof("ip-masq-agent version: %s", version.Version)
+	klog.Infof("ip-masq-agent version: %s", version.Version)
 
 	flag.CommandLine.VisitAll(func(f *flag.Flag) {
-		glog.Infof("FLAG: --%s=%q", f.Name, f.Value)
+		klog.Infof("FLAG: --%s=%q", f.Name, f.Value)
 	})
 
 	masqChain = utiliptables.Chain(*masqChainFlag)
@@ -158,17 +158,17 @@ func (m *MasqDaemon) Run() {
 			defer time.Sleep(time.Duration(m.config.ResyncInterval))
 			// resync config
 			if err := m.osSyncConfig(); err != nil {
-				glog.Errorf("error syncing configuration: %v", err)
+				klog.Errorf("error syncing configuration: %v", err)
 				return
 			}
 			// resync rules
 			if err := m.syncMasqRules(); err != nil {
-				glog.Errorf("error syncing masquerade rules: %v", err)
+				klog.Errorf("error syncing masquerade rules: %v", err)
 				return
 			}
 			// resync ipv6 rules
 			if err := m.syncMasqRulesIPv6(); err != nil {
-				glog.Errorf("error syncing masquerade rules for ipv6: %v", err)
+				klog.Errorf("error syncing masquerade rules for ipv6: %v", err)
 				return
 			}
 		}()
@@ -190,7 +190,7 @@ func (m *MasqDaemon) syncConfig(fs fakefs.FileSystem) error {
 	defer func() {
 		if err == nil {
 			json, _ := utiljson.Marshal(c)
-			glog.V(2).Infof("using config: %s", string(json))
+			klog.V(2).Infof("using config: %s", string(json))
 		}
 	}()
 
@@ -202,10 +202,10 @@ func (m *MasqDaemon) syncConfig(fs fakefs.FileSystem) error {
 		m.config.MasqLinkLocal = c.MasqLinkLocal
 		m.config.MasqLinkLocalIPv6 = c.MasqLinkLocalIPv6
 		m.config.ResyncInterval = c.ResyncInterval
-		glog.V(2).Infof("no config file found at %q, using default values", configPath)
+		klog.V(2).Infof("no config file found at %q, using default values", configPath)
 		return nil
 	}
-	glog.V(2).Infof("config file found at %q", configPath)
+	klog.V(2).Infof("config file found at %q", configPath)
 
 	// file exists, read and parse file
 	yaml, err := fs.ReadFile(configPath)

go.mod

@@ -3,9 +3,9 @@ module k8s.io/ip-masq-agent
 go 1.22
 
 require (
-	github.com/golang/glog v1.2.0
 	k8s.io/apimachinery v0.29.1
 	k8s.io/component-base v0.29.1
+	k8s.io/klog/v2 v2.110.1
 	k8s.io/kubernetes v1.29.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
@@ -37,7 +37,6 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect

go.sum

@@ -15,8 +15,6 @@ github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
 github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
-github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=