Bump to golangci-lint 2.x (#1360)

golangci-lint 1.x is obsolete.  Move with the times.

Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>

Author: jmencak

.golangci.yaml

@@ -1,41 +1,72 @@
+version: "2"
 run:
-  timeout: 5m
   modules-download-mode: vendor
-issues:
-  exclude-dirs:
-    - vendor
-  exclude-rules:
-    # Temporarily disable the deprecation warnings until we rewrite the code based on deprecated functionality.
-    - linters:
-        - staticcheck
-      text: "SA1019: .* deprecated"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - errcheck
     - bodyclose
-    - gosimple
+    - errcheck
     - govet
     - ineffassign
     - misspell
     - nolintlint
     - nosprintfhostport
     - staticcheck
-    - tenv
-    - typecheck
     - unconvert
     - unused
     - wastedassign
     - whitespace
-linters-settings:
-  errcheck:
+  settings:
     # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
     # default is false: such cases aren't reported by default.
-    check-blank: false
-  misspell:
+    errcheck:
+      check-blank: false
     # Do not set locale explicitly, the default is to use a neutral variety of English.
     # Setting locale to US will cause correcting the British spelling of 'colour' to 'color'.
     # locale: US
-    ignore-words:
-      - NTO
-      - nto
+    misspell:
+      ignore-rules:
+        - NTO
+        - nto
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      # Technical debt, ReportViaDeprecatedReporter() will be removed in future ginkgo versions.
+      - linters:
+          - staticcheck
+        text: "SA1019: reporters.ReportViaDeprecatedReporter is deprecated"
+      # Dot imports shouldn't be used, unfortunately they are.
+      - linters:
+          - staticcheck
+        text: 'ST1001: should not use dot imports'
+      # sttrings.Replace(..., -1) is being used by pkg/manifests/bindata.go
+      - linters:
+          - staticcheck
+        text: 'QF1004: could use strings.ReplaceAll instead'
+      # Sometimes there's a valid reason for capitalization, such as k8s resource names.
+      - linters:
+          - staticcheck
+        text: 'ST1005: error strings should not be capitalized'
+      - linters:
+          - staticcheck
+        text: 'QF1011: could omit type'
+      - linters:
+          - staticcheck
+        text: 'ST1023: should omit type'
+    paths:
+      - vendor
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -55,7 +55,7 @@ PAO_CRD_APIS :=$(addprefix ./$(API_TYPES_DIR)/performanceprofile/,v2 v1 v1alpha1
 PAO_E2E_SUITES := $(shell hack/list-test-bin.sh)
 
 # golangci-lint variables
-GOLANGCI_LINT_VERSION=1.64.8
+GOLANGCI_LINT_VERSION=2.2.1
 GOLANGCI_LINT_BIN=$(OUT_DIR)/golangci-lint
 GOLANGCI_LINT_VERSION_TAG=v${GOLANGCI_LINT_VERSION}
 

pkg/operator/controller.go

@@ -33,7 +33,6 @@ import (
 
 	tunedv1 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/tuned/v1"
 	ntoclient "github.com/openshift/cluster-node-tuning-operator/pkg/client"
-	"github.com/openshift/cluster-node-tuning-operator/pkg/config"
 	ntoconfig "github.com/openshift/cluster-node-tuning-operator/pkg/config"
 	tunedset "github.com/openshift/cluster-node-tuning-operator/pkg/generated/clientset/versioned"
 	tunedinformers "github.com/openshift/cluster-node-tuning-operator/pkg/generated/informers/externalversions"
@@ -383,7 +382,7 @@ func (c *Controller) sync(key wqKey) error {
 
 	// In HyperShift clusters, any Tuned changes should be overwritten by the tuned config
 	// in the management cluster
-	if config.InHyperShift() {
+	if ntoconfig.InHyperShift() {
 		err = c.syncHostedClusterTuneds()
 		if err != nil {
 			return fmt.Errorf("failed to sync hosted cluster Tuneds: %v", err)
@@ -534,7 +533,7 @@ func (c *Controller) syncDaemonSet(tuned *tunedv1.Tuned) error {
 	var update bool
 
 	dsMf := ntomf.TunedDaemonSet()
-	dsMf.ObjectMeta.OwnerReferences = getDefaultTunedRefs(tuned)
+	dsMf.OwnerReferences = getDefaultTunedRefs(tuned)
 
 	ds, err := c.listers.DaemonSets.Get(dsMf.Name)
 	if err != nil {
@@ -588,7 +587,7 @@ func (c *Controller) syncDaemonSet(tuned *tunedv1.Tuned) error {
 
 func (c *Controller) syncProfile(tuned *tunedv1.Tuned, nodeName string) error {
 	profileMf := ntomf.TunedProfile()
-	profileMf.ObjectMeta.OwnerReferences = getDefaultTunedRefs(tuned)
+	profileMf.OwnerReferences = getDefaultTunedRefs(tuned)
 
 	profileMf.Name = nodeName
 	delete(c.bootcmdlineConflict, nodeName)
@@ -795,7 +794,7 @@ func (c *Controller) syncMachineConfig(labels map[string]string, profile *tunedv
 
 	if ok := c.allNodesAgreeOnBootcmdline(nodes); !ok {
 		// Log an error and do not requeue, this is a configuration issue.
-		klog.Errorf("not all %d Nodes in MCP %v agree on bootcmdline: %s", len(nodes), pools[0].ObjectMeta.Name, bootcmdline)
+		klog.Errorf("not all %d Nodes in MCP %v agree on bootcmdline: %s", len(nodes), pools[0].Name, bootcmdline)
 		return nil
 	}
 
@@ -816,9 +815,9 @@ func (c *Controller) syncMachineConfig(labels map[string]string, profile *tunedv
 			mc = NewMachineConfig(name, annotations, labels, kernelArguments)
 			_, err = c.clients.MC.MachineconfigurationV1().MachineConfigs().Create(context.TODO(), mc, metav1.CreateOptions{})
 			if err != nil {
-				return fmt.Errorf("failed to create MachineConfig %s: %v", mc.ObjectMeta.Name, err)
+				return fmt.Errorf("failed to create MachineConfig %s: %v", mc.Name, err)
 			}
-			klog.Infof("created MachineConfig %s with%s", mc.ObjectMeta.Name, MachineConfigGenerationLogLine(len(bootcmdline) != 0, bootcmdline))
+			klog.Infof("created MachineConfig %s with%s", mc.Name, MachineConfigGenerationLogLine(len(bootcmdline) != 0, bootcmdline))
 			return nil
 		}
 		return err
@@ -829,22 +828,22 @@ func (c *Controller) syncMachineConfig(labels map[string]string, profile *tunedv
 	kernelArgsEq := util.StringSlicesEqual(mc.Spec.KernelArguments, kernelArguments)
 	if kernelArgsEq {
 		// No update needed
-		klog.V(2).Infof("syncMachineConfig(): MachineConfig %s doesn't need updating", mc.ObjectMeta.Name)
+		klog.V(2).Infof("syncMachineConfig(): MachineConfig %s doesn't need updating", mc.Name)
 		return nil
 	}
 	mc = mc.DeepCopy() // never update the objects from cache
-	mc.ObjectMeta.Annotations = mcNew.ObjectMeta.Annotations
+	mc.Annotations = mcNew.Annotations
 	mc.Spec.KernelArguments = kernelArguments
 	mc.Spec.Config = mcNew.Spec.Config
 
 	l := MachineConfigGenerationLogLine(!kernelArgsEq, bootcmdline)
-	klog.V(2).Infof("syncMachineConfig(): updating MachineConfig %s with%s", mc.ObjectMeta.Name, l)
+	klog.V(2).Infof("syncMachineConfig(): updating MachineConfig %s with%s", mc.Name, l)
 	_, err = c.clients.MC.MachineconfigurationV1().MachineConfigs().Update(context.TODO(), mc, metav1.UpdateOptions{})
 	if err != nil {
-		return fmt.Errorf("failed to update MachineConfig %s: %v", mc.ObjectMeta.Name, err)
+		return fmt.Errorf("failed to update MachineConfig %s: %v", mc.Name, err)
 	}
 
-	klog.Infof("updated MachineConfig %s with%s", mc.ObjectMeta.Name, l)
+	klog.Infof("updated MachineConfig %s with%s", mc.Name, l)
 
 	return nil
 }
@@ -857,11 +856,11 @@ func (c *Controller) allNodesAgreeOnBootcmdline(nodes []*corev1.Node) bool {
 	}
 
 	match := true
-	bootcmdline := c.pc.state.bootcmdline[nodes[0].ObjectMeta.Name]
+	bootcmdline := c.pc.state.bootcmdline[nodes[0].Name]
 	for _, node := range nodes[1:] {
-		if bootcmdline != c.pc.state.bootcmdline[node.ObjectMeta.Name] {
-			klog.V(2).Infof("found a conflicting bootcmdline %q for Node %q", c.pc.state.bootcmdline[node.ObjectMeta.Name], node.ObjectMeta.Name)
-			c.bootcmdlineConflict[node.ObjectMeta.Name] = true
+		if bootcmdline != c.pc.state.bootcmdline[node.Name] {
+			klog.V(2).Infof("found a conflicting bootcmdline %q for Node %q", c.pc.state.bootcmdline[node.Name], node.Name)
+			c.bootcmdlineConflict[node.Name] = true
 			match = false
 		}
 	}
@@ -906,14 +905,14 @@ func (c *Controller) syncMachineConfigHyperShift(nodePoolName string, profile *t
 			// put the MC into a ConfigMap and create that instead
 			mcConfigMap, err = c.newConfigMapForMachineConfig(configMapName, nodePoolName, mc)
 			if err != nil {
-				klog.Errorf("failed to generate ConfigMap %s for MachineConfig %s: %v", configMapName, mc.ObjectMeta.Name, err)
+				klog.Errorf("failed to generate ConfigMap %s for MachineConfig %s: %v", configMapName, mc.Name, err)
 				return nil
 			}
 			_, err = c.clients.ManagementKube.CoreV1().ConfigMaps(ntoconfig.OperatorNamespace()).Create(context.TODO(), mcConfigMap, metav1.CreateOptions{})
 			if err != nil {
-				return fmt.Errorf("failed to create ConfigMap %s for MachineConfig %s: %v", configMapName, mc.ObjectMeta.Name, err)
+				return fmt.Errorf("failed to create ConfigMap %s for MachineConfig %s: %v", configMapName, mc.Name, err)
 			}
-			klog.Infof("created ConfigMap %s for MachineConfig %s with%s", configMapName, mc.ObjectMeta.Name, MachineConfigGenerationLogLine(len(bootcmdline) != 0, bootcmdline))
+			klog.Infof("created ConfigMap %s for MachineConfig %s with%s", configMapName, mc.Name, MachineConfigGenerationLogLine(len(bootcmdline) != 0, bootcmdline))
 			return nil
 		}
 		return err
@@ -942,18 +941,18 @@ func (c *Controller) syncMachineConfigHyperShift(nodePoolName string, profile *t
 	// If mcfgs are equivalent don't update
 	if kernelArgsEq && cmLabelsAndAnnotationsCorrect {
 		// No update needed
-		klog.V(2).Infof("syncMachineConfigHyperShift(): MachineConfig %s doesn't need updating", mc.ObjectMeta.Name)
+		klog.V(2).Infof("syncMachineConfigHyperShift(): MachineConfig %s doesn't need updating", mc.Name)
 		return nil
 	}
 
 	// If mcfgs are not equivalent do update
 	mc = mc.DeepCopy() // never update the objects from cache
-	mc.ObjectMeta.Annotations = mcNew.ObjectMeta.Annotations
+	mc.Annotations = mcNew.Annotations
 	mc.Spec.KernelArguments = kernelArguments
 	mc.Spec.Config = mcNew.Spec.Config
 
 	l := MachineConfigGenerationLogLine(!kernelArgsEq, bootcmdline)
-	klog.V(2).Infof("syncMachineConfigHyperShift(): updating MachineConfig %s with%s", mc.ObjectMeta.Name, l)
+	klog.V(2).Infof("syncMachineConfigHyperShift(): updating MachineConfig %s with%s", mc.Name, l)
 
 	newData, err := c.serializeMachineConfig(mc)
 	if err != nil {
@@ -973,7 +972,7 @@ func (c *Controller) syncMachineConfigHyperShift(nodePoolName string, profile *t
 		return fmt.Errorf("failed to update ConfigMap for MachineConfig %s: %v", mcConfigMap.Name, err)
 	}
 
-	klog.Infof("updated ConfigMap %s for MachineConfig %s with%s", mcConfigMap.Name, mc.ObjectMeta.Name, l)
+	klog.Infof("updated ConfigMap %s for MachineConfig %s with%s", mcConfigMap.Name, mc.Name, l)
 
 	return nil
 }
@@ -991,25 +990,25 @@ func (c *Controller) pruneMachineConfigs() error {
 	}
 
 	for _, mc := range mcList {
-		if mc.ObjectMeta.Annotations != nil {
-			if _, ok := mc.ObjectMeta.Annotations[GeneratedByControllerVersionAnnotationKey]; !ok {
+		if mc.Annotations != nil {
+			if _, ok := mc.Annotations[GeneratedByControllerVersionAnnotationKey]; !ok {
 				continue
 			}
 			// mc's annotations have the controller/operator key
 
-			if mcNames[mc.ObjectMeta.Name] {
+			if mcNames[mc.Name] {
 				continue
 			}
 			// This MachineConfig has this operator's annotations and it is not currently used by any
 			// Tuned CR; remove it and let MCO roll-back any changes
 
-			klog.V(2).Infof("pruneMachineConfigs(): deleting MachineConfig %s", mc.ObjectMeta.Name)
-			err = c.clients.MC.MachineconfigurationV1().MachineConfigs().Delete(context.TODO(), mc.ObjectMeta.Name, metav1.DeleteOptions{})
+			klog.V(2).Infof("pruneMachineConfigs(): deleting MachineConfig %s", mc.Name)
+			err = c.clients.MC.MachineconfigurationV1().MachineConfigs().Delete(context.TODO(), mc.Name, metav1.DeleteOptions{})
 			if err != nil {
 				// Unable to delete the MachineConfig
 				return err
 			}
-			klog.Infof("deleted MachineConfig %s", mc.ObjectMeta.Name)
+			klog.Infof("deleted MachineConfig %s", mc.Name)
 		}
 	}
 
@@ -1032,24 +1031,24 @@ func (c *Controller) pruneMachineConfigsHyperShift() error {
 	}
 
 	for _, cm := range cmList.Items {
-		if cm.ObjectMeta.Annotations != nil {
-			if _, ok := cm.ObjectMeta.Annotations[GeneratedByControllerVersionAnnotationKey]; !ok {
+		if cm.Annotations != nil {
+			if _, ok := cm.Annotations[GeneratedByControllerVersionAnnotationKey]; !ok {
 				continue
 			}
 			// mc's annotations have the controller/operator key
-			if mcNames[cm.ObjectMeta.Name] {
+			if mcNames[cm.Name] {
 				continue
 			}
 
 			// This ConfigMap has this operator's annotations and it is not currently used by any
 			// Tuned CR; remove it and let MCO roll-back any changes
-			klog.V(2).Infof("pruneMachineConfigsHyperShift(): deleting ConfigMap %s", cm.ObjectMeta.Name)
-			err = c.clients.ManagementKube.CoreV1().ConfigMaps(ntoconfig.OperatorNamespace()).Delete(context.TODO(), cm.ObjectMeta.Name, metav1.DeleteOptions{})
+			klog.V(2).Infof("pruneMachineConfigsHyperShift(): deleting ConfigMap %s", cm.Name)
+			err = c.clients.ManagementKube.CoreV1().ConfigMaps(ntoconfig.OperatorNamespace()).Delete(context.TODO(), cm.Name, metav1.DeleteOptions{})
 			if err != nil {
 				// Unable to delete the ConfigMap
 				return err
 			}
-			klog.Infof("deleted MachineConfig ConfigMap %s", cm.ObjectMeta.Name)
+			klog.Infof("deleted MachineConfig ConfigMap %s", cm.Name)
 		}
 	}
 

pkg/operator/hypershift.go

@@ -60,15 +60,15 @@ func (c *Controller) syncHostedClusterTuneds() error {
 			klog.V(1).Infof("hosted cluster already contains Tuned %v from ConfigMap", tunedName)
 			if reflect.DeepEqual(cmTuned.Spec.Profile, hcTuned.Spec.Profile) &&
 				reflect.DeepEqual(cmTuned.Spec.Recommend, hcTuned.Spec.Recommend) &&
-				reflect.DeepEqual(cmTuned.ObjectMeta.Labels, hcTuned.ObjectMeta.Labels) {
-				klog.V(2).Infof("hosted cluster version of Tuned %v matches the ConfigMap %s config", tunedName, cmTuned.ObjectMeta.Name)
+				reflect.DeepEqual(cmTuned.Labels, hcTuned.Labels) {
+				klog.V(2).Infof("hosted cluster version of Tuned %v matches the ConfigMap %s config", tunedName, cmTuned.Name)
 			} else {
 				// This Tuned exists in the hosted cluster but is out-of-sync with the management configuration
 				newTuned := hcTuned.DeepCopy() // never update the objects from cache
 				newTuned.Spec.Profile = cmTuned.Spec.Profile
 				newTuned.Spec.Recommend = cmTuned.Spec.Recommend
 
-				klog.V(2).Infof("updating Tuned %v from ConfigMap %s", tunedName, cmTuned.ObjectMeta.Name)
+				klog.V(2).Infof("updating Tuned %v from ConfigMap %s", tunedName, cmTuned.Name)
 				_, err = c.clients.Tuned.TunedV1().Tuneds(ntoconfig.WatchNamespace()).Update(context.TODO(), newTuned, metav1.UpdateOptions{})
 				if err != nil {
 					if errors.IsInvalid(err) {
@@ -83,7 +83,7 @@ func (c *Controller) syncHostedClusterTuneds() error {
 			delete(hcTunedMap, tunedName)
 			delete(cmTunedMap, tunedName)
 		} else {
-			klog.V(1).Infof("need to create Tuned %v based on ConfigMap %s", cmTuned.ObjectMeta.Name, tunedName)
+			klog.V(1).Infof("need to create Tuned %v based on ConfigMap %s", cmTuned.Name, tunedName)
 			// Create the Tuned in the hosted cluster from the config in ConfigMap
 			newTuned := cmTuned.DeepCopy()
 			_, err := c.clients.Tuned.TunedV1().Tuneds(ntoconfig.WatchNamespace()).Create(context.TODO(), newTuned, metav1.CreateOptions{})
@@ -135,31 +135,31 @@ func (c *Controller) getObjFromTunedConfigMap() ([]tunedv1.Tuned, error) {
 		if !ok {
 			tunedConfig, ok = cm.Data[tunedConfigMapConfigKeyDeprecated]
 			if !ok {
-				klog.Warningf("ConfigMap %s has no data in field %s or %s (deprecated). Expected Tuned manifests.", cm.ObjectMeta.Name, tuningConfigMapConfigKey, tunedConfigMapConfigKeyDeprecated)
+				klog.Warningf("ConfigMap %s has no data in field %s or %s (deprecated). Expected Tuned manifests.", cm.Name, tuningConfigMapConfigKey, tunedConfigMapConfigKeyDeprecated)
 				continue
 			} else {
-				klog.Infof("Deprecated key %s used in ConfigMap %s", tunedConfigMapConfigKeyDeprecated, cm.ObjectMeta.Name)
+				klog.Infof("Deprecated key %s used in ConfigMap %s", tunedConfigMapConfigKeyDeprecated, cm.Name)
 			}
 		}
 
 		cmNodePoolNamespacedName, ok := cm.Annotations[hypershiftNodePoolLabel]
 		if !ok {
-			klog.Warningf("failed to parseTunedManifests in ConfigMap %s, no label %s", cm.ObjectMeta.Name, hypershiftNodePoolLabel)
+			klog.Warningf("failed to parseTunedManifests in ConfigMap %s, no label %s", cm.Name, hypershiftNodePoolLabel)
 			continue
 		}
 		nodePoolName := parseNamespacedName(cmNodePoolNamespacedName)
 
 		tunedsFromConfigMap, err := parseTunedManifests([]byte(tunedConfig), nodePoolName)
 		if err != nil {
-			klog.Warningf("failed to parseTunedManifests in ConfigMap %s: %v", cm.ObjectMeta.Name, err)
+			klog.Warningf("failed to parseTunedManifests in ConfigMap %s: %v", cm.Name, err)
 			continue
 		}
 
 		tunedsFromConfigMapUnique := []tunedv1.Tuned{}
 		for j, t := range tunedsFromConfigMap {
-			tunedObjectName := tunedsFromConfigMap[j].ObjectMeta.Name
+			tunedObjectName := tunedsFromConfigMap[j].Name
 			if seenTunedObject[tunedObjectName] {
-				klog.Warningf("ignoring duplicate Tuned Profile %s in ConfigMap %s", tunedObjectName, cm.ObjectMeta.Name)
+				klog.Warningf("ignoring duplicate Tuned Profile %s in ConfigMap %s", tunedObjectName, cm.Name)
 				continue
 			}
 			seenTunedObject[tunedObjectName] = true
@@ -203,7 +203,7 @@ func parseTunedManifests(data []byte, nodePoolName string) ([]tunedv1.Tuned, err
 		}
 		// Make Tuned names unique if a Tuned is duplicated across NodePools
 		// for example, if one ConfigMap is referenced in multiple NodePools
-		t.SetName(MakeTunedUniqueName(t.ObjectMeta.Name, nodePoolName))
+		t.SetName(MakeTunedUniqueName(t.Name, nodePoolName))
 		klog.V(2).Infof("parseTunedManifests: name: %s", t.GetName())
 
 		// Propagate NodePool name from ConfigMap down to Tuned object
@@ -221,7 +221,7 @@ func mcConfigMapName(name string) string {
 
 func hashStruct(o interface{}) string {
 	hash := fnv.New32a()
-	hash.Write([]byte(fmt.Sprintf("%v", o)))
+	fmt.Fprintf(hash, "%v", o)
 	intHash := hash.Sum32()
 	return fmt.Sprintf("%08x", intHash)
 }