github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to unserved types

Browse Source
This commit is contained in:
Jordan Liggitt
2019-12-02 11:23:54 -05:00
parent 3df9e86a4e
commit 18ba6f9482
8 changed files with 32 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,6 @@ import (
"testing"
"time"
appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
auditregv1alpha1 "k8s.io/api/auditregistration/v1alpha1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
discoveryv1alpha1 "k8s.io/api/discovery/v1alpha1"
@@ -144,6 +142,28 @@ var missingHanlders = sets.NewString(
"PriorityLevelConfiguration", // TODO(yue9944882): remove this comment by merging print-handler for flow-control API
)
// 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) {
s, _, closeFn := setupWithResources(t,
// additional groupversions needed for the test to run
@@ -156,19 +176,11 @@ func TestServerSidePrint(t *testing.T) {
settingsv1alpha1.SchemeGroupVersion,
schedulerapi.SchemeGroupVersion,
storagev1alpha1.SchemeGroupVersion,
appsv1beta1.SchemeGroupVersion,
appsv1beta2.SchemeGroupVersion,
extensionsv1beta1.SchemeGroupVersion,
nodev1alpha1.SchemeGroupVersion,
flowcontrolv1alpha1.SchemeGroupVersion,
},
[]schema.GroupVersionResource{
extensionsv1beta1.SchemeGroupVersion.WithResource("daemonsets"),
extensionsv1beta1.SchemeGroupVersion.WithResource("deployments"),
extensionsv1beta1.SchemeGroupVersion.WithResource("networkpolicies"),
extensionsv1beta1.SchemeGroupVersion.WithResource("podsecuritypolicies"),
extensionsv1beta1.SchemeGroupVersion.WithResource("replicasets"),
},
[]schema.GroupVersionResource{},
)
defer closeFn()
@@ -220,6 +232,9 @@ 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)
continue
}