Make linters happy

Following a rebase against the latest state of `main`, a few errors had
popped up.

Author: weyfonk

e2e/multi-cluster/offline_cluster_test.go

@@ -2,7 +2,6 @@ package multicluster_test
 
 import (
 	"encoding/json"
-	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -79,8 +78,8 @@ var _ = Describe("Offline cluster detection", func() {
 			Eventually(func(g Gomega) {
 				out, err := k.Get(
 					"bundledeployments", "-A",
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-name=%s", name),
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-namespace=%s", env.ClusterRegistrationNamespace),
+					"-l", "fleet.cattle.io/bundle-name="+name,
+					"-l", "fleet.cattle.io/bundle-namespace="+env.ClusterRegistrationNamespace,
 					"-o", `jsonpath={.items[0].status.conditions}`,
 				)
 				g.Expect(err).ToNot(HaveOccurred(), out)
@@ -108,8 +107,8 @@ var _ = Describe("Offline cluster detection", func() {
 			Eventually(func(g Gomega) {
 				out, err := k.Get(
 					"bundledeployments", "-A",
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-name=%s", name),
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-namespace=%s", env.ClusterRegistrationNamespace),
+					"-l", "fleet.cattle.io/bundle-name="+name,
+					"-l", "fleet.cattle.io/bundle-namespace="+env.ClusterRegistrationNamespace,
 					"-o", `jsonpath={.items[0].status.conditions}`,
 				)
 				g.Expect(err).ToNot(HaveOccurred(), out)
@@ -137,8 +136,8 @@ var _ = Describe("Offline cluster detection", func() {
 			Eventually(func(g Gomega) {
 				out, err := k.Get(
 					"bundledeployments", "-A",
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-name=%s", name),
-					"-l", fmt.Sprintf("fleet.cattle.io/bundle-namespace=%s", env.ClusterRegistrationNamespace),
+					"-l", "fleet.cattle.io/bundle-name="+name,
+					"-l", "fleet.cattle.io/bundle-namespace="+env.ClusterRegistrationNamespace,
 					"-o", `jsonpath={.items[0].status.conditions}`,
 				)
 				g.Expect(err).ToNot(HaveOccurred(), out)

internal/cmd/agent/deployer/monitor/condition.go

@@ -45,11 +45,11 @@ func (c Cond) IsFalse(obj any) bool {
 	return getStatus(obj, string(c)) == "False"
 }
 
-func (c Cond) Unknown(obj interface{}) {
+func (c Cond) Unknown(obj any) {
 	setStatus(obj, string(c), "Unknown")
 }
 
-func (c Cond) IsUnknown(obj interface{}) bool {
+func (c Cond) IsUnknown(obj any) bool {
 	return getStatus(obj, string(c)) == "Unknown"
 }
 

internal/cmd/controller/agentmanagement/controllers/cluster/import.go

@@ -320,7 +320,7 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
 	)
 
 	if cfg.AgentCheckinInterval.Seconds() == 0 {
-		return status, fmt.Errorf("agent check-in interval cannot be 0")
+		return status, errors.New("agent check-in interval cannot be 0")
 	}
 
 	if apiServerURL == "" {

internal/cmd/controller/agentmanagement/controllers/manageagent/manageagent_test.go

@@ -1,7 +1,6 @@
 package manageagent
 
 import (
-	"os"
 	"reflect"
 	"strings"
 	"testing"
@@ -27,9 +26,9 @@ func TestNewAgentBundle(t *testing.T) {
 	config.Set(&config.Config{AgentCheckinInterval: metav1.Duration{Duration: 0 * time.Second}})
 
 	// ensure leader election env is set so NewLeaderElectionOptionsWithPrefix doesn't error
-	os.Setenv("FLEET_AGENT_ELECTION_LEASE_DURATION", "15s")
-	os.Setenv("FLEET_AGENT_ELECTION_RENEW_DEADLINE", "10s")
-	os.Setenv("FLEET_AGENT_ELECTION_RETRY_PERIOD", "2s")
+	t.Setenv("FLEET_AGENT_ELECTION_LEASE_DURATION", "15s")
+	t.Setenv("FLEET_AGENT_ELECTION_RENEW_DEADLINE", "10s")
+	t.Setenv("FLEET_AGENT_ELECTION_RETRY_PERIOD", "2s")
 
 	h := handler{systemNamespace: "blah"}
 	obj, err := h.newAgentBundle("foo", &fleet.Cluster{Spec: fleet.ClusterSpec{AgentNamespace: "bar"}})

internal/cmd/controller/clustermonitor/monitor_test.go

@@ -414,9 +414,7 @@ func Test_Run(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			ctrl := gomock.NewController(t)
 			testClient := mocks.NewMockK8sClient(ctrl)
-			ctx, cancel := context.WithCancel(context.Background())
-
-			defer cancel()
+			ctx := t.Context()
 
 			testClient.EXPECT().List(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
 				func(ctx context.Context, list *v1alpha1.ClusterList, opts ...client.ListOption) error {
@@ -469,7 +467,7 @@ func Test_Run(t *testing.T) {
 					testClient.EXPECT().Status().Return(srw)
 
 					srw.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Do(
-						func(ctx context.Context, bd *v1alpha1.BundleDeployment, p client.Patch, opts ...interface{}) {
+						func(ctx context.Context, bd *v1alpha1.BundleDeployment, p client.Patch, opts ...any) {
 							var foundReady, foundMonitored bool
 							for _, c := range bd.Status.Conditions {
 								switch c.Type {

internal/config/config.go

@@ -152,7 +152,7 @@ type Config struct {
 	AgentWorkers AgentWorkers `json:"agentWorkers,omitzero"`
 
 	// ClusterMonitor represents configuration for the cluster monitor, including its enabled or disabled state.
-	ClusterMonitor ClusterMonitor `json:"clusterMonitor,omitempty"`
+	ClusterMonitor ClusterMonitor `json:"clusterMonitor,omitzero"`
 }
 
 type AgentWorkers struct {
@@ -179,13 +179,13 @@ type ClusterMonitor struct {
 	Enabled bool `json:"enabled,omitempty"`
 
 	// Interval determines how often the cluster monitor will check for offline downstream clusters.
-	Interval metav1.Duration `json:"interval,omitempty"`
+	Interval metav1.Duration `json:"interval,omitzero"`
 
 	// Threshold determines how long must have elapsed since a downstream cluster's Fleet agent last reported its
 	// status to the management cluster, before that downstream cluster is considered offline. If this configured value
 	// is shorter than three times the agent check-in interval, then that check-in interval-based value will be used
 	// instead to prevent false positives.
-	Threshold metav1.Duration `json:"threshold.omitempty"`
+	Threshold metav1.Duration `json:"threshold,omitzero"`
 }
 
 // OnChange is used by agentmanagement to react to config changes. The callback is triggered by 'Set' via