From b74c542de5d521916664ab780d7e94bc231428f2 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 13 Apr 2021 14:18:13 -0400 Subject: [PATCH 1/3] skip printing test for removed APIs --- test/integration/apiserver/print_test.go | 28 ++---------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/test/integration/apiserver/print_test.go b/test/integration/apiserver/print_test.go index 9375024a04a..2f5fe4286f7 100644 --- a/test/integration/apiserver/print_test.go +++ b/test/integration/apiserver/print_test.go @@ -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) From b199047fa6496cca6871d565692016ac81b36466 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 13 Apr 2021 14:13:10 -0400 Subject: [PATCH 2/3] remove outdated extensions group test --- test/integration/master/synthetic_master_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go index acb2d0e141e..e5c639bed93 100644 --- a/test/integration/master/synthetic_master_test.go +++ b/test/integration/master/synthetic_master_test.go @@ -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) From e6113c5fe6168c5a047ee60d9d0aab38e6c44b08 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 13 Apr 2021 14:22:03 -0400 Subject: [PATCH 3/3] update openapi overlap test for crd v1 --- test/integration/master/kube_apiserver_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/master/kube_apiserver_test.go index ba303e6d74f..6db6243d7ad 100644 --- a/test/integration/master/kube_apiserver_test.go +++ b/test/integration/master/kube_apiserver_test.go @@ -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) }