From dfd1b1da196652712a6e9c0a672cfc569aa81677 Mon Sep 17 00:00:00 2001
From: Dan Finneran <dan@thebsdbox.co.uk>
Date: Mon, 15 Dec 2025 14:53:21 +0000
Subject: [PATCH] path up other ci complaints.

Signed-off-by: Dan Finneran <dan@thebsdbox.co.uk>
---
 .golangci.yml                   | 10 +++++++++-
 demo/client/main.go             |  2 +-
 pkg/detector/interfaces.go      |  2 +-
 pkg/instance/instance.go        |  7 +++----
 pkg/kubevip/config_generator.go |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 4ea3334f..e6db8e83 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,9 +4,17 @@ linters:
     - bodyclose
     - gosec
     - misspell
-    - revive
     - unconvert
     - unparam
+  settings:
+    misspell:
+      ignore-rules:
+        - creater
+    staticcheck:
+      checks:
+        - all
+        # Disable QF1008 to retain embedded fields for better readability.
+        - "-QF1008"
   exclusions:
     generated: lax
     presets:
diff --git a/demo/client/main.go b/demo/client/main.go
index 2a4e9e9c..63bb3b8b 100644
--- a/demo/client/main.go
+++ b/demo/client/main.go
@@ -19,7 +19,7 @@ func main() {
 	var errorOccurred bool
 	for {
 		p := make([]byte, 2048)
-		conn, err := net.Dial("udp", fmt.Sprintf("%s:%d", *address, *port))
+		conn, err := net.Dial("udp", net.JoinHostPort(*address, fmt.Sprint(port)))
 		if err != nil {
 			if !errorOccurred {
 				errorTime = time.Now()
diff --git a/pkg/detector/interfaces.go b/pkg/detector/interfaces.go
index 00b29d69..7e5b4ed5 100644
--- a/pkg/detector/interfaces.go
+++ b/pkg/detector/interfaces.go
@@ -37,5 +37,5 @@ func FindIPAddress(addrName string) (string, string, error) {
 		}
 
 	}
-	return "", "", fmt.Errorf("Unknown interface [%s]", addrName)
+	return "", "", fmt.Errorf("unknown interface [%s]", addrName)
 }
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 6cefe0ae..046f89ce 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"log/slog"
 	log "log/slog"
 
 	"github.com/vishvananda/netlink"
@@ -369,19 +368,19 @@ func (i *Instance) startDHCP() error {
 		// Check the rp_filter value
 		rpFilter, err := strconv.Atoi(i.ServiceSnapshot.Annotations[kubevip.RPFilter])
 		if err != nil {
-			slog.Error("[DHCP] unable to process rp_filter", "value", rpFilter)
+			log.Error("[DHCP] unable to process rp_filter", "value", rpFilter)
 		} else {
 			if rpFilter >= 0 && rpFilter < 3 { // Ensure the value is 0,1,2
 				rpfilterSetting = i.ServiceSnapshot.Annotations[kubevip.RPFilter]
 			} else {
-				slog.Error("[DHCP] rp_filter value not within range 0-2", "value", rpFilter)
+				log.Error("[DHCP] rp_filter value not within range 0-2", "value", rpFilter)
 			}
 		}
 	}
 
 	err = sysctl.WriteProcSys("/proc/sys/net/ipv4/conf/"+interfaceName+"/rp_filter", rpfilterSetting)
 	if err != nil {
-		slog.Error("[DHCP] unable to write rp_filter", "value", rpfilterSetting, "err", err)
+		log.Error("[DHCP] unable to write rp_filter", "value", rpfilterSetting, "err", err)
 	}
 	var initRebootFlag bool
 	if i.DHCPInterfaceIP != "" {
diff --git a/pkg/kubevip/config_generator.go b/pkg/kubevip/config_generator.go
index e90ec0f5..2cd20682 100644
--- a/pkg/kubevip/config_generator.go
+++ b/pkg/kubevip/config_generator.go
@@ -170,7 +170,7 @@ func GenerateRoleBinding(rolebinding bool, saCfg *applyCoreV1.ServiceAccountAppl
 func generatePodSpec(c *Config, image, imageVersion string, inCluster bool) *corev1.Pod {
 	imageRef, err := name.NewTag(image, name.WeakValidation, name.WithDefaultTag(imageVersion))
 	if err != nil {
-		panic(fmt.Errorf("Cannot parse %q: %w", image, err))
+		panic(fmt.Errorf("cannot parse %q: %w", image, err))
 	}
 	command := "manager"