Bump ci lint and mockery version (kptdev#469)

Signed-off-by: aravind.est <aravindhan.a@est.tech>

Author: aravindtga

make/go.mk

@@ -1,4 +1,4 @@
-#  Copyright 2025 The Nephio Authors.
+#  Copyright 2025-2026 The Nephio Authors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 # Core Go development tools
 
-GOLANG_CI_VER ?= v2.4.0
+GOLANG_CI_VER ?= v2.10.1
 
 ##@ Go Development
 

make/mocks.mk

@@ -1,4 +1,4 @@
-#  Copyright 2025 The Nephio Authors.
+#  Copyright 2025-2026 The Nephio Authors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 # Mock generation tools
 
-MOCKERY_VERSION=3.6.3
+MOCKERY_VERSION=3.6.4
+
 OS_ARCH ?= $(shell uname -m)
 OS ?= $(shell uname)
 

pkg/cache/testutil/fake_client.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt and Nephio Authors
+// Copyright 2025-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -72,4 +72,4 @@ func (f *FakeClientWithStatusUpdate) Watch(ctx context.Context, list client.Obje
 
 func (f *FakeClientWithStatusUpdate) GetStatusStore() map[types.NamespacedName]configapi.RepositoryStatus {
 	return f.statusStore
-}
+}

pkg/registry/porch/watch_test.go

@@ -1,4 +1,4 @@
-// Copyright 2022, 2024-2025 The kpt and Nephio Authors
+// Copyright 2022, 2024-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -339,13 +339,13 @@ func TestWatcherPeriodicBookmark(t *testing.T) {
 
 done:
 	require.GreaterOrEqual(t, len(bookmarks), 2, "Expected at least 2 bookmarks (initial + periodic)")
-	
+
 	// First should be initial bookmark
 	if obj, ok := bookmarks[0].Object.(*porchapi.PackageRevision); ok {
 		assert.NotNil(t, obj.Annotations)
 		assert.Equal(t, "true", obj.Annotations["k8s.io/initial-events-end"])
 	}
-	
+
 	// Second should be periodic bookmark without annotation
 	if obj, ok := bookmarks[1].Object.(*porchapi.PackageRevision); ok {
 		assert.Empty(t, obj.Annotations, "Periodic bookmark should not have annotations")

test/e2e/api/concurrent_test.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt and Nephio Authors
+// Copyright 2025-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -356,4 +356,4 @@ func (t *PorchSuite) proposeAndApprovePackage(pr *porchapi.PackageRevision) {
 	t.UpdateF(pr)
 	pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
 	t.UpdateApprovalF(pr, metav1.UpdateOptions{})
-}
+}

test/e2e/api/repository_test.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt and Nephio Authors
+// Copyright 2025-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -305,4 +305,4 @@ func (t *PorchSuite) TestPackageRevisionListWithHangingRepository() {
 	if !found {
 		t.Errorf("Expected PackageRevisions from working repository, got none")
 	}
-}
+}

