github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98882 from kvaps/flatten-adminconfig

Browse Source 
kubeadm: flatten admin.conf for cluster-info generation
This commit is contained in:
Kubernetes Prow Robot 2021-02-08 09:26:28 -08:00 committed by GitHub
commit 0867767d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go
View File

@ -47,6 +47,9 @@ func CreateBootstrapConfigMapIfNotExists(client clientset.Interface, file string
if err != nil { if err != nil {
return errors.Wrap(err, "failed to load admin kubeconfig") return errors.Wrap(err, "failed to load admin kubeconfig")
} }
if err = clientcmdapi.FlattenConfig(adminConfig); err != nil {
return err
}
adminCluster := adminConfig.Contexts[adminConfig.CurrentContext].Cluster adminCluster := adminConfig.Contexts[adminConfig.CurrentContext].Cluster
// Copy the cluster from admin.conf to the bootstrap kubeconfig, contains the CA cert and the server URL // Copy the cluster from admin.conf to the bootstrap kubeconfig, contains the CA cert and the server URL