Merge pull request #8344 from jlowdermilk/clientcmd-api

Remove dependency on pkg/api from pkg/client/clientcmd/api
This commit is contained in:
Victor Marmol 2015-05-18 08:39:18 -07:00
commit fa716a1b48

View File

@ -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