test/e2e/api/rpkg_metadata_test.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt and Nephio Authors
+// Copyright 2025-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ var (
 )
 
 type MetadataTestCase struct {
-	Name       string
-	RepoName   string
-	Setup      func(*PorchSuite, string) *porchapi.PackageRevision
-	Validate   func(*PorchSuite, *porchapi.PackageRevision)
+	Name     string
+	RepoName string
+	Setup    func(*PorchSuite, string) *porchapi.PackageRevision
+	Validate func(*PorchSuite, *porchapi.PackageRevision)
 }
 
 func (t *PorchSuite) TestPackageRevisionMetadata() {
@@ -80,27 +80,27 @@ func (t *PorchSuite) TestPackageRevisionMetadata() {
 				pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
 				t.UpdateF(pr)
 				t.GetF(client.ObjectKey{Namespace: pr.Namespace, Name: pr.Name}, pr)
-				
+
 				t.ValidateLabelsAndAnnos(pr.Name, map[string]string{"kpt.dev/label": "foo"}, map[string]string{"kpt.dev/anno": "foo", "kpt.dev/other-anno": "bar"})
 				pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
 				t.UpdateApprovalF(pr, metav1.UpdateOptions{})
-				
+
 				t.ValidateLabelsAndAnnos(pr.Name, map[string]string{"kpt.dev/label": "foo", porchapi.LatestPackageRevisionKey: porchapi.LatestPackageRevisionValue}, map[string]string{"kpt.dev/anno": "foo", "kpt.dev/other-anno": "bar"})
 				t.GetF(client.ObjectKey{Namespace: pr.Namespace, Name: pr.Name}, pr)
 				delete(pr.Labels, "kpt.dev/label")
 				pr.Labels["kpt.dev/other-label"] = "bar"
 				delete(pr.Annotations, "kpt.dev/other-anno")
 				pr.Spec.Revision = 1
 				t.UpdateF(pr)
-				
+
 				t.ValidateLabelsAndAnnos(pr.Name, map[string]string{"kpt.dev/other-label": "bar", porchapi.LatestPackageRevisionKey: porchapi.LatestPackageRevisionValue}, map[string]string{"kpt.dev/anno": "foo"})
 				clonedPr := t.CreatePackageSkeleton(pr.Spec.RepositoryName, "cloned-package", defaultWorkspace)
 				clonedPr.Spec.Tasks = []porchapi.Task{{
 					Type:  porchapi.TaskTypeClone,
 					Clone: &porchapi.PackageCloneTaskSpec{Upstream: porchapi.UpstreamPackage{UpstreamRef: &porchapi.PackageRevisionRef{Name: pr.Name}}},
 				}}
 				t.CreateF(clonedPr)
-				
+
 				t.ValidateLabelsAndAnnos(clonedPr.Name, map[string]string{}, map[string]string{})
 			},
 		},
@@ -152,10 +152,10 @@ func (t *PorchSuite) TestPackageRevisionGarbageCollection() {
 				t.RegisterGitRepositoryF(t.GetPorchTestRepoURL(), repoName, "", suiteutils.GiteaUser, suiteutils.GiteaPassword)
 				pr := t.CreatePackageDraftF(repoName, "empty-package", "test-workspace")
 				cm := &corev1.ConfigMap{
-					TypeMeta:   metav1.TypeMeta{Kind: configMapGVK.Kind, APIVersion: configMapGVK.GroupVersion().String()},
+					TypeMeta: metav1.TypeMeta{Kind: configMapGVK.Kind, APIVersion: configMapGVK.GroupVersion().String()},
 					ObjectMeta: metav1.ObjectMeta{Name: "cm-cascades", Namespace: t.Namespace, OwnerReferences: []metav1.OwnerReference{
 						{APIVersion: porchapi.SchemeGroupVersion.String(), Kind: suiteutils.PackageRevisionGVK.Kind, Name: pr.Name, UID: pr.UID}}},
-					Data:       map[string]string{"foo": "bar"},
+					Data: map[string]string{"foo": "bar"},
 				}
 				t.CreateF(cm)
 				t.DeleteF(pr)
@@ -409,4 +409,4 @@ func (t *PorchSuite) TestPackageRevisionFinalizers() {
 	readPR.Finalizers = []string{}
 	t.UpdateF(readPR)
 	t.WaitUntilObjectDeleted(suiteutils.PackageRevisionGVK, types.NamespacedName{Name: readPR.Name, Namespace: readPR.Namespace}, 10*time.Second)
-}
+}

test/e2e/performance/performance_suite.go

@@ -1,3 +1,17 @@
+// Copyright 2025-2026 The kpt and Nephio Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package performance
 
 import (
@@ -213,4 +227,4 @@ func (t *PerformanceSuite) CreatePackageDraftF(repository, packageName, workspac
 	}
 	t.CreateF(pr)
 	return pr
-}
+}

test/e2e/suiteutils/git_stub_test_utils.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt and Nephio Authors
+// Copyright 2025-2026 The kpt and Nephio Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -307,8 +307,6 @@ func createLocalGitServer(t *testing.T) GitConfig {
 	}
 }
 
-
-
 func InferGitServerImage(porchImage string) string {
 	slash := strings.LastIndex(porchImage, "/")
 	repo := porchImage[:slash+1]
@@ -334,4 +332,4 @@ func endpointIsReady(endpoints *coreapi.Endpoints) bool {
 		}
 	}
 	return true
-}
+}