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
43a9e08e
Unverified
Commit
43a9e08e
authored
Sep 27, 2018
by
k8s-ci-robot
Committed by
GitHub
Sep 27, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #68990 from carlisia/c-pauseversion
Change pause version value to a constant for image
parents
762ddf79
401f3f82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
constants.go
cmd/kubeadm/app/constants/constants.go
+3
-0
images.go
cmd/kubeadm/app/images/images.go
+1
-1
No files found.
cmd/kubeadm/app/constants/constants.go
View file @
43a9e08e
...
@@ -246,6 +246,9 @@ const (
...
@@ -246,6 +246,9 @@ const (
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion
=
"3.2.24"
DefaultEtcdVersion
=
"3.2.24"
// PauseVersion indicates the default pause image version for kubeadm
PauseVersion
=
"3.1"
// Etcd defines variable used internally when referring to etcd component
// Etcd defines variable used internally when referring to etcd component
Etcd
=
"etcd"
Etcd
=
"etcd"
// KubeAPIServer defines variable used internally when referring to kube-apiserver component
// KubeAPIServer defines variable used internally when referring to kube-apiserver component
...
...
cmd/kubeadm/app/images/images.go
View file @
43a9e08e
...
@@ -62,7 +62,7 @@ func GetAllImages(cfg *kubeadmapi.ClusterConfiguration) []string {
...
@@ -62,7 +62,7 @@ func GetAllImages(cfg *kubeadmapi.ClusterConfiguration) []string {
imgs
=
append
(
imgs
,
GetKubeControlPlaneImage
(
constants
.
KubeProxy
,
cfg
))
imgs
=
append
(
imgs
,
GetKubeControlPlaneImage
(
constants
.
KubeProxy
,
cfg
))
// pause, etcd and kube-dns are not available on the ci image repository so use the default image repository.
// pause, etcd and kube-dns are not available on the ci image repository so use the default image repository.
imgs
=
append
(
imgs
,
GetGenericImage
(
cfg
.
ImageRepository
,
"pause"
,
"3.1"
))
imgs
=
append
(
imgs
,
GetGenericImage
(
cfg
.
ImageRepository
,
"pause"
,
constants
.
PauseVersion
))
// if etcd is not external then add the image as it will be required
// if etcd is not external then add the image as it will be required
if
cfg
.
Etcd
.
Local
!=
nil
{
if
cfg
.
Etcd
.
Local
!=
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