Merge pull request #1318 from marquiz/devel/release-0.13-k8s-1.28

[release-0.13] Bump kubernetes to v1.28.1
kubernetes-sigs · Aug 30, 2023 · 9be9259 · 9be9259
2 parents 5fda052 + 713fa91
commit 9be9259
Show file tree

Hide file tree

Showing 15 changed files with 787 additions and 661 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/podres/client.go b/pkg/podres/client.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 package podres
 
+//go:generate mockery --srcpkg=k8s.io/kubelet/pkg/apis/podresources/v1 --name PodResourcesListerClient
+
 import (
 	"fmt"
 	"log"

diff --git a/pkg/podres/mock_PodResourcesListerClient.go b/pkg/podres/mock_PodResourcesListerClient.go
diff --git a/pkg/podres/mocks/PodResourcesListerClient.go b/pkg/podres/mocks/PodResourcesListerClient.go
diff --git a/pkg/resourcemonitor/podresourcesscanner_test.go b/pkg/resourcemonitor/podresourcesscanner_test.go
@@ -33,7 +33,7 @@ import (
 	v1 "k8s.io/kubelet/pkg/apis/podresources/v1"
 
 	"sigs.k8s.io/node-feature-discovery/pkg/apihelper"
-	"sigs.k8s.io/node-feature-discovery/pkg/podres"
+	mockv1 "sigs.k8s.io/node-feature-discovery/pkg/podres/mocks"
 )
 
 func TestPodScanner(t *testing.T) {
@@ -54,7 +54,7 @@ func TestPodScanner(t *testing.T) {
 	}
 
 	Convey("When I scan for pod resources using fake client and no namespace", t, func() {
-		mockPodResClient := new(podres.MockPodResourcesListerClient)
+		mockPodResClient := new(mockv1.PodResourcesListerClient)
 		mockAPIHelper := new(apihelper.MockAPIHelpers)
 		mockClient := &k8sclient.Clientset{}
 		computePodFingerprint := true
@@ -676,7 +676,7 @@ func TestPodScanner(t *testing.T) {
 	})
 
 	Convey("When I scan for pod resources using fake client and given namespace", t, func() {
-		mockPodResClient := new(podres.MockPodResourcesListerClient)
+		mockPodResClient := new(mockv1.PodResourcesListerClient)
 		mockAPIHelper := new(apihelper.MockAPIHelpers)
 		mockClient := &k8sclient.Clientset{}
 		computePodFingerprint := false