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
b99c8b99
Unverified
Commit
b99c8b99
authored
Nov 11, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 11, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70743 from bart0sh/PR0039-kubeadm-dont-prepull-etcd-if-not-required
kubeadm: prepull Etcd image only if required
parents
8307fb2f
328c1825
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
apply.go
cmd/kubeadm/app/cmd/upgrade/apply.go
+1
-1
No files found.
cmd/kubeadm/app/cmd/upgrade/apply.go
View file @
b99c8b99
...
...
@@ -195,7 +195,7 @@ func RunApply(flags *applyFlags) error {
klog
.
V
(
1
)
.
Infof
(
"[upgrade/apply] creating prepuller"
)
prepuller
:=
upgrade
.
NewDaemonSetPrepuller
(
upgradeVars
.
client
,
upgradeVars
.
waiter
,
&
upgradeVars
.
cfg
.
ClusterConfiguration
)
componentsToPrepull
:=
constants
.
MasterComponents
if
upgradeVars
.
cfg
.
Etcd
.
External
!=
nil
{
if
upgradeVars
.
cfg
.
Etcd
.
External
==
nil
&&
flags
.
etcdUpgrade
{
componentsToPrepull
=
append
(
componentsToPrepull
,
constants
.
Etcd
)
}
if
err
:=
upgrade
.
PrepullImagesInParallel
(
prepuller
,
flags
.
imagePullTimeout
,
componentsToPrepull
);
err
!=
nil
{
...
...
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