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
a6f86c67
Unverified
Commit
a6f86c67
authored
Jul 06, 2018
by
Davanum Srinivas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pause image should be arch agnostic
Change-Id: I4997ace30077335767bca402a8b98202c91b950b Signed-off-by:
Davanum Srinivas
<
davanum@gmail.com
>
parent
54db2273
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
images.go
cmd/kubeadm/app/images/images.go
+6
-1
No files found.
cmd/kubeadm/app/images/images.go
View file @
a6f86c67
...
...
@@ -26,6 +26,11 @@ import (
kubeadmutil
"k8s.io/kubernetes/cmd/kubeadm/app/util"
)
// GetGenericImage generates and returns a platform agnostic image (backed by manifest list)
func
GetGenericImage
(
prefix
,
image
,
tag
string
)
string
{
return
fmt
.
Sprintf
(
"%s/%s:%s"
,
prefix
,
image
,
tag
)
}
// GetGenericArchImage generates and returns an image based on the current runtime arch
func
GetGenericArchImage
(
prefix
,
image
,
tag
string
)
string
{
return
fmt
.
Sprintf
(
"%s/%s-%s:%s"
,
prefix
,
image
,
runtime
.
GOARCH
,
tag
)
...
...
@@ -68,7 +73,7 @@ func GetAllImages(cfg *kubeadmapi.MasterConfiguration) []string {
imgs
=
append
(
imgs
,
GetKubeControlPlaneImageNoOverride
(
constants
.
KubeProxy
,
cfg
))
// pause, etcd and kube-dns are not available on the ci image repository so use the default image repository.
imgs
=
append
(
imgs
,
GetGeneric
Arch
Image
(
cfg
.
ImageRepository
,
"pause"
,
"3.1"
))
imgs
=
append
(
imgs
,
GetGenericImage
(
cfg
.
ImageRepository
,
"pause"
,
"3.1"
))
// if etcd is not external then add the image as it will be required
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