From db09ceae25e80f6c5fb140c111cc6f114b837a4b Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Fri, 15 May 2015 15:05:32 -0700 Subject: [PATCH] Remove dependency on pkg/api from pkg/client/clientcmd/api --- pkg/client/clientcmd/api/types.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/client/clientcmd/api/types.go b/pkg/client/clientcmd/api/types.go index 2d74a96e674..698b765848b 100644 --- a/pkg/client/clientcmd/api/types.go +++ b/pkg/client/clientcmd/api/types.go @@ -17,7 +17,6 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" ) @@ -26,7 +25,11 @@ import ( // Config holds the information needed to build connect to remote kubernetes clusters as a given user type Config struct { - api.TypeMeta `json:",inline"` + // Legacy field from pkg/api/types.go TypeMeta. + // TODO(jlowdermilk): remove this after eliminating downstream dependencies. + Kind string `json:"kind,omitempty"` + // Version of the schema for this config object. + APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions Preferences Preferences `json:"preferences"` // Clusters is a map of referencable names to cluster configs