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
2dc9acc2
Unverified
Commit
2dc9acc2
authored
Oct 20, 2018
by
k8s-ci-robot
Committed by
GitHub
Oct 20, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #69922 from xichengliudui/fix181017
Delete repeated words and fix misspellings
parents
570f9195
0dba66a2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
types.go
cmd/kubeadm/app/apis/kubeadm/types.go
+1
-1
types.go
cmd/kubeadm/app/apis/kubeadm/v1alpha3/types.go
+1
-1
types.go
cmd/kubeadm/app/apis/kubeadm/v1beta1/types.go
+1
-1
initconfiguration.go
cmd/kubeadm/app/util/config/initconfiguration.go
+1
-1
No files found.
cmd/kubeadm/app/apis/kubeadm/types.go
View file @
2dc9acc2
...
@@ -181,7 +181,7 @@ type NodeRegistrationOptions struct {
...
@@ -181,7 +181,7 @@ type NodeRegistrationOptions struct {
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// Flags have higher
higher
priority when parsing. These values are local and specific to the node kubeadm is executing on.
// Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on.
KubeletExtraArgs
map
[
string
]
string
KubeletExtraArgs
map
[
string
]
string
}
}
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha3/types.go
View file @
2dc9acc2
...
@@ -162,7 +162,7 @@ type NodeRegistrationOptions struct {
...
@@ -162,7 +162,7 @@ type NodeRegistrationOptions struct {
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// Flags have higher
higher
priority when parsing. These values are local and specific to the node kubeadm is executing on.
// Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on.
KubeletExtraArgs
map
[
string
]
string
`json:"kubeletExtraArgs,omitempty"`
KubeletExtraArgs
map
[
string
]
string
`json:"kubeletExtraArgs,omitempty"`
}
}
...
...
cmd/kubeadm/app/apis/kubeadm/v1beta1/types.go
View file @
2dc9acc2
...
@@ -162,7 +162,7 @@ type NodeRegistrationOptions struct {
...
@@ -162,7 +162,7 @@ type NodeRegistrationOptions struct {
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// KubeletExtraArgs passes through extra arguments to the kubelet. The arguments here are passed to the kubelet command line via the environment file
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// kubeadm writes at runtime for the kubelet to source. This overrides the generic base-level configuration in the kubelet-config-1.X ConfigMap
// Flags have higher
higher
priority when parsing. These values are local and specific to the node kubeadm is executing on.
// Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on.
KubeletExtraArgs
map
[
string
]
string
`json:"kubeletExtraArgs,omitempty"`
KubeletExtraArgs
map
[
string
]
string
`json:"kubeletExtraArgs,omitempty"`
}
}
...
...
cmd/kubeadm/app/util/config/initconfiguration.go
View file @
2dc9acc2
...
@@ -118,7 +118,7 @@ func SetAPIEndpointDynamicDefaults(cfg *kubeadmapi.APIEndpoint) error {
...
@@ -118,7 +118,7 @@ func SetAPIEndpointDynamicDefaults(cfg *kubeadmapi.APIEndpoint) error {
return
nil
return
nil
}
}
// SetClusterDynamicDefaults checks and sets
configuration values for the Init
Configuration object
// SetClusterDynamicDefaults checks and sets
values for the Cluster
Configuration object
func
SetClusterDynamicDefaults
(
cfg
*
kubeadmapi
.
ClusterConfiguration
,
advertiseAddress
string
,
bindPort
int32
)
error
{
func
SetClusterDynamicDefaults
(
cfg
*
kubeadmapi
.
ClusterConfiguration
,
advertiseAddress
string
,
bindPort
int32
)
error
{
// Default all the embedded ComponentConfig structs
// Default all the embedded ComponentConfig structs
componentconfigs
.
Known
.
Default
(
cfg
)
componentconfigs
.
Known
.
Default
(
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