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
db5c21f3
Commit
db5c21f3
authored
May 30, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
May 30, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #42240 from fate-grand-order/patch-3
Automatic merge from submit-queue correct misspell "identify" in client_config.go
parents
052cd6d3
8f2891c1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
client_config.go
...ing/src/k8s.io/client-go/tools/clientcmd/client_config.go
+1
-1
No files found.
staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
View file @
db5c21f3
...
@@ -205,7 +205,7 @@ func getServerIdentificationPartialConfig(configAuthInfo clientcmdapi.AuthInfo,
...
@@ -205,7 +205,7 @@ func getServerIdentificationPartialConfig(configAuthInfo clientcmdapi.AuthInfo,
// we want this order of precedence for user identifcation
// we want this order of precedence for user identifcation
// 1. configAuthInfo minus auth-path (the final result of command line flags and merged .kubeconfig files)
// 1. configAuthInfo minus auth-path (the final result of command line flags and merged .kubeconfig files)
// 2. configAuthInfo.auth-path (this file can contain information that conflicts with #1, and we want #1 to win the priority)
// 2. configAuthInfo.auth-path (this file can contain information that conflicts with #1, and we want #1 to win the priority)
// 3. if there is not enough information to iden
fit
y the user, load try the ~/.kubernetes_auth file
// 3. if there is not enough information to iden
tif
y the user, load try the ~/.kubernetes_auth file
// 4. if there is not enough information to identify the user, prompt if possible
// 4. if there is not enough information to identify the user, prompt if possible
func
(
config
*
DirectClientConfig
)
getUserIdentificationPartialConfig
(
configAuthInfo
clientcmdapi
.
AuthInfo
,
fallbackReader
io
.
Reader
,
persistAuthConfig
restclient
.
AuthProviderConfigPersister
)
(
*
restclient
.
Config
,
error
)
{
func
(
config
*
DirectClientConfig
)
getUserIdentificationPartialConfig
(
configAuthInfo
clientcmdapi
.
AuthInfo
,
fallbackReader
io
.
Reader
,
persistAuthConfig
restclient
.
AuthProviderConfigPersister
)
(
*
restclient
.
Config
,
error
)
{
mergedConfig
:=
&
restclient
.
Config
{}
mergedConfig
:=
&
restclient
.
Config
{}
...
...
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