Change group names

Signed-off-by: Margo Crawford <margaretc@vmware.com>
This commit is contained in:
Margo Crawford
2022-06-13 14:28:05 -07:00
parent ba371423d9
commit 8f4285dbff
593 changed files with 6704 additions and 11610 deletions

View File

@@ -53,8 +53,7 @@ func TestGetAPIResourceList(t *testing.T) {
configConciergeGV := makeGV("config", "concierge")
idpSupervisorGV := makeGV("idp", "supervisor")
configSupervisorGV := makeGV("config", "supervisor")
oauthSupervisorGV := makeGV("oauth", "supervisor")
oauthVirtualSupervisorGV := makeGV("oauth.virtual", "supervisor")
oauthVirtualSupervisorGV := makeGV("clientsecret", "supervisor")
tests := []struct {
group metav1.APIGroup
@@ -168,25 +167,6 @@ func TestGetAPIResourceList(t *testing.T) {
Kind: "FederationDomain",
Verbs: []string{"get", "patch", "update"},
},
},
},
},
{
group: metav1.APIGroup{
Name: oauthSupervisorGV.Group,
Versions: []metav1.GroupVersionForDiscovery{
{
GroupVersion: oauthSupervisorGV.String(),
Version: oauthSupervisorGV.Version,
},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: oauthSupervisorGV.String(),
Version: oauthSupervisorGV.Version,
},
},
resourceByVersion: map[string][]metav1.APIResource{
oauthSupervisorGV.String(): {
{
Name: "oidcclients",
SingularName: "oidcclient",
@@ -550,7 +530,7 @@ func TestCRDAdditionalPrinterColumns_Parallel(t *testing.T) {
{Name: "Age", Type: "date", JSONPath: ".metadata.creationTimestamp"},
},
},
addSuffix("oidcclients.oauth.supervisor"): {
addSuffix("oidcclients.config.supervisor"): {
"v1alpha1": []apiextensionsv1.CustomResourceColumnDefinition{
{Name: "Age", Type: "date", JSONPath: ".metadata.creationTimestamp"},
},

View File

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"go.pinniped.dev/generated/latest/apis/supervisor/virtual/oauth/v1alpha1"
"go.pinniped.dev/generated/latest/apis/supervisor/clientsecret/v1alpha1"
"go.pinniped.dev/test/testlib"
)
@@ -21,9 +21,9 @@ func TestOIDCClientSecretRequest_HappyPath_Parallel(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
client := testlib.NewVirtualSupervisorClientset(t)
client := testlib.NewSupervisorClientset(t)
response, err := client.OauthV1alpha1().OIDCClientSecretRequests(env.SupervisorNamespace).Create(ctx,
response, err := client.ClientsecretV1alpha1().OIDCClientSecretRequests(env.SupervisorNamespace).Create(ctx,
&v1alpha1.OIDCClientSecretRequest{
Spec: v1alpha1.OIDCClientSecretRequestSpec{
GenerateNewSecret: true,
@@ -41,9 +41,9 @@ func TestOIDCClientSecretRequest_Unauthenticated_Parallel(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()
client := testlib.NewAnonymousVirtualSupervisorClientset(t)
client := testlib.NewAnonymousSupervisorClientset(t)
_, err := client.OauthV1alpha1().OIDCClientSecretRequests(env.SupervisorNamespace).Create(ctx,
_, err := client.ClientsecretV1alpha1().OIDCClientSecretRequests(env.SupervisorNamespace).Create(ctx,
&v1alpha1.OIDCClientSecretRequest{
Spec: v1alpha1.OIDCClientSecretRequestSpec{
GenerateNewSecret: true,

View File

@@ -34,7 +34,6 @@ import (
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"
virtualsupervisorclientset "go.pinniped.dev/generated/latest/client/supervisor/virtual/clientset/versioned"
"go.pinniped.dev/internal/groupsuffix"
"go.pinniped.dev/internal/kubeclient"
@@ -87,16 +86,10 @@ func NewSupervisorClientset(t *testing.T) supervisorclientset.Interface {
return NewKubeclient(t, NewClientConfig(t)).PinnipedSupervisor
}
func NewAnonymousVirtualSupervisorClientset(t *testing.T) virtualsupervisorclientset.Interface {
func NewAnonymousSupervisorClientset(t *testing.T) supervisorclientset.Interface {
t.Helper()
return NewKubeclient(t, NewAnonymousClientRestConfig(t)).PinnipedSupervisorVirtual
}
func NewVirtualSupervisorClientset(t *testing.T) virtualsupervisorclientset.Interface {
t.Helper()
return NewKubeclient(t, NewClientConfig(t)).PinnipedSupervisorVirtual
return NewKubeclient(t, NewAnonymousClientRestConfig(t)).PinnipedSupervisor
}
func NewConciergeClientset(t *testing.T) conciergeclientset.Interface {