Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b6ca1689
Unverified
Commit
b6ca1689
authored
Feb 14, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 14, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #74072 from bart0sh/PR0061-kubeadm-fix-failed-to-load-admin-kubeconfig
kubeadm: fix kubeadm reset logic
parents
62734d36
7a8de82d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
reset.go
cmd/kubeadm/app/cmd/reset.go
+10
-6
No files found.
cmd/kubeadm/app/cmd/reset.go
View file @
b6ca1689
...
...
@@ -62,8 +62,10 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
kubeadmutil
.
CheckErr
(
err
)
kubeConfigFile
=
cmdutil
.
FindExistingKubeConfig
(
kubeConfigFile
)
client
,
err
=
getClientset
(
kubeConfigFile
,
false
)
kubeadmutil
.
CheckErr
(
err
)
if
_
,
err
:=
os
.
Stat
(
kubeConfigFile
);
!
os
.
IsNotExist
(
err
)
{
client
,
err
=
getClientset
(
kubeConfigFile
,
false
)
kubeadmutil
.
CheckErr
(
err
)
}
if
criSocketPath
==
""
{
criSocketPath
,
err
=
resetDetectCRISocket
(
client
)
...
...
@@ -298,10 +300,12 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
}
func
resetDetectCRISocket
(
client
clientset
.
Interface
)
(
string
,
error
)
{
// first try to connect to the cluster for the CRI socket
cfg
,
err
:=
configutil
.
FetchInitConfigurationFromCluster
(
client
,
os
.
Stdout
,
"reset"
,
false
)
if
err
==
nil
{
return
cfg
.
NodeRegistration
.
CRISocket
,
nil
if
client
!=
nil
{
// first try to connect to the cluster for the CRI socket
cfg
,
err
:=
configutil
.
FetchInitConfigurationFromCluster
(
client
,
os
.
Stdout
,
"reset"
,
false
)
if
err
==
nil
{
return
cfg
.
NodeRegistration
.
CRISocket
,
nil
}
}
// if this fails, try to detect it
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment