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
6ba9ae30
Commit
6ba9ae30
authored
Jun 21, 2018
by
hangaoshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some small mistakes in kubeadm
parent
293a93b3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
apply.go
cmd/kubeadm/app/cmd/upgrade/apply.go
+2
-2
diff.go
cmd/kubeadm/app/cmd/upgrade/diff.go
+1
-1
plan.go
cmd/kubeadm/app/cmd/upgrade/plan.go
+1
-1
No files found.
cmd/kubeadm/app/cmd/upgrade/apply.go
View file @
6ba9ae30
...
@@ -91,7 +91,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
...
@@ -91,7 +91,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
// If the version is specified in config file, pick up that value.
// If the version is specified in config file, pick up that value.
if
flags
.
cfgPath
!=
""
{
if
flags
.
cfgPath
!=
""
{
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file"
,
flags
.
cfgPath
)
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file
%s
"
,
flags
.
cfgPath
)
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmapiv1alpha2
.
MasterConfiguration
{})
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmapiv1alpha2
.
MasterConfiguration
{})
kubeadmutil
.
CheckErr
(
err
)
kubeadmutil
.
CheckErr
(
err
)
...
@@ -269,7 +269,7 @@ func PerformControlPlaneUpgrade(flags *applyFlags, client clientset.Interface, w
...
@@ -269,7 +269,7 @@ func PerformControlPlaneUpgrade(flags *applyFlags, client clientset.Interface, w
fmt
.
Printf
(
"[upgrade/apply] Upgrading your Self-Hosted control plane to version %q...
\n
"
,
flags
.
newK8sVersionStr
)
fmt
.
Printf
(
"[upgrade/apply] Upgrading your Self-Hosted control plane to version %q...
\n
"
,
flags
.
newK8sVersionStr
)
// Upgrade the self-hosted cluster
// Upgrade the self-hosted cluster
glog
.
V
(
1
)
.
Infoln
(
"[upgrade/apply] ugrading self-hosted cluster"
)
glog
.
V
(
1
)
.
Infoln
(
"[upgrade/apply] u
p
grading self-hosted cluster"
)
return
upgrade
.
SelfHostedControlPlane
(
client
,
waiter
,
internalcfg
,
flags
.
newK8sVersion
)
return
upgrade
.
SelfHostedControlPlane
(
client
,
waiter
,
internalcfg
,
flags
.
newK8sVersion
)
}
}
...
...
cmd/kubeadm/app/cmd/upgrade/diff.go
View file @
6ba9ae30
...
@@ -78,7 +78,7 @@ func NewCmdDiff(out io.Writer) *cobra.Command {
...
@@ -78,7 +78,7 @@ func NewCmdDiff(out io.Writer) *cobra.Command {
func
runDiff
(
flags
*
diffFlags
,
args
[]
string
)
error
{
func
runDiff
(
flags
*
diffFlags
,
args
[]
string
)
error
{
// If the version is specified in config file, pick up that value.
// If the version is specified in config file, pick up that value.
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file"
,
flags
.
cfgPath
)
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file
%s
"
,
flags
.
cfgPath
)
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmv1alpha2
.
MasterConfiguration
{})
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmv1alpha2
.
MasterConfiguration
{})
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
cmd/kubeadm/app/cmd/upgrade/plan.go
View file @
6ba9ae30
...
@@ -60,7 +60,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
...
@@ -60,7 +60,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
// If the version is specified in config file, pick up that value.
// If the version is specified in config file, pick up that value.
if
flags
.
cfgPath
!=
""
{
if
flags
.
cfgPath
!=
""
{
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file"
,
flags
.
cfgPath
)
glog
.
V
(
1
)
.
Infof
(
"fetching configuration from file
%s
"
,
flags
.
cfgPath
)
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmapiv1alpha2
.
MasterConfiguration
{})
cfg
,
err
:=
configutil
.
ConfigFileAndDefaultsToInternalConfig
(
flags
.
cfgPath
,
&
kubeadmapiv1alpha2
.
MasterConfiguration
{})
kubeadmutil
.
CheckErr
(
err
)
kubeadmutil
.
CheckErr
(
err
)
...
...
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