github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Relocate preferred version e2e test to discovery.go

Browse Source
This commit is contained in:
Stephen Heywood 2020-07-16 21:13:55 +00:00
parent 6e3919fae7
commit ca550a280a
3 changed files with 35 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/apimachinery/BUILD
View File

@ -9,7 +9,6 @@ go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"aggregator.go", "aggregator.go",
"apigroup_preferred_version.go",
"certs.go", "certs.go",
"chunking.go", "chunking.go",
"crd_conversion_webhook.go", "crd_conversion_webhook.go",

61
test/e2e/apimachinery/apigroup_preferred_version.go
View File

@ -1,61 +0,0 @@
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package apimachinery
import (
"context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
"github.com/onsi/ginkgo"
)
var _ = SIGDescribe("apigroup preferred version", func() {
f := framework.NewDefaultFramework("apigroup-preferred-version")
ginkgo.It("should validate PreferredVersion for each APIGroup", func() {
// get list of APIGroup endpoints
list := &metav1.APIGroupList{}
err := f.ClientSet.Discovery().RESTClient().Get().AbsPath("/apis/").Do(context.TODO()).Into(list)
framework.ExpectNoError(err, "Failed to find /apis/")
framework.ExpectNotEqual(len(list.Groups), 0, "Missing APIGroups")
for _, group := range list.Groups {
framework.Logf("Checking APIGroup: %v", group.Name)
// locate APIGroup endpoint
checkGroup := &metav1.APIGroup{}
apiPath := "/apis/" + group.Name + "/"
err = f.ClientSet.Discovery().RESTClient().Get().AbsPath(apiPath).Do(context.TODO()).Into(checkGroup)
framework.ExpectNoError(err, "Fail to access: %s", apiPath)
framework.ExpectNotEqual(len(checkGroup.Versions), 0, "No version found for %v", group.Name)
framework.Logf("PreferredVersion.GroupVersion: %s", checkGroup.PreferredVersion.GroupVersion)
framework.Logf("Versions found %v", checkGroup.Versions)
// confirm that the PreferredVersion is a valid version
match := false
for _, version := range checkGroup.Versions {
if version.GroupVersion == checkGroup.PreferredVersion.GroupVersion {
framework.Logf("%s matches %s", version.GroupVersion, checkGroup.PreferredVersion.GroupVersion)
match = true
break
}
}
framework.ExpectEqual(true, match, "failed to find a valid version for PreferredVersion")
}
})
})

35
test/e2e/apimachinery/discovery.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package apimachinery package apimachinery
import ( import (
"context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilversion "k8s.io/apimachinery/pkg/util/version" utilversion "k8s.io/apimachinery/pkg/util/version"
"k8s.io/apiserver/pkg/endpoints/discovery" "k8s.io/apiserver/pkg/endpoints/discovery"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -77,4 +79,37 @@ var _ = SIGDescribe("Discovery", func() {
framework.Failf("didn't find resource %s in the discovery doc", spec.Names.Plural) framework.Failf("didn't find resource %s in the discovery doc", spec.Names.Plural)
} }
}) })
ginkgo.It("should validate PreferredVersion for each APIGroup", func() {
// get list of APIGroup endpoints
list := &metav1.APIGroupList{}
err := f.ClientSet.Discovery().RESTClient().Get().AbsPath("/apis/").Do(context.TODO()).Into(list)
framework.ExpectNoError(err, "Failed to find /apis/")
framework.ExpectNotEqual(len(list.Groups), 0, "Missing APIGroups")
for _, group := range list.Groups {
framework.Logf("Checking APIGroup: %v", group.Name)
// locate APIGroup endpoint
checkGroup := &metav1.APIGroup{}
apiPath := "/apis/" + group.Name + "/"
err = f.ClientSet.Discovery().RESTClient().Get().AbsPath(apiPath).Do(context.TODO()).Into(checkGroup)
framework.ExpectNoError(err, "Fail to access: %s", apiPath)
framework.ExpectNotEqual(len(checkGroup.Versions), 0, "No version found for %v", group.Name)
framework.Logf("PreferredVersion.GroupVersion: %s", checkGroup.PreferredVersion.GroupVersion)
framework.Logf("Versions found %v", checkGroup.Versions)
// confirm that the PreferredVersion is a valid version
match := false
for _, version := range checkGroup.Versions {
if version.GroupVersion == checkGroup.PreferredVersion.GroupVersion {
framework.Logf("%s matches %s", version.GroupVersion, checkGroup.PreferredVersion.GroupVersion)
match = true
break
}
}
framework.ExpectEqual(true, match, "failed to find a valid version for PreferredVersion")
}
})
}) })