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
d4aa1611
Commit
d4aa1611
authored
Aug 14, 2017
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use more-specific arm64v8 instead of deprecated aarch64 organization
parent
25a786f7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
common.sh
build/common.sh
+5
-5
Makefile
build/debian-base/Makefile
+1
-1
Makefile
cluster/addons/addon-manager/Makefile
+1
-1
Makefile
cluster/images/etcd/Makefile
+1
-1
Makefile
test/e2e_node/conformance/build/Makefile
+1
-1
No files found.
build/common.sh
View file @
d4aa1611
...
@@ -109,11 +109,11 @@ kube::build::get_docker_wrapped_binaries() {
...
@@ -109,11 +109,11 @@ kube::build::get_docker_wrapped_binaries() {
)
;;
)
;;
"arm64"
)
"arm64"
)
local
targets
=(
local
targets
=(
cloud-controller-manager,a
arch64
/busybox
cloud-controller-manager,a
rm64v8
/busybox
kube-apiserver,a
arch64
/busybox
kube-apiserver,a
rm64v8
/busybox
kube-controller-manager,a
arch64
/busybox
kube-controller-manager,a
rm64v8
/busybox
kube-scheduler,a
arch64
/busybox
kube-scheduler,a
rm64v8
/busybox
kube-aggregator,a
arch64
/busybox
kube-aggregator,a
rm64v8
/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-arm64:
${
debian_iptables_version
}
kube-proxy,gcr.io/google-containers/debian-iptables-arm64:
${
debian_iptables_version
}
)
;;
)
;;
"ppc64le"
)
"ppc64le"
)
...
...
build/debian-base/Makefile
View file @
d4aa1611
...
@@ -33,7 +33,7 @@ ifeq ($(ARCH),arm)
...
@@ -33,7 +33,7 @@ ifeq ($(ARCH),arm)
QEMUARCH
=
arm
QEMUARCH
=
arm
endif
endif
ifeq
($(ARCH),arm64)
ifeq
($(ARCH),arm64)
BASEIMAGE
?=
a
arch64
/debian:jessie
BASEIMAGE
?=
a
rm64v8
/debian:jessie
QEMUARCH
=
aarch64
QEMUARCH
=
aarch64
endif
endif
ifeq
($(ARCH),ppc64le)
ifeq
($(ARCH),ppc64le)
...
...
cluster/addons/addon-manager/Makefile
View file @
d4aa1611
...
@@ -25,7 +25,7 @@ ifeq ($(ARCH),arm)
...
@@ -25,7 +25,7 @@ ifeq ($(ARCH),arm)
BASEIMAGE
?=
arm32v7/debian
BASEIMAGE
?=
arm32v7/debian
endif
endif
ifeq
($(ARCH),arm64)
ifeq
($(ARCH),arm64)
BASEIMAGE
?=
a
arch64
/debian
BASEIMAGE
?=
a
rm64v8
/debian
endif
endif
ifeq
($(ARCH),ppc64le)
ifeq
($(ARCH),ppc64le)
BASEIMAGE
?=
ppc64le/debian
BASEIMAGE
?=
ppc64le/debian
...
...
cluster/images/etcd/Makefile
View file @
d4aa1611
...
@@ -41,7 +41,7 @@ ifeq ($(ARCH),arm)
...
@@ -41,7 +41,7 @@ ifeq ($(ARCH),arm)
BASEIMAGE
?=
arm32v7/busybox
BASEIMAGE
?=
arm32v7/busybox
endif
endif
ifeq
($(ARCH),arm64)
ifeq
($(ARCH),arm64)
BASEIMAGE
?=
a
arch64
/busybox
BASEIMAGE
?=
a
rm64v8
/busybox
endif
endif
ifeq
($(ARCH),ppc64le)
ifeq
($(ARCH),ppc64le)
BASEIMAGE
?=
ppc64le/busybox
BASEIMAGE
?=
ppc64le/busybox
...
...
test/e2e_node/conformance/build/Makefile
View file @
d4aa1611
...
@@ -32,7 +32,7 @@ TEMP_DIR:=$(shell mktemp -d)
...
@@ -32,7 +32,7 @@ TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE_amd64
=
debian:jessie
BASEIMAGE_amd64
=
debian:jessie
BASEIMAGE_arm
=
arm32v7/debian:jessie
BASEIMAGE_arm
=
arm32v7/debian:jessie
BASEIMAGE_arm64
=
a
arch64
/debian:jessie
BASEIMAGE_arm64
=
a
rm64v8
/debian:jessie
BASEIMAGE_ppc64le
=
ppc64le/debian:jessie
BASEIMAGE_ppc64le
=
ppc64le/debian:jessie
BASEIMAGE
?=
${
BASEIMAGE_
${
ARCH
}}
BASEIMAGE
?=
${
BASEIMAGE_
${
ARCH
}}
...
...
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