From a1b7785e2e1bbb22bf356379083eedeac8602de6 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 21 Feb 2018 10:19:02 -0500 Subject: [PATCH] Revert "fix resource filter for generic printers on get" This reverts commit 799a0bf41023b02e84a5551a5030b34ffe410919. --- pkg/kubectl/resource_filter.go | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkg/kubectl/resource_filter.go b/pkg/kubectl/resource_filter.go index 67008db961f..b873748f688 100644 --- a/pkg/kubectl/resource_filter.go +++ b/pkg/kubectl/resource_filter.go @@ -18,9 +18,7 @@ package kubectl import ( "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/printers" ) @@ -52,27 +50,6 @@ func filterPods(obj runtime.Object, options printers.PrintOptions) bool { return p.Status.Phase == v1.PodSucceeded || p.Status.Phase == v1.PodFailed case *api.Pod: return p.Status.Phase == api.PodSucceeded || p.Status.Phase == api.PodFailed - case *unstructured.Unstructured: - if (p.GroupVersionKind().GroupKind() != schema.GroupKind{Kind: "Pod"}) { - return false - } - status, ok := p.Object["status"] - if !ok { - return false - } - statusMap, ok := status.(map[string]interface{}) - if !ok { - return false - } - phase, ok := statusMap["phase"] - if !ok { - return false - } - phaseString, ok := phase.(string) - if !ok { - return false - } - return phaseString == string(api.PodSucceeded) || phaseString == string(api.PodFailed) } return false }