github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50602 from dixudx/user_arm64v8_instead_aarch64

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50602, 51561, 51703, 51748, 49142)

Use arm32v7|arm64v8 images instead of the deprecated armhf|aarch64 image organizations

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #50601

**Special notes for your reviewer**:
/assign @ixdy @jbeda @zmerlynn
**Release note**:

```release-note
Use arm32v7|arm64v8 images instead of the deprecated armhf|aarch64 image organizations
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-03 01:12:04 -07:00
committed by GitHub
parent 6b39b017b4 4d842cbac9
commit 5d72d5c31d
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian-iptables/Makefile
View File

@@ -16,7 +16,7 @@
REGISTRY?="gcr.io/google-containers"
IMAGE=debian-iptables
TAG=v7
TAG=v8
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.7.0
@@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
QEMUARCH=s390x
endif
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.1
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
build:
cp ./* $(TEMP_DIR)