From 3597bddeafb8c0af607f26c1d9a98d81faabc1d5 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 4 Nov 2023 05:57:08 +0200 Subject: [PATCH] Fix vet error --- nodeup/pkg/model/kubectl.go | 2 +- nodeup/pkg/model/protokube.go | 2 +- nodeup/pkg/model/update_service.go | 2 +- pkg/kubemanifest/visitor.go | 2 +- pkg/nodeidentity/openstack/identify.go | 2 +- pkg/nodeidentity/scaleway/identify.go | 2 +- protokube/cmd/protokube/main.go | 6 +++--- upup/pkg/fi/cloudup/awstasks/iamrole.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nodeup/pkg/model/kubectl.go b/nodeup/pkg/model/kubectl.go index 9269648b3d..dac4606426 100644 --- a/nodeup/pkg/model/kubectl.go +++ b/nodeup/pkg/model/kubectl.go @@ -105,7 +105,7 @@ func (b *KubectlBuilder) Build(c *fi.NodeupModelBuilderContext) error { func (b *KubectlBuilder) findKubeconfigUser() (*fi.User, *fi.Group, error) { users, err := b.Distribution.DefaultUsers() if err != nil { - klog.Warningf("won't write kubeconfig to homedir for distribution %s: %v", b.Distribution, err) + klog.Warningf("won't write kubeconfig to homedir for distribution %v: %v", b.Distribution, err) return nil, nil, nil } diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go index 4b8a66d37d..b80bf3ede3 100644 --- a/nodeup/pkg/model/protokube.go +++ b/nodeup/pkg/model/protokube.go @@ -200,7 +200,7 @@ func (t *ProtokubeBuilder) ProtokubeFlags() (*ProtokubeFlags, error) { } if t.UsesLegacyGossip() { - klog.Warningf("using (legacy) gossip DNS", t.NodeupConfig.ClusterName) + klog.Warningf("using (legacy) gossip DNS") f.Gossip = fi.PtrTo(true) if t.NodeupConfig.GossipConfig != nil { f.GossipProtocol = t.NodeupConfig.GossipConfig.Protocol diff --git a/nodeup/pkg/model/update_service.go b/nodeup/pkg/model/update_service.go index 7057ba98be..093c929c1b 100644 --- a/nodeup/pkg/model/update_service.go +++ b/nodeup/pkg/model/update_service.go @@ -59,7 +59,7 @@ func (b *UpdateServiceBuilder) buildFlatcarSystemdService(c *fi.NodeupModelBuild } } - klog.Infof("Detected OS %s; building %s service to disable update scheduler", b.Distribution, flatcarServiceName) + klog.Infof("Detected OS %v; building %s service to disable update scheduler", b.Distribution, flatcarServiceName) manifest := &systemd.Manifest{} manifest.Set("Unit", "Description", "Disable OS Update Scheduler") diff --git a/pkg/kubemanifest/visitor.go b/pkg/kubemanifest/visitor.go index b4d597fbb0..90a1617a9e 100644 --- a/pkg/kubemanifest/visitor.go +++ b/pkg/kubemanifest/visitor.go @@ -41,7 +41,7 @@ func (m *visitorBase) VisitFloat64(path []string, v float64, mutator func(float6 } func (m *visitorBase) VisitMap(path []string, v map[string]interface{}) error { - klog.V(10).Infof("object value at %s: %f", strings.Join(path, "."), v) + klog.V(10).Infof("object value at %s: %v", strings.Join(path, "."), v) return nil } diff --git a/pkg/nodeidentity/openstack/identify.go b/pkg/nodeidentity/openstack/identify.go index c9ad5e1eb9..2a482f202e 100644 --- a/pkg/nodeidentity/openstack/identify.go +++ b/pkg/nodeidentity/openstack/identify.go @@ -134,7 +134,7 @@ func (i *nodeIdentifier) IdentifyNode(ctx context.Context, node *corev1.Node) (* case kops.InstanceGroupRoleAPIServer: labels[nodelabels.RoleLabelAPIServer16] = "" default: - klog.Warningf("Unknown node role %q for server %s(%d)", value, server.Name, server.ID) + klog.Warningf("Unknown node role %q for server %s(%s)", value, server.Name, server.ID) } } diff --git a/pkg/nodeidentity/scaleway/identify.go b/pkg/nodeidentity/scaleway/identify.go index 95d5ce0754..b97db6ca74 100644 --- a/pkg/nodeidentity/scaleway/identify.go +++ b/pkg/nodeidentity/scaleway/identify.go @@ -109,7 +109,7 @@ func (i *nodeIdentifier) IdentifyNode(ctx context.Context, node *corev1.Node) (* case kops.InstanceGroupRoleAPIServer: labels[nodelabels.RoleLabelAPIServer16] = "" default: - klog.Warningf("Unknown node role %q for server %s(%d)", role, server.Name, server.ID) + klog.Warningf("Unknown node role %q for server %s(%s)", role, server.Name, server.ID) } info := &nodeidentity.Info{ diff --git a/protokube/cmd/protokube/main.go b/protokube/cmd/protokube/main.go index 05bc69a9f2..9b65c2ac6d 100644 --- a/protokube/cmd/protokube/main.go +++ b/protokube/cmd/protokube/main.go @@ -189,20 +189,20 @@ func run() error { gossipName := cloudProvider.InstanceID() gossipSeeds, err := cloudProvider.GossipSeeds() if err != nil { - klog.Errorf("error finding gossip seeds: %w", err) + klog.Errorf("error finding gossip seeds: %v", err) } channelName := "dns" gossipState, err := gossiputils.GetGossipState(gossipProtocol, gossipListen, channelName, gossipName, []byte(gossipSecret), gossipSeeds) if err != nil { - klog.Errorf("error initializing gossip: %w", err) + klog.Errorf("error initializing gossip: %v", err) os.Exit(1) } if gossipProtocolSecondary != "" { secondaryGossipState, err := gossiputils.GetGossipState(gossipProtocolSecondary, gossipListenSecondary, channelName, gossipName, []byte(gossipSecretSecondary), gossipSeeds) if err != nil { - klog.Errorf("error initializing secondary gossip: %w", err) + klog.Errorf("error initializing secondary gossip: %v", err) os.Exit(1) } gossipState = &gossiputils.MultiGossipState{ diff --git a/upup/pkg/fi/cloudup/awstasks/iamrole.go b/upup/pkg/fi/cloudup/awstasks/iamrole.go index cdac5641bf..f7b0ae1861 100644 --- a/upup/pkg/fi/cloudup/awstasks/iamrole.go +++ b/upup/pkg/fi/cloudup/awstasks/iamrole.go @@ -154,7 +154,7 @@ func (s *IAMRole) CheckChanges(a, e, changes *IAMRole) error { func (_ *IAMRole) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *IAMRole) error { if e.RolePolicyDocument == nil { - klog.V(2).Infof("Deleting IAM role %q", a.Name) + klog.V(2).Infof("Deleting IAM role %q", fi.ValueOf(a.Name)) var attachedPolicies []*iam.AttachedPolicy var policyNames []string