fix deprecation of NewSimpleClientset by using NewClientset or ignoring

This commit is contained in:
Ryan Richard
2025-12-19 12:00:56 -08:00
parent 10444fb9a3
commit 9d1c65c3e6
48 changed files with 180 additions and 118 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2022-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package oidcclientwatcher
@@ -63,10 +63,11 @@ func TestOIDCClientWatcherControllerFilterSecret(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
oidcClientsInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().OIDCClients()
@@ -132,10 +133,11 @@ func TestOIDCClientWatcherControllerFilterOIDCClient(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
oidcClientsInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().OIDCClients()
@@ -956,10 +958,12 @@ func TestOIDCClientWatcherControllerSync(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputObjects...)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClientForInformers := supervisorfake.NewSimpleClientset(tt.inputObjects...)
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClientForInformers, 0)
fakeKubeClient := kubernetesfake.NewSimpleClientset(tt.inputSecrets...)
fakeKubeClient := kubernetesfake.NewClientset(tt.inputSecrets...)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(fakeKubeClient, 0)
controller := NewOIDCClientWatcherController(