Merge pull request #439 from openshift-cloud-team/OCPCLOUD-3287-rebase-update-to-k-8-s-1-35-for-cloud-controller-manager-operator

OCPCLOUD-3287: Update to k8s 1.35.1 dependencies

Author: openshift-merge-bot[bot]

.golangci.yaml

@@ -1,13 +1,16 @@
+version: "2"
+
 linters:
   # https://golangci-lint.run/usage/linters/#enabled-by-default-linters
   enable:
     # default linters
     - errcheck
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
     - unused
-    # optional linters
+
+formatters:
+  enable:
     - goimports
 

Makefile

@@ -8,7 +8,7 @@ ENVTEST_K8S_VERSION = 1.33.2
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
 ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest
-GOLANGCI_LINT = go run ${PROJECT_DIR}/vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+GOLANGCI_LINT = go run ${PROJECT_DIR}/vendor/github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
 HOME ?= /tmp/kubebuilder-testing
 ifeq ($(HOME), /)

cmd/azure-config-credentials-injector/credentials_injector_test.go

@@ -29,15 +29,21 @@ func executeCommandC(root *cobra.Command, args ...string) (c *cobra.Command, out
 func Test_mergeCloudConfig(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "cccmo-azure-creds-injector")
 	require.NoError(t, err)
-	defer os.Remove(tmpDir)
+	defer func() {
+		require.NoError(t, os.RemoveAll(tmpDir))
+	}()
 
 	inputFile, err := os.CreateTemp(tmpDir, "dummy-config")
 	require.NoError(t, err)
-	defer os.Remove(inputFile.Name())
+	defer func() {
+		require.NoError(t, os.Remove(inputFile.Name()))
+	}()
 
 	outputFile, err := os.CreateTemp(tmpDir, "dummy-config-merged")
 	require.NoError(t, err)
-	defer os.Remove(outputFile.Name())
+	defer func() {
+		require.NoError(t, os.Remove(outputFile.Name()))
+	}()
 
 	cleanupEnv := func(envVars map[string]string) {
 		for envVarName := range envVars {

cmd/cluster-cloud-controller-manager-operator/main.go

@@ -257,7 +257,7 @@ func main() {
 	if err = (&controllers.CloudOperatorReconciler{
 		ClusterOperatorStatusClient: controllers.ClusterOperatorStatusClient{
 			Client:           mgr.GetClient(),
-			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator"),
+			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator"), //nolint:staticcheck // manager expects legacy recorder interface here
 			Clock:            mgrClock,
 			ReleaseVersion:   controllers.GetReleaseVersion(),
 			ManagedNamespace: *managedNamespace,

cmd/config-sync-controllers/main.go

@@ -177,7 +177,7 @@ func main() {
 	if err = (&controllers.CloudConfigReconciler{
 		ClusterOperatorStatusClient: controllers.ClusterOperatorStatusClient{
 			Client:           mgr.GetClient(),
-			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator-cloud-config-sync-controller"),
+			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator-cloud-config-sync-controller"), //nolint:staticcheck // manager expects legacy recorder interface here
 			Clock:            sharedClock,
 			ReleaseVersion:   controllers.GetReleaseVersion(),
 			ManagedNamespace: *managedNamespace,
@@ -192,7 +192,7 @@ func main() {
 	if err = (&controllers.TrustedCABundleReconciler{
 		ClusterOperatorStatusClient: controllers.ClusterOperatorStatusClient{
 			Client:           mgr.GetClient(),
-			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator-ca-sync-controller"),
+			Recorder:         mgr.GetEventRecorderFor("cloud-controller-manager-operator-ca-sync-controller"), //nolint:staticcheck // manager expects legacy recorder interface here
 			Clock:            sharedClock,
 			ReleaseVersion:   controllers.GetReleaseVersion(),
 			ManagedNamespace: *managedNamespace,

go.mod

@@ -87,7 +87,9 @@ func TestGetImagesFromJSONFile(t *testing.T) {
 				file, err := os.CreateTemp(os.TempDir(), tc.path)
 				path = file.Name()
 				assert.NoError(t, err)
-				defer file.Close()
+				defer func() {
+					assert.NoError(t, file.Close())
+				}()
 
 				_, err = file.WriteString(tc.imagesContent)
 				assert.NoError(t, err)
@@ -309,7 +311,9 @@ func TestComposeConfig(t *testing.T) {
 			file, err := os.CreateTemp(os.TempDir(), "images")
 			path := file.Name()
 			assert.NoError(t, err)
-			defer file.Close()
+			defer func() {
+				assert.NoError(t, file.Close())
+			}()
 
 			if tc.imagesContent == "" {
 				tc.imagesContent = defaultImagesFileContent

go.sum

@@ -20,7 +20,6 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	coreclientv1 "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
@@ -67,7 +66,7 @@ func setSpecHashAnnotation(objMeta *metav1.ObjectMeta, spec interface{}) error {
 }
 
 // ApplyResource applies resources of unspecified type
-func ApplyResource(ctx context.Context, client coreclientv1.Client, recorder record.EventRecorder, resource client.Object) (bool, error) {
+func ApplyResource(ctx context.Context, client coreclientv1.Client, recorder record.EventRecorder, resource coreclientv1.Object) (bool, error) {
 	switch t := resource.(type) {
 	case *appsv1.Deployment:
 		return applyDeployment(ctx, client, recorder, t)
@@ -202,10 +201,7 @@ func applyDeployment(ctx context.Context, client coreclientv1.Client, recorder r
 
 	// Check if deployment recreation needed
 	// Currently it is necessary if pod selector was changed
-	needRecreate := false
-	if !reflect.DeepEqual(existingCopy.Spec.Selector, required.Spec.Selector) {
-		needRecreate = true
-	}
+	needRecreate := !reflect.DeepEqual(existingCopy.Spec.Selector, required.Spec.Selector)
 	if needRecreate {
 		klog.Infof("Deployment need to be recreated with new parameters")
 		recorder.Event(
@@ -291,10 +287,7 @@ func applyDaemonSet(ctx context.Context, client coreclientv1.Client, recorder re
 
 	// Check if ds recreation needed
 	// Currently it is necessary if pod selector was changed
-	needRecreate := false
-	if !reflect.DeepEqual(existingCopy.Spec.Selector, required.Spec.Selector) {
-		needRecreate = true
-	}
+	needRecreate := !reflect.DeepEqual(existingCopy.Spec.Selector, required.Spec.Selector)
 	if needRecreate {
 		klog.Infof("DaemonSet need to be recreated with new parameters")
 		recorder.Event(

pkg/config/config_test.go

@@ -132,7 +132,7 @@ func TestOperatorSetStatusProgressing(t *testing.T) {
 		err = optr.setStatusProgressing(context.TODO(), nil)
 		assert.NoErrorf(t, err, "Failed to set Progressing status on ClusterOperator")
 
-		err = optr.Client.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
+		err = optr.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
 		assert.NoErrorf(t, err, "Failed to fetch ClusterOperator")
 		var conditionAfterAnotherSync configv1.ClusterOperatorStatusCondition
 		for _, coCondition := range gotCO.Status.Conditions {
@@ -261,7 +261,7 @@ func TestOperatorSetStatusDegraded(t *testing.T) {
 		err = optr.setStatusDegraded(context.TODO(), tc.passErr, nil)
 		assert.NoErrorf(t, err, "Failed to set Degraded status on ClusterOperator")
 
-		err = optr.Client.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
+		err = optr.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
 		assert.NoErrorf(t, err, "Failed to fetch ClusterOperator")
 
 		var conditionAfterAnotherSync configv1.ClusterOperatorStatusCondition
@@ -408,7 +408,7 @@ func TestOperatorSetStatusAvailable(t *testing.T) {
 		err = optr.setStatusAvailable(context.TODO(), tc.overrides)
 		assert.NoErrorf(t, err, "Failed to set Available status on ClusterOperator")
 
-		err = optr.Client.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
+		err = optr.Get(context.TODO(), client.ObjectKey{Name: clusterOperatorName}, gotCO)
 		assert.NoErrorf(t, err, "Failed to fetch ClusterOperator")
 
 		var conditionAfterAnotherSync configv1.ClusterOperatorStatusCondition