github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-18 01:01:05 +00:00
Code Issues Projects Releases Wiki Activity

chore: depr. pointer pkg replacement for the reflactor

Browse Source 
Kubernetes-commit: 9345552274d2999c59a609488d0673edbb3a246e
This commit is contained in:
PatrickLaabs 2025-07-03 11:27:00 +02:00 committed by Kubernetes Publisher
parent 2cfeed63b2
commit 735f105e54
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/cache/reflector.go vendored
View File

@ -42,7 +42,7 @@ import (
"k8s.io/client-go/tools/pager" "k8s.io/client-go/tools/pager"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/utils/clock" "k8s.io/utils/clock"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
"k8s.io/utils/trace" "k8s.io/utils/trace"
) )
@ -749,7 +749,7 @@ func (r *Reflector) watchList(ctx context.Context) (watch.Interface, error) {
options := metav1.ListOptions{ options := metav1.ListOptions{
ResourceVersion: lastKnownRV, ResourceVersion: lastKnownRV,
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: &timeoutSeconds, TimeoutSeconds: &timeoutSeconds,
} }

68
tools/cache/reflector_watchlist_test.go vendored
View File

@ -40,7 +40,7 @@ import (
clientfeaturestesting "k8s.io/client-go/features/testing" clientfeaturestesting "k8s.io/client-go/features/testing"
"k8s.io/klog/v2/ktesting" "k8s.io/klog/v2/ktesting"
testingclock "k8s.io/utils/clock/testing" testingclock "k8s.io/utils/clock/testing"
"k8s.io/utils/pointer" "k8s.io/utils/ptr"
) )
func TestInitialEventsEndBookmarkTicker(t *testing.T) { func TestInitialEventsEndBookmarkTicker(t *testing.T) {
@ -143,10 +143,10 @@ func TestWatchList(t *testing.T) {
closeAfterWatchEvents: 1, closeAfterWatchEvents: 1,
expectedWatchRequests: 1, expectedWatchRequests: 1,
expectedRequestOptions: []metav1.ListOptions{{ expectedRequestOptions: []metav1.ListOptions{{
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}}, }},
}, },
{ {
@ -167,7 +167,7 @@ func TestWatchList(t *testing.T) {
{ {
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersion: "1", ResourceVersion: "1",
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}}, }},
expectedStoreContent: []v1.Pod{*makePod("p1", "1")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1")},
}, },
@ -190,10 +190,10 @@ func TestWatchList(t *testing.T) {
expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")},
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
ResourceVersion: "0", ResourceVersion: "0",
@ -202,7 +202,7 @@ func TestWatchList(t *testing.T) {
{ {
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersion: "1", ResourceVersion: "1",
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
}, },
@ -225,10 +225,10 @@ func TestWatchList(t *testing.T) {
expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")},
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
ResourceVersion: "0", ResourceVersion: "0",
@ -237,7 +237,7 @@ func TestWatchList(t *testing.T) {
{ {
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersion: "1", ResourceVersion: "1",
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
}, },
@ -256,10 +256,10 @@ func TestWatchList(t *testing.T) {
}, },
expectedWatchRequests: 1, expectedWatchRequests: 1,
expectedRequestOptions: []metav1.ListOptions{{ expectedRequestOptions: []metav1.ListOptions{{
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}}, }},
expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2")},
}, },
@ -271,7 +271,7 @@ func TestWatchList(t *testing.T) {
{Type: watch.Added, Object: makePod("p2", "2")}, {Type: watch.Added, Object: makePod("p2", "2")},
{Type: watch.Modified, Object: func() runtime.Object { {Type: watch.Modified, Object: func() runtime.Object {
p1 := makePod("p1", "3") p1 := makePod("p1", "3")
p1.Spec.ActiveDeadlineSeconds = pointer.Int64(12) p1.Spec.ActiveDeadlineSeconds = ptr.To[int64](12)
return p1 return p1
}()}, }()},
{Type: watch.Added, Object: makePod("p3", "4")}, {Type: watch.Added, Object: makePod("p3", "4")},
@ -285,16 +285,16 @@ func TestWatchList(t *testing.T) {
}, },
expectedWatchRequests: 1, expectedWatchRequests: 1,
expectedRequestOptions: []metav1.ListOptions{{ expectedRequestOptions: []metav1.ListOptions{{
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}}, }},
expectedStoreContent: []v1.Pod{ expectedStoreContent: []v1.Pod{
*makePod("p2", "2"), *makePod("p2", "2"),
func() v1.Pod { func() v1.Pod {
p1 := *makePod("p1", "3") p1 := *makePod("p1", "3")
p1.Spec.ActiveDeadlineSeconds = pointer.Int64(12) p1.Spec.ActiveDeadlineSeconds = ptr.To[int64](12)
return p1 return p1
}(), }(),
}, },
@ -324,22 +324,22 @@ func TestWatchList(t *testing.T) {
expectedWatchRequests: 3, expectedWatchRequests: 3,
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
expectedStoreContent: []v1.Pod{*makePod("p1", "1")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1")},
@ -362,16 +362,16 @@ func TestWatchList(t *testing.T) {
expectedWatchRequests: 2, expectedWatchRequests: 2,
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
expectedStoreContent: []v1.Pod{*makePod("p1", "1")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1")},
@ -396,15 +396,15 @@ func TestWatchList(t *testing.T) {
expectedWatchRequests: 2, expectedWatchRequests: 2,
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersion: "3", ResourceVersion: "3",
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2"), *makePod("p3", "3"), *makePod("p4", "4")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p2", "2"), *makePod("p3", "3"), *makePod("p4", "4")},
@ -435,15 +435,15 @@ func TestWatchList(t *testing.T) {
expectedWatchRequests: 2, expectedWatchRequests: 2,
expectedRequestOptions: []metav1.ListOptions{ expectedRequestOptions: []metav1.ListOptions{
{ {
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
{ {
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersion: "3", ResourceVersion: "3",
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}, },
}, },
expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p3", "3")}, expectedStoreContent: []v1.Pod{*makePod("p1", "1"), *makePod("p3", "3")},
@ -464,10 +464,10 @@ func TestWatchList(t *testing.T) {
}, },
expectedWatchRequests: 1, expectedWatchRequests: 1,
expectedRequestOptions: []metav1.ListOptions{{ expectedRequestOptions: []metav1.ListOptions{{
SendInitialEvents: pointer.Bool(true), SendInitialEvents: ptr.To(true),
AllowWatchBookmarks: true, AllowWatchBookmarks: true,
ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
TimeoutSeconds: pointer.Int64(1), TimeoutSeconds: ptr.To[int64](1),
}}, }},
}, },
} }