github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101248 from deads2k/integration

Browse Source 
update more integration tests for v1beta1 removal
This commit is contained in:
Kubernetes Prow Robot 2021-04-19 18:54:56 -07:00 committed by GitHub
commit 1eccb41fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/integration/apiserver/print_test.go
View File

@ -124,28 +124,6 @@ var missingHanlders = sets.NewString(
"AuditSink",
)
// known types that are no longer served we should tolerate restmapper errors for
var unservedTypes = map[schema.GroupVersionKind]bool{
{Group: "extensions", Version: "v1beta1", Kind: "ControllerRevision"}: true,
{Group: "extensions", Version: "v1beta1", Kind: "DaemonSet"}: true,
{Group: "extensions", Version: "v1beta1", Kind: "Deployment"}: true,
{Group: "extensions", Version: "v1beta1", Kind: "NetworkPolicy"}: true,
{Group: "extensions", Version: "v1beta1", Kind: "PodSecurityPolicy"}: true,
{Group: "extensions", Version: "v1beta1", Kind: "ReplicaSet"}: true,
{Group: "apps", Version: "v1beta1", Kind: "ControllerRevision"}: true,
{Group: "apps", Version: "v1beta1", Kind: "DaemonSet"}: true,
{Group: "apps", Version: "v1beta1", Kind: "Deployment"}: true,
{Group: "apps", Version: "v1beta1", Kind: "ReplicaSet"}: true,
{Group: "apps", Version: "v1beta1", Kind: "StatefulSet"}: true,
{Group: "apps", Version: "v1beta2", Kind: "ControllerRevision"}: true,
{Group: "apps", Version: "v1beta2", Kind: "DaemonSet"}: true,
{Group: "apps", Version: "v1beta2", Kind: "Deployment"}: true,
{Group: "apps", Version: "v1beta2", Kind: "ReplicaSet"}: true,
{Group: "apps", Version: "v1beta2", Kind: "StatefulSet"}: true,
}
func TestServerSidePrint(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIStorageCapacity, true)()
@ -218,10 +196,8 @@ func TestServerSidePrint(t *testing.T) {
// read table definition as returned by the server
mapping, err := mapper.RESTMapping(gvk.GroupKind(), gvk.Version)
if err != nil {
if unservedTypes[gvk] {
continue
}
t.Errorf("unexpected error getting mapping for GVK %s: %v", gvk, err)
// if we have no mapping, we aren't serving it and we don't need to check its printer.
t.Logf("unexpected error getting mapping for GVK %s: %v", gvk, err)
continue
}
client, err := factory.ClientForMapping(mapping)

10
test/integration/master/kube_apiserver_test.go
View File

@ -199,7 +199,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
crdPath, exist, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/{name}`)
crdPath, exist, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}`)
if err != nil {
t.Fatalf("unexpected error getting CRD OpenAPI path: %v", err)
}
@ -224,7 +224,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
},
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
{
Name: "v1beta1",
Name: "v1",
Served: true,
Storage: true,
Schema: &apiextensionsv1.CustomResourceValidation{
@ -247,7 +247,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
}
// Expect the CRD path to not change
path, _, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/{name}`)
path, _, err := getOpenAPIPath(apiextensionsclient, `/apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}`)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@ -289,7 +289,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
},
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
{
Name: "v1beta1",
Name: "v1",
Served: true,
Storage: true,
Schema: &apiextensionsv1.CustomResourceValidation{
@ -312,7 +312,7 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
}
// Expect the apiextensions definition to not change, since the overlapping definition will get renamed.
apiextensionsDefinition, exist, err := getOpenAPIDefinition(apiextensionsclient, `io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition`)
apiextensionsDefinition, exist, err := getOpenAPIDefinition(apiextensionsclient, `io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.CustomResourceDefinition`)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

4
test/integration/master/synthetic_master_test.go
View File

@ -93,10 +93,6 @@ func TestAppsPrefix(t *testing.T) {
testPrefix(t, "/apis/apps/")
}
func TestExtensionsPrefix(t *testing.T) {
testPrefix(t, "/apis/extensions/")
}
func TestKubernetesService(t *testing.T) {
config := framework.NewMasterConfig()
_, _, closeFn := framework.RunAMaster(config)