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
4260bf2a
Commit
4260bf2a
authored
Feb 01, 2018
by
bin liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
parent
ca17c82b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
client.go
staging/src/k8s.io/client-go/dynamic/client.go
+1
-1
client_config.go
...ing/src/k8s.io/client-go/tools/clientcmd/client_config.go
+2
-2
loader.go
staging/src/k8s.io/client-go/tools/clientcmd/loader.go
+1
-1
No files found.
staging/src/k8s.io/client-go/dynamic/client.go
View file @
4260bf2a
...
...
@@ -47,7 +47,7 @@ type Interface interface {
GetRateLimiter
()
flowcontrol
.
RateLimiter
// Resource returns an API interface to the specified resource for this client's
// group and version. If resource is not a namespaced resource, then namespace
// is ignored. The ResourceInterface inherits the param
a
ter codec of this client.
// is ignored. The ResourceInterface inherits the param
e
ter codec of this client.
Resource
(
resource
*
metav1
.
APIResource
,
namespace
string
)
ResourceInterface
// ParameterCodec returns a client with the provided parameter codec.
ParameterCodec
(
parameterCodec
runtime
.
ParameterCodec
)
Interface
...
...
staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
View file @
4260bf2a
...
...
@@ -202,7 +202,7 @@ func getServerIdentificationPartialConfig(configAuthInfo clientcmdapi.AuthInfo,
// clientauth.Info object contain both user identification and server identification. We want different precedence orders for
// both, so we have to split the objects and merge them separately
// we want this order of precedence for user identifcation
// we want this order of precedence for user identif
i
cation
// 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)
// 3. if there is not enough information to identify the user, load try the ~/.kubernetes_auth file
...
...
@@ -474,7 +474,7 @@ func (config *inClusterClientConfig) ClientConfig() (*restclient.Config, error)
}
// in-cluster configs only takes a host, token, or CA file
// if any of them were individually provided, ovewrite anything else
// if any of them were individually provided, ove
r
write anything else
if
config
.
overrides
!=
nil
{
if
server
:=
config
.
overrides
.
ClusterInfo
.
Server
;
len
(
server
)
>
0
{
icc
.
Host
=
server
...
...
staging/src/k8s.io/client-go/tools/clientcmd/loader.go
View file @
4260bf2a
...
...
@@ -111,7 +111,7 @@ func (g *ClientConfigGetter) IsDefaultConfig(config *restclient.Config) bool {
// ClientConfigLoadingRules is an ExplicitPath and string slice of specific locations that are used for merging together a Config
// Callers can put the chain together however they want, but we'd recommend:
// EnvVarPathFiles if set (a list of files if set) OR the HomeDirectoryPath
// ExplicitPath is special, because if a user specifically requests a certain file be used and error is reported if thi
e
file is not present
// ExplicitPath is special, because if a user specifically requests a certain file be used and error is reported if thi
s
file is not present
type
ClientConfigLoadingRules
struct
{
ExplicitPath
string
Precedence
[]
string
...
...
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