Skip to content

Commit 957adfa

Browse files
committed
fix invalid log calls
These were found with a modified klog that enables "go vet" to check klog call parameters: cmd/kubeadm/app/features/features.go:149:4: printf: k8s.io/klog/v2.Warningf format %t has arg v of wrong type string (govet) klog.Warningf("Setting deprecated feature gate %s=%t. It will be removed in a future release.", k, v) test/images/sample-device-plugin/sampledeviceplugin.go:147:5: printf: k8s.io/klog/v2.Errorf does not support error-wrapping directive %w (govet) klog.Errorf("error: %w", err) test/images/sample-device-plugin/sampledeviceplugin.go:155:3: printf: k8s.io/klog/v2.Errorf does not support error-wrapping directive %w (govet) klog.Errorf("Failed to add watch to %q: %w", triggerPath, err) staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go:207:5: printf: k8s.io/klog/v2.Fatalf does not support error-wrapping directive %w (govet) klog.Fatalf("Package %v: unsupported %s value: %q :%w", i, tagEnabledName, ptag.value, err) staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go:286:3: printf: (k8s.io/klog/v2.Verbose).Infof format %s reads arg #1, but call has 0 args (govet) klog.V(4).Infof("Node %s missing in vSphere cloud provider cache, trying node informer") staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go:302:3: printf: (k8s.io/klog/v2.Verbose).Infof format %s reads arg #1, but call has 0 args (govet) klog.V(4).Infof("Node %s missing in vSphere cloud provider caches, trying the API server")
1 parent 755644a commit 957adfa

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmd/kubeadm/app/features/features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func NewFeatureGate(f *FeatureList, value string) (map[string]bool, error) {
146146
}
147147

148148
if featureSpec.PreRelease == featuregate.Deprecated {
149-
klog.Warningf("Setting deprecated feature gate %s=%t. It will be removed in a future release.", k, v)
149+
klog.Warningf("Setting deprecated feature gate %s=%s. It will be removed in a future release.", k, v)
150150
}
151151

152152
boolValue, err := strconv.ParseBool(v)

staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
204204
if ptag != nil {
205205
pkgNeedsGeneration, err = strconv.ParseBool(ptag.value)
206206
if err != nil {
207-
klog.Fatalf("Package %v: unsupported %s value: %q :%w", i, tagEnabledName, ptag.value, err)
207+
klog.Fatalf("Package %v: unsupported %s value: %q :%v", i, tagEnabledName, ptag.value, err)
208208
}
209209
}
210210
if !pkgNeedsGeneration {

staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func (nm *NodeManager) GetNode(nodeName k8stypes.NodeName) (v1.Node, error) {
283283
}
284284

285285
if nm.nodeLister != nil {
286-
klog.V(4).Infof("Node %s missing in vSphere cloud provider cache, trying node informer")
286+
klog.V(4).Infof("Node %s missing in vSphere cloud provider cache, trying node informer", nodeName)
287287
node, err := nm.nodeLister.Get(convertToString(nodeName))
288288
if err != nil {
289289
if !errors.IsNotFound(err) {
@@ -299,7 +299,7 @@ func (nm *NodeManager) GetNode(nodeName k8stypes.NodeName) (v1.Node, error) {
299299
}
300300

301301
if nm.nodeGetter != nil {
302-
klog.V(4).Infof("Node %s missing in vSphere cloud provider caches, trying the API server")
302+
klog.V(4).Infof("Node %s missing in vSphere cloud provider caches, trying the API server", nodeName)
303303
node, err := nm.nodeGetter.Nodes().Get(context.TODO(), convertToString(nodeName), metav1.GetOptions{})
304304
if err != nil {
305305
if !errors.IsNotFound(err) {

test/images/sample-device-plugin/sampledeviceplugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ func handleRegistrationProcess(registerControlFile string) error {
144144
if !ok {
145145
return
146146
}
147-
klog.Errorf("error: %w", err)
147+
klog.Errorf("error: %v", err)
148148
panic(err)
149149
}
150150
}
151151
}()
152152

153153
err = watcher.Add(triggerPath)
154154
if err != nil {
155-
klog.Errorf("Failed to add watch to %q: %w", triggerPath, err)
155+
klog.ErrorS(err, "Failed to add watch", "triggerPath", triggerPath)
156156
return err
157157
}
158158

0 commit comments

Comments
 (0)