From 6565265beed574d19b296f29144b42966e2404d3 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 16 Feb 2021 13:00:08 -0600 Subject: [PATCH] Use new 'go.pinniped.dev/generated/latest' package. Signed-off-by: Matt Moyer --- cmd/pinniped-supervisor/main.go | 6 +++--- cmd/pinniped/cmd/kubeconfig.go | 4 ++-- cmd/pinniped/cmd/kubeconfig_test.go | 6 +++--- go.mod | 7 ------- internal/concierge/server/server.go | 4 ++-- internal/concierge/server/server_test.go | 4 ++-- .../controller/apicerts/apiservice_updater_test.go | 2 +- .../controller/apicerts/update_api_service_test.go | 2 +- internal/controller/authenticator/authenticator.go | 2 +- internal/controller/authenticator/authncache/cache.go | 2 +- .../controller/authenticator/authncache/cache_test.go | 4 ++-- .../authenticator/cachecleaner/cachecleaner.go | 4 ++-- .../authenticator/cachecleaner/cachecleaner_test.go | 6 +++--- .../authenticator/jwtcachefiller/jwtcachefiller.go | 4 ++-- .../jwtcachefiller/jwtcachefiller_test.go | 6 +++--- .../webhookcachefiller/webhookcachefiller.go | 4 ++-- .../webhookcachefiller/webhookcachefiller_test.go | 6 +++--- .../create_or_update_credential_issuer_config.go | 4 ++-- .../create_or_update_credential_issuer_config_test.go | 4 ++-- .../issuerconfig/kube_config_info_publisher.go | 4 ++-- .../issuerconfig/kube_config_info_publisher_test.go | 4 ++-- internal/controller/kubecertagent/annotater.go | 2 +- internal/controller/kubecertagent/annotater_test.go | 4 ++-- internal/controller/kubecertagent/creater.go | 2 +- internal/controller/kubecertagent/creater_test.go | 4 ++-- internal/controller/kubecertagent/execer.go | 2 +- internal/controller/kubecertagent/execer_test.go | 4 ++-- internal/controller/kubecertagent/kubecertagent.go | 4 ++-- .../supervisorconfig/federation_domain_watcher.go | 6 +++--- .../supervisorconfig/federation_domain_watcher_test.go | 6 +++--- .../generator/federation_domain_secrets.go | 6 +++--- .../generator/federation_domain_secrets_test.go | 6 +++--- .../supervisorconfig/generator/secret_helper.go | 2 +- .../supervisorconfig/generator/secret_helper_test.go | 2 +- internal/controller/supervisorconfig/jwks_observer.go | 2 +- .../controller/supervisorconfig/jwks_observer_test.go | 6 +++--- internal/controller/supervisorconfig/jwks_writer.go | 6 +++--- .../controller/supervisorconfig/jwks_writer_test.go | 6 +++--- .../controller/supervisorconfig/tls_cert_observer.go | 2 +- .../supervisorconfig/tls_cert_observer_test.go | 6 +++--- .../upstreamwatcher/upstreamwatcher.go | 6 +++--- .../upstreamwatcher/upstreamwatcher_test.go | 6 +++--- internal/controllermanager/prepare_controllers.go | 6 +++--- internal/groupsuffix/groupsuffix.go | 2 +- internal/groupsuffix/groupsuffix_test.go | 6 +++--- internal/kubeclient/kubeclient.go | 8 ++++---- internal/kubeclient/kubeclient_test.go | 4 ++-- internal/kubeclient/path_test.go | 4 ++-- internal/kubeclient/scheme_test.go | 8 ++++---- .../credentialrequestmocks/credentialrequestmocks.go | 2 +- internal/mocks/mocksecrethelper/mocksecrethelper.go | 2 +- internal/registry/credentialrequest/rest.go | 2 +- internal/registry/credentialrequest/rest_test.go | 2 +- internal/testutil/fakekubeapi/fakekubeapi.go | 4 ++-- pkg/conciergeclient/conciergeclient.go | 6 +++--- pkg/conciergeclient/conciergeclient_test.go | 2 +- test/integration/concierge_api_serving_certs_test.go | 2 +- .../concierge_credentialissuerconfig_test.go | 2 +- test/integration/concierge_credentialrequest_test.go | 4 ++-- test/integration/e2e_test.go | 6 +++--- test/integration/kubeclient_test.go | 4 ++-- test/integration/supervisor_discovery_test.go | 4 ++-- test/integration/supervisor_login_test.go | 4 ++-- test/integration/supervisor_secrets_test.go | 2 +- test/integration/supervisor_upstream_test.go | 2 +- test/library/client.go | 10 +++++----- test/library/env.go | 2 +- 67 files changed, 136 insertions(+), 143 deletions(-) diff --git a/cmd/pinniped-supervisor/main.go b/cmd/pinniped-supervisor/main.go index 199a8e7b..1f23e672 100644 --- a/cmd/pinniped-supervisor/main.go +++ b/cmd/pinniped-supervisor/main.go @@ -26,9 +26,9 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/klogr" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/config/supervisor" "go.pinniped.dev/internal/controller/supervisorconfig" "go.pinniped.dev/internal/controller/supervisorconfig/generator" diff --git a/cmd/pinniped/cmd/kubeconfig.go b/cmd/pinniped/cmd/kubeconfig.go index 1dd43074..536a2e17 100644 --- a/cmd/pinniped/cmd/kubeconfig.go +++ b/cmd/pinniped/cmd/kubeconfig.go @@ -24,8 +24,8 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth" // Adds handlers for various dynamic auth plugins in client-go - conciergev1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - conciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + conciergev1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" "go.pinniped.dev/internal/groupsuffix" "go.pinniped.dev/internal/kubeclient" ) diff --git a/cmd/pinniped/cmd/kubeconfig_test.go b/cmd/pinniped/cmd/kubeconfig_test.go index 6bb4c519..540f7711 100644 --- a/cmd/pinniped/cmd/kubeconfig_test.go +++ b/cmd/pinniped/cmd/kubeconfig_test.go @@ -19,9 +19,9 @@ import ( kubetesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/clientcmd" - conciergev1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - conciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" - fakeconciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + conciergev1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" + fakeconciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/here" "go.pinniped.dev/internal/testutil" diff --git a/go.mod b/go.mod index 17386d76..86efb60b 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,6 @@ require ( github.com/spf13/cobra v1.1.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 - go.pinniped.dev/generated/1.20/apis v0.0.0-00010101000000-000000000000 - go.pinniped.dev/generated/1.20/client v0.0.0-00010101000000-000000000000 golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sync v0.0.0-20201207232520-09787c993a3a @@ -49,8 +47,3 @@ require ( k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) - -replace ( - go.pinniped.dev/generated/1.20/apis => ./generated/1.20/apis - go.pinniped.dev/generated/1.20/client => ./generated/1.20/client -) diff --git a/internal/concierge/server/server.go b/internal/concierge/server/server.go index dbcafb0a..3975d853 100644 --- a/internal/concierge/server/server.go +++ b/internal/concierge/server/server.go @@ -19,8 +19,8 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/certauthority/dynamiccertauthority" "go.pinniped.dev/internal/concierge/apiserver" "go.pinniped.dev/internal/config/concierge" diff --git a/internal/concierge/server/server_test.go b/internal/concierge/server/server_test.go index 258e914e..3bc27181 100644 --- a/internal/concierge/server/server_test.go +++ b/internal/concierge/server/server_test.go @@ -18,8 +18,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/groupsuffix" ) diff --git a/internal/controller/apicerts/apiservice_updater_test.go b/internal/controller/apicerts/apiservice_updater_test.go index 3c97def2..8454170f 100644 --- a/internal/controller/apicerts/apiservice_updater_test.go +++ b/internal/controller/apicerts/apiservice_updater_test.go @@ -22,7 +22,7 @@ import ( apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" aggregatorfake "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/apicerts/update_api_service_test.go b/internal/controller/apicerts/update_api_service_test.go index 7ac232fc..9d7bce4d 100644 --- a/internal/controller/apicerts/update_api_service_test.go +++ b/internal/controller/apicerts/update_api_service_test.go @@ -17,7 +17,7 @@ import ( apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" aggregatorv1fake "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" ) func TestUpdateAPIService(t *testing.T) { diff --git a/internal/controller/authenticator/authenticator.go b/internal/controller/authenticator/authenticator.go index 155496c7..14af741d 100644 --- a/internal/controller/authenticator/authenticator.go +++ b/internal/controller/authenticator/authenticator.go @@ -7,7 +7,7 @@ package authenticator import ( "encoding/base64" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" ) // Closer is a type that can be closed idempotently. diff --git a/internal/controller/authenticator/authncache/cache.go b/internal/controller/authenticator/authncache/cache.go index 24269cff..5aa31004 100644 --- a/internal/controller/authenticator/authncache/cache.go +++ b/internal/controller/authenticator/authncache/cache.go @@ -13,7 +13,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog/v2" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" "go.pinniped.dev/internal/constable" "go.pinniped.dev/internal/plog" ) diff --git a/internal/controller/authenticator/authncache/cache_test.go b/internal/controller/authenticator/authncache/cache_test.go index df383b31..74494534 100644 --- a/internal/controller/authenticator/authncache/cache_test.go +++ b/internal/controller/authenticator/authncache/cache_test.go @@ -17,8 +17,8 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - authv1alpha "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" + authv1alpha "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" "go.pinniped.dev/internal/mocks/mocktokenauthenticator" ) diff --git a/internal/controller/authenticator/cachecleaner/cachecleaner.go b/internal/controller/authenticator/cachecleaner/cachecleaner.go index 348b2ed7..9a789b27 100644 --- a/internal/controller/authenticator/cachecleaner/cachecleaner.go +++ b/internal/controller/authenticator/cachecleaner/cachecleaner.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog/v2" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - authinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions/authentication/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + authinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions/authentication/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controller/authenticator" "go.pinniped.dev/internal/controller/authenticator/authncache" diff --git a/internal/controller/authenticator/cachecleaner/cachecleaner_test.go b/internal/controller/authenticator/cachecleaner/cachecleaner_test.go index 72b42745..4bac5be5 100644 --- a/internal/controller/authenticator/cachecleaner/cachecleaner_test.go +++ b/internal/controller/authenticator/cachecleaner/cachecleaner_test.go @@ -13,9 +13,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - authv1alpha "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions" + authv1alpha "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/mocks/mocktokenauthenticatorcloser" diff --git a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go index edbaca85..de1bf15c 100644 --- a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go +++ b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go @@ -18,8 +18,8 @@ import ( "k8s.io/apiserver/plugin/pkg/authenticator/token/oidc" "k8s.io/klog/v2" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - authinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions/authentication/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + authinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions/authentication/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" pinnipedauthenticator "go.pinniped.dev/internal/controller/authenticator" "go.pinniped.dev/internal/controller/authenticator/authncache" diff --git a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go index 9d3c342f..6e53876b 100644 --- a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go +++ b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/mocks/mocktokenauthenticatorcloser" diff --git a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go index 732f1a89..d8a897c7 100644 --- a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go +++ b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go @@ -19,8 +19,8 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/klog/v2" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - authinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions/authentication/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + authinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions/authentication/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" pinnipedauthenticator "go.pinniped.dev/internal/controller/authenticator" "go.pinniped.dev/internal/controller/authenticator/authncache" diff --git a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go index da6fe20f..b2dcbf84 100644 --- a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go +++ b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go @@ -19,9 +19,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" diff --git a/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go b/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go index 1aff2208..7d936b3a 100644 --- a/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go +++ b/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" ) func CreateOrUpdateCredentialIssuerStatus( diff --git a/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go b/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go index 1b1c865a..beb20e56 100644 --- a/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go +++ b/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go @@ -19,8 +19,8 @@ import ( coretesting "k8s.io/client-go/testing" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" ) func TestCreateOrUpdateCredentialIssuerStatus(t *testing.T) { diff --git a/internal/controller/issuerconfig/kube_config_info_publisher.go b/internal/controller/issuerconfig/kube_config_info_publisher.go index 494a6376..5a940811 100644 --- a/internal/controller/issuerconfig/kube_config_info_publisher.go +++ b/internal/controller/issuerconfig/kube_config_info_publisher.go @@ -12,8 +12,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/plog" diff --git a/internal/controller/issuerconfig/kube_config_info_publisher_test.go b/internal/controller/issuerconfig/kube_config_info_publisher_test.go index bea11703..c11c8758 100644 --- a/internal/controller/issuerconfig/kube_config_info_publisher_test.go +++ b/internal/controller/issuerconfig/kube_config_info_publisher_test.go @@ -20,8 +20,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/here" "go.pinniped.dev/internal/testutil" diff --git a/internal/controller/kubecertagent/annotater.go b/internal/controller/kubecertagent/annotater.go index 5d261827..5ccf95ff 100644 --- a/internal/controller/kubecertagent/annotater.go +++ b/internal/controller/kubecertagent/annotater.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog/v2" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/plog" diff --git a/internal/controller/kubecertagent/annotater_test.go b/internal/controller/kubecertagent/annotater_test.go index f59fe1a3..164cb7b0 100644 --- a/internal/controller/kubecertagent/annotater_test.go +++ b/internal/controller/kubecertagent/annotater_test.go @@ -22,8 +22,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/kubecertagent/creater.go b/internal/controller/kubecertagent/creater.go index 560d77a0..4db1ba06 100644 --- a/internal/controller/kubecertagent/creater.go +++ b/internal/controller/kubecertagent/creater.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" "go.pinniped.dev/internal/constable" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" diff --git a/internal/controller/kubecertagent/creater_test.go b/internal/controller/kubecertagent/creater_test.go index e9592519..18df3e1f 100644 --- a/internal/controller/kubecertagent/creater_test.go +++ b/internal/controller/kubecertagent/creater_test.go @@ -22,8 +22,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/kubecertagent/execer.go b/internal/controller/kubecertagent/execer.go index 5ec6570e..457fd5c1 100644 --- a/internal/controller/kubecertagent/execer.go +++ b/internal/controller/kubecertagent/execer.go @@ -12,7 +12,7 @@ import ( corev1informers "k8s.io/client-go/informers/core/v1" "k8s.io/klog/v2" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/dynamiccert" diff --git a/internal/controller/kubecertagent/execer_test.go b/internal/controller/kubecertagent/execer_test.go index 5b3d8d58..774e0c92 100644 --- a/internal/controller/kubecertagent/execer_test.go +++ b/internal/controller/kubecertagent/execer_test.go @@ -23,8 +23,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/fake" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/dynamiccert" "go.pinniped.dev/internal/testutil" diff --git a/internal/controller/kubecertagent/kubecertagent.go b/internal/controller/kubecertagent/kubecertagent.go index 0122a5d4..d7921a45 100644 --- a/internal/controller/kubecertagent/kubecertagent.go +++ b/internal/controller/kubecertagent/kubecertagent.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/util/clock" corev1informers "k8s.io/client-go/informers/core/v1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" "go.pinniped.dev/internal/controller/issuerconfig" "go.pinniped.dev/internal/plog" ) diff --git a/internal/controller/supervisorconfig/federation_domain_watcher.go b/internal/controller/supervisorconfig/federation_domain_watcher.go index 670d5ced..d967e19e 100644 --- a/internal/controller/supervisorconfig/federation_domain_watcher.go +++ b/internal/controller/supervisorconfig/federation_domain_watcher.go @@ -16,9 +16,9 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog/v2" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - configinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + configinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/oidc/provider" diff --git a/internal/controller/supervisorconfig/federation_domain_watcher_test.go b/internal/controller/supervisorconfig/federation_domain_watcher_test.go index 34930e81..df4f20d9 100644 --- a/internal/controller/supervisorconfig/federation_domain_watcher_test.go +++ b/internal/controller/supervisorconfig/federation_domain_watcher_test.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/util/clock" coretesting "k8s.io/client-go/testing" - "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/here" "go.pinniped.dev/internal/oidc/provider" diff --git a/internal/controller/supervisorconfig/generator/federation_domain_secrets.go b/internal/controller/supervisorconfig/generator/federation_domain_secrets.go index aa5b5121..406262fd 100644 --- a/internal/controller/supervisorconfig/generator/federation_domain_secrets.go +++ b/internal/controller/supervisorconfig/generator/federation_domain_secrets.go @@ -16,9 +16,9 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog/v2" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - configinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + configinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/plog" diff --git a/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go b/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go index ea8dc374..4fc92a00 100644 --- a/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go +++ b/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go @@ -23,9 +23,9 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/mocks/mocksecrethelper" "go.pinniped.dev/internal/testutil" diff --git a/internal/controller/supervisorconfig/generator/secret_helper.go b/internal/controller/supervisorconfig/generator/secret_helper.go index 29fd4315..9ae700c9 100644 --- a/internal/controller/supervisorconfig/generator/secret_helper.go +++ b/internal/controller/supervisorconfig/generator/secret_helper.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" ) // SecretHelper describes an object that can Generate() a Secret and determine whether a Secret diff --git a/internal/controller/supervisorconfig/generator/secret_helper_test.go b/internal/controller/supervisorconfig/generator/secret_helper_test.go index 4c93b119..cd03efba 100644 --- a/internal/controller/supervisorconfig/generator/secret_helper_test.go +++ b/internal/controller/supervisorconfig/generator/secret_helper_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" ) const keyWith32Bytes = "0123456789abcdef0123456789abcdef" diff --git a/internal/controller/supervisorconfig/jwks_observer.go b/internal/controller/supervisorconfig/jwks_observer.go index e8b2a11c..588d8b5f 100644 --- a/internal/controller/supervisorconfig/jwks_observer.go +++ b/internal/controller/supervisorconfig/jwks_observer.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" corev1informers "k8s.io/client-go/informers/core/v1" - "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/config/v1alpha1" + "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/plog" diff --git a/internal/controller/supervisorconfig/jwks_observer_test.go b/internal/controller/supervisorconfig/jwks_observer_test.go index 9a6b8afd..a1e7e3e3 100644 --- a/internal/controller/supervisorconfig/jwks_observer_test.go +++ b/internal/controller/supervisorconfig/jwks_observer_test.go @@ -18,9 +18,9 @@ import ( kubeinformers "k8s.io/client-go/informers" kubernetesfake "k8s.io/client-go/kubernetes/fake" - "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/supervisorconfig/jwks_writer.go b/internal/controller/supervisorconfig/jwks_writer.go index 26669802..f3ced78c 100644 --- a/internal/controller/supervisorconfig/jwks_writer.go +++ b/internal/controller/supervisorconfig/jwks_writer.go @@ -22,9 +22,9 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog/v2" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - configinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + configinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controller/supervisorconfig/generator" "go.pinniped.dev/internal/controllerlib" diff --git a/internal/controller/supervisorconfig/jwks_writer_test.go b/internal/controller/supervisorconfig/jwks_writer_test.go index 811a754c..c528be90 100644 --- a/internal/controller/supervisorconfig/jwks_writer_test.go +++ b/internal/controller/supervisorconfig/jwks_writer_test.go @@ -23,9 +23,9 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/supervisorconfig/tls_cert_observer.go b/internal/controller/supervisorconfig/tls_cert_observer.go index 6580ddeb..463f1d47 100644 --- a/internal/controller/supervisorconfig/tls_cert_observer.go +++ b/internal/controller/supervisorconfig/tls_cert_observer.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/labels" corev1informers "k8s.io/client-go/informers/core/v1" - "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/config/v1alpha1" + "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/plog" diff --git a/internal/controller/supervisorconfig/tls_cert_observer_test.go b/internal/controller/supervisorconfig/tls_cert_observer_test.go index 7940a70f..f24888a2 100644 --- a/internal/controller/supervisorconfig/tls_cert_observer_test.go +++ b/internal/controller/supervisorconfig/tls_cert_observer_test.go @@ -19,9 +19,9 @@ import ( kubeinformers "k8s.io/client-go/informers" kubernetesfake "k8s.io/client-go/kubernetes/fake" - "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher.go b/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher.go index 095133e1..345d2b5f 100644 --- a/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher.go +++ b/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/util/cache" corev1informers "k8s.io/client-go/informers/core/v1" - "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - idpinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions/idp/v1alpha1" + "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + idpinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions/idp/v1alpha1" "go.pinniped.dev/internal/constable" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" diff --git a/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher_test.go b/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher_test.go index 02e96e8e..32ccf198 100644 --- a/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher_test.go +++ b/internal/controller/supervisorconfig/upstreamwatcher/upstreamwatcher_test.go @@ -20,9 +20,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" - "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/supervisor/informers/externalversions" + "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" + pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/oidc/oidctestutil" "go.pinniped.dev/internal/oidc/provider" diff --git a/internal/controllermanager/prepare_controllers.go b/internal/controllermanager/prepare_controllers.go index 5f6c6d16..ee6fa140 100644 --- a/internal/controllermanager/prepare_controllers.go +++ b/internal/controllermanager/prepare_controllers.go @@ -15,9 +15,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2/klogr" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" - pinnipedinformers "go.pinniped.dev/generated/1.20/client/concierge/informers/externalversions" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" + pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/apiserviceref" "go.pinniped.dev/internal/config/concierge" "go.pinniped.dev/internal/controller/apicerts" diff --git a/internal/groupsuffix/groupsuffix.go b/internal/groupsuffix/groupsuffix.go index d080662a..55bbff3b 100644 --- a/internal/groupsuffix/groupsuffix.go +++ b/internal/groupsuffix/groupsuffix.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/validation" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/constable" "go.pinniped.dev/internal/kubeclient" "go.pinniped.dev/internal/plog" diff --git a/internal/groupsuffix/groupsuffix_test.go b/internal/groupsuffix/groupsuffix_test.go index e9e2036b..0e4041d9 100644 --- a/internal/groupsuffix/groupsuffix_test.go +++ b/internal/groupsuffix/groupsuffix_test.go @@ -14,9 +14,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - authv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + authv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" "go.pinniped.dev/internal/kubeclient" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/kubeclient/kubeclient.go b/internal/kubeclient/kubeclient.go index ebf771ab..c093a2c1 100644 --- a/internal/kubeclient/kubeclient.go +++ b/internal/kubeclient/kubeclient.go @@ -13,10 +13,10 @@ import ( aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" aggregatorclientscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" - pinnipedconciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" - pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/scheme" - pinnipedsupervisorclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" - pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/scheme" + pinnipedconciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" + pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/scheme" + pinnipedsupervisorclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" + pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/scheme" ) type Client struct { diff --git a/internal/kubeclient/kubeclient_test.go b/internal/kubeclient/kubeclient_test.go index dba289e7..273942b6 100644 --- a/internal/kubeclient/kubeclient_test.go +++ b/internal/kubeclient/kubeclient_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/client-go/transport" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" "go.pinniped.dev/internal/testutil/fakekubeapi" ) diff --git a/internal/kubeclient/path_test.go b/internal/kubeclient/path_test.go index 2ed1ae61..20728ff6 100644 --- a/internal/kubeclient/path_test.go +++ b/internal/kubeclient/path_test.go @@ -16,8 +16,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" ) func Test_updatePathNewGVK(t *testing.T) { diff --git a/internal/kubeclient/scheme_test.go b/internal/kubeclient/scheme_test.go index 7094ba59..6e69026c 100644 --- a/internal/kubeclient/scheme_test.go +++ b/internal/kubeclient/scheme_test.go @@ -14,10 +14,10 @@ import ( apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" aggregatorclientscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - idpv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" - pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/scheme" - pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/scheme" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" + pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/scheme" + pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/scheme" ) func Test_schemeRestMapper(t *testing.T) { diff --git a/internal/mocks/credentialrequestmocks/credentialrequestmocks.go b/internal/mocks/credentialrequestmocks/credentialrequestmocks.go index 3bf8b431..afbee707 100644 --- a/internal/mocks/credentialrequestmocks/credentialrequestmocks.go +++ b/internal/mocks/credentialrequestmocks/credentialrequestmocks.go @@ -17,7 +17,7 @@ import ( gomock "github.com/golang/mock/gomock" user "k8s.io/apiserver/pkg/authentication/user" - login "go.pinniped.dev/generated/1.20/apis/concierge/login" + login "go.pinniped.dev/generated/latest/apis/concierge/login" ) // MockCertIssuer is a mock of CertIssuer interface diff --git a/internal/mocks/mocksecrethelper/mocksecrethelper.go b/internal/mocks/mocksecrethelper/mocksecrethelper.go index 5557fdd4..6003de78 100644 --- a/internal/mocks/mocksecrethelper/mocksecrethelper.go +++ b/internal/mocks/mocksecrethelper/mocksecrethelper.go @@ -15,7 +15,7 @@ import ( v1 "k8s.io/api/core/v1" v10 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" ) // MockSecretHelper is a mock of SecretHelper interface diff --git a/internal/registry/credentialrequest/rest.go b/internal/registry/credentialrequest/rest.go index 8b9d12ab..4f8cc289 100644 --- a/internal/registry/credentialrequest/rest.go +++ b/internal/registry/credentialrequest/rest.go @@ -20,7 +20,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/utils/trace" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" ) // clientCertificateTTL is the TTL for short-lived client certificates returned by this API. diff --git a/internal/registry/credentialrequest/rest_test.go b/internal/registry/credentialrequest/rest_test.go index 50652a02..80e40a1b 100644 --- a/internal/registry/credentialrequest/rest_test.go +++ b/internal/registry/credentialrequest/rest_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/klog/v2" - loginapi "go.pinniped.dev/generated/1.20/apis/concierge/login" + loginapi "go.pinniped.dev/generated/latest/apis/concierge/login" "go.pinniped.dev/internal/mocks/credentialrequestmocks" "go.pinniped.dev/internal/testutil" ) diff --git a/internal/testutil/fakekubeapi/fakekubeapi.go b/internal/testutil/fakekubeapi/fakekubeapi.go index 55f3ac8b..b0ccf995 100644 --- a/internal/testutil/fakekubeapi/fakekubeapi.go +++ b/internal/testutil/fakekubeapi/fakekubeapi.go @@ -35,8 +35,8 @@ import ( restclient "k8s.io/client-go/rest" aggregatorclientscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" - pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned/scheme" - pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned/scheme" + pinnipedconciergeclientsetscheme "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/scheme" + pinnipedsupervisorclientsetscheme "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/scheme" "go.pinniped.dev/internal/httputil/httperr" ) diff --git a/pkg/conciergeclient/conciergeclient.go b/pkg/conciergeclient/conciergeclient.go index 5943e24c..87198ddf 100644 --- a/pkg/conciergeclient/conciergeclient.go +++ b/pkg/conciergeclient/conciergeclient.go @@ -18,9 +18,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" - conciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" + conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" "go.pinniped.dev/internal/constable" "go.pinniped.dev/internal/groupsuffix" "go.pinniped.dev/internal/kubeclient" diff --git a/pkg/conciergeclient/conciergeclient_test.go b/pkg/conciergeclient/conciergeclient_test.go index 9a0a1500..028dda9f 100644 --- a/pkg/conciergeclient/conciergeclient_test.go +++ b/pkg/conciergeclient/conciergeclient_test.go @@ -19,7 +19,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientauthenticationv1beta1 "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/testutil" ) diff --git a/test/integration/concierge_api_serving_certs_test.go b/test/integration/concierge_api_serving_certs_test.go index b912073d..78aefea6 100644 --- a/test/integration/concierge_api_serving_certs_test.go +++ b/test/integration/concierge_api_serving_certs_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/internal/testutil" "go.pinniped.dev/test/library" ) diff --git a/test/integration/concierge_credentialissuerconfig_test.go b/test/integration/concierge_credentialissuerconfig_test.go index 4f241d5b..45ce038d 100644 --- a/test/integration/concierge_credentialissuerconfig_test.go +++ b/test/integration/concierge_credentialissuerconfig_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" "go.pinniped.dev/test/library" ) diff --git a/test/integration/concierge_credentialrequest_test.go b/test/integration/concierge_credentialrequest_test.go index 6f8236b7..7a37c9c7 100644 --- a/test/integration/concierge_credentialrequest_test.go +++ b/test/integration/concierge_credentialrequest_test.go @@ -17,8 +17,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - loginv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/login/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + loginv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/login/v1alpha1" "go.pinniped.dev/test/library" ) diff --git a/test/integration/e2e_test.go b/test/integration/e2e_test.go index 42f51eb1..e0b2cc75 100644 --- a/test/integration/e2e_test.go +++ b/test/integration/e2e_test.go @@ -26,9 +26,9 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - authv1alpha "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - idpv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" + authv1alpha "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/oidc" "go.pinniped.dev/internal/testutil" diff --git a/test/integration/kubeclient_test.go b/test/integration/kubeclient_test.go index dbe5c9c4..6cdaa56d 100644 --- a/test/integration/kubeclient_test.go +++ b/test/integration/kubeclient_test.go @@ -15,8 +15,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - conciergeconfigv1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/config/v1alpha1" - supervisorconfigv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + conciergeconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" + supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" "go.pinniped.dev/internal/apiserviceref" "go.pinniped.dev/internal/groupsuffix" "go.pinniped.dev/internal/kubeclient" diff --git a/test/integration/supervisor_discovery_test.go b/test/integration/supervisor_discovery_test.go index 906fa1f5..a9140133 100644 --- a/test/integration/supervisor_discovery_test.go +++ b/test/integration/supervisor_discovery_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - pinnipedclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" + "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + pinnipedclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/here" "go.pinniped.dev/test/library" diff --git a/test/integration/supervisor_login_test.go b/test/integration/supervisor_login_test.go index d6779c35..84fa8efa 100644 --- a/test/integration/supervisor_login_test.go +++ b/test/integration/supervisor_login_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/oauth2" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - idpv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/oidc" "go.pinniped.dev/internal/testutil" diff --git a/test/integration/supervisor_secrets_test.go b/test/integration/supervisor_secrets_test.go index f1b0ff32..d8498955 100644 --- a/test/integration/supervisor_secrets_test.go +++ b/test/integration/supervisor_secrets_test.go @@ -15,7 +15,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" "go.pinniped.dev/test/library" ) diff --git a/test/integration/supervisor_upstream_test.go b/test/integration/supervisor_upstream_test.go index 31ccc5cb..22a92ff1 100644 --- a/test/integration/supervisor_upstream_test.go +++ b/test/integration/supervisor_upstream_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" + "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" "go.pinniped.dev/test/library" ) diff --git a/test/library/client.go b/test/library/client.go index a98034d8..6d7facb6 100644 --- a/test/library/client.go +++ b/test/library/client.go @@ -26,11 +26,11 @@ import ( "k8s.io/client-go/tools/clientcmd" aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" - configv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/config/v1alpha1" - idpv1alpha1 "go.pinniped.dev/generated/1.20/apis/supervisor/idp/v1alpha1" - conciergeclientset "go.pinniped.dev/generated/1.20/client/concierge/clientset/versioned" - supervisorclientset "go.pinniped.dev/generated/1.20/client/supervisor/clientset/versioned" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" + idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" + conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" + supervisorclientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned" "go.pinniped.dev/internal/groupsuffix" "go.pinniped.dev/internal/kubeclient" diff --git a/test/library/env.go b/test/library/env.go index 8fa53a93..edd5d78b 100644 --- a/test/library/env.go +++ b/test/library/env.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/yaml" - auth1alpha1 "go.pinniped.dev/generated/1.20/apis/concierge/authentication/v1alpha1" + auth1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" ) type Capability string