Skip to content

Add integration test for preferred GVs in discovery #15160

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.

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

Merged
Merged
Changes from all commits
Commits
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
73 changes: 73 additions & 0 deletions test/integration/master_routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
knet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/sets"
kapi "k8s.io/kubernetes/pkg/api"

build "github.com/openshift/origin/pkg/build/apis/build"
Expand Down Expand Up @@ -207,6 +208,78 @@ func TestWellKnownOAuthOff(t *testing.T) {
}
}

var preferredVersions = map[string]string{
"": "v1",
"apps": "v1beta1",
"authentication.k8s.io": "v1",
"authorization.k8s.io": "v1",
"autoscaling": "v1",
"batch": "v1",
"certificates.k8s.io": "v1beta1",
"extensions": "v1beta1",
"policy": "v1beta1",
"rbac.authorization.k8s.io": "v1beta1",
"storage.k8s.io": "v1",

"apps.openshift.io": "v1",
"authorization.openshift.io": "v1",
"build.openshift.io": "v1",
"image.openshift.io": "v1",
"network.openshift.io": "v1",
"oauth.openshift.io": "v1",
"project.openshift.io": "v1",
"quota.openshift.io": "v1",
"route.openshift.io": "v1",
"security.openshift.io": "v1",
"template.openshift.io": "v1",
"user.openshift.io": "v1",
}

func TestApiGroupPreferredVersions(t *testing.T) {
testutil.RequireEtcd(t)
defer testutil.DumpEtcdOnFailure(t)
masterConfig, err := testserver.DefaultMasterOptions()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
masterConfig.OAuthConfig = nil
clusterAdminKubeConfig, err := testserver.StartConfiguredMasterAPI(masterConfig)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

kclientset, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

t.Logf("Looking for build api group in server group discovery")
groups, err := kclientset.Discovery().ServerGroups()
if err != nil {
t.Fatalf("unexpected group discovery error: %v", err)
}

found := sets.NewString()
for _, g := range groups.Groups {
found.Insert(g.Name)
preferred, found := preferredVersions[g.Name]
if !found {
t.Errorf("Unexpected group %q in discovery", g.Name)
continue
}

if g.PreferredVersion.Version != preferred {
t.Errorf("Unexpected preferred version for group %q: got %q, expected %q", g.Name, g.PreferredVersion.Version, preferred)
}
}

for g := range preferredVersions {
if !found.Has(g) {
t.Errorf("Didn't see group %q in discovery", g)
}
}
}

func TestApiGroups(t *testing.T) {
testutil.RequireEtcd(t)
defer testutil.DumpEtcdOnFailure(t)
Expand Down