Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-0.13] Bump kubernetes to v1.28.1 #1318

Merged
merged 5 commits into from
Aug 30, 2023
Merged

[release-0.13] Bump kubernetes to v1.28.1 #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5593a49
go.mod: update kubernetes to v1.28.1
marquiz Aug 29, 2023
7d1b0bc
pkg/podres: update mocked PodResourcesListerClient
marquiz Apr 18, 2023
7c08f44
test/e2e: use proper context
marquiz Apr 18, 2023
f64467b
test/e2e: adapt tests to updates in k8s e2e-framework
marquiz Apr 18, 2023
713fa91
test/e2e: align with latest kubernetes code base
marquiz Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 126 additions & 120 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

511 changes: 288 additions & 223 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/podres/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
78 changes: 0 additions & 78 deletions pkg/podres/mock_PodResourcesListerClient.go
View file
Open in desktop

This file was deleted.

132 changes: 132 additions & 0 deletions pkg/podres/mocks/PodResourcesListerClient.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/resourcemonitor/podresourcesscanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading