mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

getKubeconfig: always return output filepath

Browse Source
This commit is contained in:
iwilltry42 2020-05-04 18:25:14 +02:00
parent 48b8e6801a
commit c6564801f3
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/create/createCluster.go
View File

@ -87,7 +87,7 @@ func NewCmdCreateCluster() *cobra.Command {
if updateKubeconfig {
log.Debugf("Updating default kubeconfig with a new context for cluster %s", cluster.Name)
if err := k3dCluster.GetAndWriteKubeConfig(runtimes.SelectedRuntime, cluster, "", &k3dCluster.WriteKubeConfigOptions{UpdateExisting: true, OverwriteExisting: false, UpdateCurrentContext: false}); err != nil {
if _, err := k3dCluster.GetAndWriteKubeConfig(runtimes.SelectedRuntime, cluster, "", &k3dCluster.WriteKubeConfigOptions{UpdateExisting: true, OverwriteExisting: false, UpdateCurrentContext: false}); err != nil {
log.Fatalln(err)
}
}

2
cmd/get/getKubeconfig.go
View File

@ -77,7 +77,7 @@ func NewCmdGetKubeconfig() *cobra.Command {
errorGettingKubeconfig := false
for _, c := range clusters {
log.Debugf("Getting kubeconfig for cluster '%s'", c.Name)
if err := cluster.GetAndWriteKubeConfig(runtimes.SelectedRuntime, c, getKubeconfigFlags.output, &writeKubeConfigOptions); err != nil {
if getKubeconfigFlags.output, err = cluster.GetAndWriteKubeConfig(runtimes.SelectedRuntime, c, getKubeconfigFlags.output, &writeKubeConfigOptions); err != nil {
log.Errorln(err)
errorGettingKubeconfig = true
}

16
pkg/cluster/kubeconfig.go
View File

@ -47,25 +47,25 @@ type WriteKubeConfigOptions struct {
// 1. fetches the KubeConfig from the first master node retrieved for a given cluster
// 2. modifies it by updating some fields with cluster-specific information
// 3. writes it to the specified output
func GetAndWriteKubeConfig(runtime runtimes.Runtime, cluster *k3d.Cluster, output string, writeKubeConfigOptions *WriteKubeConfigOptions) error {
func GetAndWriteKubeConfig(runtime runtimes.Runtime, cluster *k3d.Cluster, output string, writeKubeConfigOptions *WriteKubeConfigOptions) (string, error) {
// get kubeconfig from cluster node
kubeconfig, err := GetKubeconfig(runtime, cluster)
if err != nil {
return err
return output, err
}
// empty output parameter = write to default
if output == "" {
output, err = GetDefaultKubeConfigPath()
if err != nil {
return err
return output, err
}
}
// simply write to the output, ignoring existing contents
if writeKubeConfigOptions.OverwriteExisting || output == "-" {
return WriteKubeConfigToPath(kubeconfig, output)
return output, WriteKubeConfigToPath(kubeconfig, output)
}
// load config from existing file or fail if it has non-kubeconfig contents
@ -82,13 +82,13 @@ func GetAndWriteKubeConfig(runtime runtimes.Runtime, cluster *k3d.Cluster, outpu
// create directory path
if err := os.MkdirAll(path.Dir(output), 0755); err != nil {
log.Errorf("Failed to create output directory '%s'", path.Dir(output))
return err
return output, err
}
// create output file
if _, err := os.Create(output); err != nil {
log.Errorf("Failed to create output file '%s'", output)
return err
return output, err
}
// try again, but do not try to create the file this time
@ -96,13 +96,13 @@ func GetAndWriteKubeConfig(runtime runtimes.Runtime, cluster *k3d.Cluster, outpu
continue
}
log.Errorf("Failed to open output file '%s' or it's not a KubeConfig", output)
return err
return output, err
}
break
}
// update existing kubeconfig, but error out if there are conflicting fields but we don't want to update them
return UpdateKubeConfig(kubeconfig, existingKubeConfig, output, writeKubeConfigOptions.UpdateExisting, writeKubeConfigOptions.UpdateCurrentContext)
return output, UpdateKubeConfig(kubeconfig, existingKubeConfig, output, writeKubeConfigOptions.UpdateExisting, writeKubeConfigOptions.UpdateCurrentContext)
}