github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 22:01:06 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade go version in Makefiles to 1.7, use qemu 2.7, armel => armhf and goarm=6 => goarm=7 and use go 1.7.4

Browse Source
This commit is contained in:
Lucas Käldström
2017-01-27 20:04:24 +02:00
parent 04bc44acf9
commit 84006601a0
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/conformance/build/Makefile
View File

@@ -26,7 +26,7 @@ BIN_DIR?=../../../../_output/dockerized/bin/linux/${ARCH}
TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE_amd64=debian:jessie
BASEIMAGE_arm=armel/debian:jessie
BASEIMAGE_arm=armhf/debian:jessie
BASEIMAGE_arm64=aarch64/debian:jessie
BASEIMAGE_ppc64le=ppc64le/debian:jessie

10
test/images/serve_hostname/Makefile
View File

@@ -15,11 +15,11 @@
# Cross-build the serve_hostname image
#
# Usage:
# [TAG=v1.5] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=gcr.io/k8s-authenticated-test] [ARCH=amd64] [BASEIMAGE=busybox] make all
# [TAG=v1.6] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=gcr.io/k8s-authenticated-test] [ARCH=amd64] [BASEIMAGE=busybox] make all
.PHONY: all push container clean
TAG ?= v1.5
TAG ?= v1.6
REGISTRY ?= gcr.io/google-containers
TEST_REGISTRY ?= gcr.io/k8s-authenticated-test
@@ -29,9 +29,9 @@ ARCH ?= amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
GOARM=6
GOARM=7
TEMP_DIR := $(shell mktemp -d)
GOLANG_VERSION = 1.6.3
GOLANG_VERSION=1.7.4
BIN = serve_hostname
SRCS = serve_hostname.go
@@ -44,7 +44,7 @@ ifeq ($(ARCH),amd64)
BASEIMAGE?=busybox
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=armel/busybox
BASEIMAGE?=armhf/busybox
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/busybox