scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 02:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

change kubeconfig loading order

Browse Source
This commit is contained in:
deads2k
2015-04-10 08:54:22 -04:00
parent b59266ad84
commit de4be5422c
50 changed files with 446 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/config/create_cluster.go
View File

@@ -30,7 +30,7 @@ import (
)
type createClusterOptions struct {
pathOptions *PathOptions
configAccess ConfigAccess
name string
server util.StringFlag
apiVersion util.StringFlag
@@ -52,8 +52,8 @@ $ kubectl config set-cluster e2e --certificate-authority=~/.kube/e2e/kubernetes.
$ kubectl config set-cluster e2e --insecure-skip-tls-verify=true`
)
func NewCmdConfigSetCluster(out io.Writer, pathOptions *PathOptions) *cobra.Command {
options := &createClusterOptions{pathOptions: pathOptions}
func NewCmdConfigSetCluster(out io.Writer, configAccess ConfigAccess) *cobra.Command {
options := &createClusterOptions{configAccess: configAccess}
cmd := &cobra.Command{
Use: fmt.Sprintf("set-cluster NAME [--%v=server] [--%v=path/to/certficate/authority] [--%v=apiversion] [--%v=true]", clientcmd.FlagAPIServer, clientcmd.FlagCAFile, clientcmd.FlagAPIVersion, clientcmd.FlagInsecure),
@@ -89,7 +89,7 @@ func (o createClusterOptions) run() error {
return err
}
config, err := o.pathOptions.getStartingConfig()
config, err := o.configAccess.GetStartingConfig()
if err != nil {
return err
}
@@ -97,7 +97,7 @@ func (o createClusterOptions) run() error {
cluster := o.modifyCluster(config.Clusters[o.name])
config.Clusters[o.name] = cluster
if err := o.pathOptions.ModifyConfig(*config); err != nil {
if err := ModifyConfig(o.configAccess, *config); err != nil {
return err
}
@@ -169,5 +169,5 @@ func (o createClusterOptions) validate() error {
}
}
return o.pathOptions.Validate()
return nil
}