Skip to content

K
k3s
Commit fa716a1b authored by Victor Marmol's avatar Victor Marmol
Browse files
Options

Merge pull request #8344 from jlowdermilk/clientcmd-api

Remove dependency on pkg/api from pkg/client/clientcmd/api
parents 0b4eb95d db09ceae
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pkg/client/clientcmd/api/types.go
View file @ fa716a1b
...@@ -17,7 +17,6 @@ limitations under the License. ...@@ -17,7 +17,6 @@ limitations under the License.
package api package api
import ( import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
) )
...@@ -26,7 +25,11 @@ import ( ...@@ -26,7 +25,11 @@ import (
// Config holds the information needed to build connect to remote kubernetes clusters as a given user // Config holds the information needed to build connect to remote kubernetes clusters as a given user
type Config struct { 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 holds general information to be use for cli interactions
Preferences Preferences `json:"preferences"` Preferences Preferences `json:"preferences"`
// Clusters is a map of referencable names to cluster configs // Clusters is a map of referencable names to cluster configs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment