From 0e5da1337dae91bb20b0dcfeca5104fb2dac6e12 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 2 Jul 2018 11:49:45 -0400 Subject: [PATCH] UPSTREAM: revert: : make auth reconcile work with backlevel versions until ansible updates This reverts commit 979704ac34b42f25827c8fbaf9040904bca82eb1. --- .../kubernetes/pkg/kubectl/cmd/auth/reconcile.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go index f4e84e31e84b..3346812deef5 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go @@ -25,7 +25,6 @@ import ( rbacv1 "k8s.io/api/rbac/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" rbacv1client "k8s.io/client-go/kubernetes/typed/rbac/v1" - "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" @@ -106,7 +105,7 @@ func (o *ReconcileOptions) Complete(cmd *cobra.Command, f cmdutil.Factory, args } r := f.NewBuilder(). - WithScheme(legacyscheme.Scheme). + WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...). ContinueOnError(). NamespaceParam(namespace).DefaultNamespace(). FilenameParam(enforceNamespace, o.FilenameOptions). @@ -171,14 +170,7 @@ func (o *ReconcileOptions) RunReconcile() error { return err } - obj, err := legacyscheme.Scheme.ConvertToVersion(info.Object, rbacv1.SchemeGroupVersion) - if err != nil { - glog.V(1).Infof("skipping %#v", info.Object.GetObjectKind()) - // skip ignored resources - return nil - } - - switch t := obj.(type) { + switch t := info.Object.(type) { case *rbacv1.Role: reconcileOptions := reconciliation.ReconcileRoleOptions{ Confirm: !o.DryRun,