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
d5832831
Unverified
Commit
d5832831
authored
Mar 20, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Mar 20, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #75251 from louiseveryd/fix-201903111
fix typo
parents
b3be84dc
0a1227c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
controllermanager.go
cmd/kube-controller-manager/app/controllermanager.go
+1
-1
options.go
cmd/kube-scheduler/app/options/options.go
+1
-1
No files found.
cmd/kube-controller-manager/app/controllermanager.go
View file @
d5832831
...
@@ -195,7 +195,7 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
...
@@ -195,7 +195,7 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
var
clientBuilder
controller
.
ControllerClientBuilder
var
clientBuilder
controller
.
ControllerClientBuilder
if
c
.
ComponentConfig
.
KubeCloudShared
.
UseServiceAccountCredentials
{
if
c
.
ComponentConfig
.
KubeCloudShared
.
UseServiceAccountCredentials
{
if
len
(
c
.
ComponentConfig
.
SAController
.
ServiceAccountKeyFile
)
==
0
{
if
len
(
c
.
ComponentConfig
.
SAController
.
ServiceAccountKeyFile
)
==
0
{
// It'
c
possible another controller process is creating the tokens for us.
// It'
s
possible another controller process is creating the tokens for us.
// If one isn't, we'll timeout and exit when our client builder is unable to create the tokens.
// If one isn't, we'll timeout and exit when our client builder is unable to create the tokens.
klog
.
Warningf
(
"--use-service-account-credentials was specified without providing a --service-account-private-key-file"
)
klog
.
Warningf
(
"--use-service-account-credentials was specified without providing a --service-account-private-key-file"
)
}
}
...
...
cmd/kube-scheduler/app/options/options.go
View file @
d5832831
...
@@ -177,7 +177,7 @@ func (o *Options) ApplyTo(c *schedulerappconfig.Config) error {
...
@@ -177,7 +177,7 @@ func (o *Options) ApplyTo(c *schedulerappconfig.Config) error {
}
}
// use the loaded config file only, with the exception of --address and --port. This means that
// use the loaded config file only, with the exception of --address and --port. This means that
// none of the deprec
t
ated flags in o.Deprecated are taken into consideration. This is the old
// none of the deprecated flags in o.Deprecated are taken into consideration. This is the old
// behaviour of the flags we have to keep.
// behaviour of the flags we have to keep.
c
.
ComponentConfig
=
*
cfg
c
.
ComponentConfig
=
*
cfg
...
...
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