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
8a4e0e81
Commit
8a4e0e81
authored
Oct 16, 2017
by
Mark Janssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix `kubeadm upgrade plan` for offline operation
parent
88975e98
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
compute.go
cmd/kubeadm/app/phases/upgrade/compute.go
+7
-5
versiongetter.go
cmd/kubeadm/app/phases/upgrade/versiongetter.go
+2
-2
No files found.
cmd/kubeadm/app/phases/upgrade/compute.go
View file @
8a4e0e81
...
@@ -62,7 +62,7 @@ type ClusterState struct {
...
@@ -62,7 +62,7 @@ type ClusterState struct {
// GetAvailableUpgrades fetches all versions from the specified VersionGetter and computes which
// GetAvailableUpgrades fetches all versions from the specified VersionGetter and computes which
// kinds of upgrades can be performed
// kinds of upgrades can be performed
func
GetAvailableUpgrades
(
versionGetterImpl
VersionGetter
,
experimentalUpgradesAllowed
,
rcUpgradesAllowed
bool
)
([]
Upgrade
,
error
)
{
func
GetAvailableUpgrades
(
versionGetterImpl
VersionGetter
,
experimentalUpgradesAllowed
,
rcUpgradesAllowed
bool
)
([]
Upgrade
,
error
)
{
fmt
.
Println
(
"[upgrade] Fetching available versions to upgrade to
:
"
)
fmt
.
Println
(
"[upgrade] Fetching available versions to upgrade to"
)
// Collect the upgrades kubeadm can do in this list
// Collect the upgrades kubeadm can do in this list
upgrades
:=
[]
Upgrade
{}
upgrades
:=
[]
Upgrade
{}
...
@@ -82,7 +82,9 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
...
@@ -82,7 +82,9 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
// Get and output the current latest stable version
// Get and output the current latest stable version
stableVersionStr
,
stableVersion
,
err
:=
versionGetterImpl
.
VersionFromCILabel
(
"stable"
,
"stable version"
)
stableVersionStr
,
stableVersion
,
err
:=
versionGetterImpl
.
VersionFromCILabel
(
"stable"
,
"stable version"
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
fmt
.
Printf
(
"[upgrade/versions] WARNING: %v
\n
"
,
err
)
fmt
.
Println
(
"[upgrade/versions] WARNING: Falling back to current kubeadm version as latest stable version"
)
stableVersionStr
,
stableVersion
=
kubeadmVersionStr
,
kubeadmVersion
}
}
// Get the kubelet versions in the cluster
// Get the kubelet versions in the cluster
...
@@ -115,9 +117,8 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
...
@@ -115,9 +117,8 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
// Get and output the latest patch version for the cluster branch
// Get and output the latest patch version for the cluster branch
patchVersionStr
,
patchVersion
,
err
:=
versionGetterImpl
.
VersionFromCILabel
(
versionLabel
,
description
)
patchVersionStr
,
patchVersion
,
err
:=
versionGetterImpl
.
VersionFromCILabel
(
versionLabel
,
description
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
fmt
.
Printf
(
"[upgrade/versions] WARNING: %v
\n
"
,
err
)
}
}
else
{
// Check if a minor version upgrade is possible when a patch release exists
// Check if a minor version upgrade is possible when a patch release exists
// It's only possible if the latest patch version is higher than the current patch version
// It's only possible if the latest patch version is higher than the current patch version
// If that's the case, they must be on different branches => a newer minor version can be upgraded to
// If that's the case, they must be on different branches => a newer minor version can be upgraded to
...
@@ -145,6 +146,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
...
@@ -145,6 +146,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
})
})
}
}
}
}
}
if
canDoMinorUpgrade
{
if
canDoMinorUpgrade
{
upgrades
=
append
(
upgrades
,
Upgrade
{
upgrades
=
append
(
upgrades
,
Upgrade
{
...
...
cmd/kubeadm/app/phases/upgrade/versiongetter.go
View file @
8a4e0e81
...
@@ -86,7 +86,7 @@ func (g *KubeVersionGetter) KubeadmVersion() (string, *versionutil.Version, erro
...
@@ -86,7 +86,7 @@ func (g *KubeVersionGetter) KubeadmVersion() (string, *versionutil.Version, erro
func
(
g
*
KubeVersionGetter
)
VersionFromCILabel
(
ciVersionLabel
,
description
string
)
(
string
,
*
versionutil
.
Version
,
error
)
{
func
(
g
*
KubeVersionGetter
)
VersionFromCILabel
(
ciVersionLabel
,
description
string
)
(
string
,
*
versionutil
.
Version
,
error
)
{
versionStr
,
err
:=
kubeadmutil
.
KubernetesReleaseVersion
(
ciVersionLabel
)
versionStr
,
err
:=
kubeadmutil
.
KubernetesReleaseVersion
(
ciVersionLabel
)
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
nil
,
fmt
.
Errorf
(
"Couldn't fetch latest %s
version
from the internet: %v"
,
description
,
err
)
return
""
,
nil
,
fmt
.
Errorf
(
"Couldn't fetch latest %s from the internet: %v"
,
description
,
err
)
}
}
if
description
!=
""
{
if
description
!=
""
{
...
@@ -95,7 +95,7 @@ func (g *KubeVersionGetter) VersionFromCILabel(ciVersionLabel, description strin
...
@@ -95,7 +95,7 @@ func (g *KubeVersionGetter) VersionFromCILabel(ciVersionLabel, description strin
ver
,
err
:=
versionutil
.
ParseSemantic
(
versionStr
)
ver
,
err
:=
versionutil
.
ParseSemantic
(
versionStr
)
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
nil
,
fmt
.
Errorf
(
"Couldn't parse latest %s
version
: %v"
,
description
,
err
)
return
""
,
nil
,
fmt
.
Errorf
(
"Couldn't parse latest %s: %v"
,
description
,
err
)
}
}
return
versionStr
,
ver
,
nil
return
versionStr
,
ver
,
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