github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67283 from ixdy/update-debian-base 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update to use debian-base:0.3.2

**What this PR does / why we need it**: uses the fixed debian-base image from #67222.
Also includes a small fix for a bug in the debian-base Makefile that I introduced in that same PR.

This is basically a rehash of #67026.

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-10 20:16:55 -07:00 committed by GitHub
parent 1658e70ff5 296fe185fa
commit a73ef59833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/debian-base/Makefile
View File

@ -61,7 +61,7 @@ else
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset
curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/$(QEMUVERSION)/x86_64_qemu-$(QEMUARCH)-static.tar.gz | tar -xz -C $(TEMP_DIR) curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/$(QEMUVERSION)/x86_64_qemu-$(QEMUARCH)-static.tar.gz | tar -xz -C $(TEMP_DIR)
# Ensure we don't get surprised by umask settings # Ensure we don't get surprised by umask settings
chmod 0755 qemu-$(QEMUARCH)-static chmod 0755 $(TEMP_DIR)/qemu-$(QEMUARCH)-static
sed "s/CROSS_BUILD_//g" $(TEMP_DIR)/Dockerfile.build > $(TEMP_DIR)/Dockerfile.build.tmp sed "s/CROSS_BUILD_//g" $(TEMP_DIR)/Dockerfile.build > $(TEMP_DIR)/Dockerfile.build.tmp
endif endif
mv $(TEMP_DIR)/Dockerfile.build.tmp $(TEMP_DIR)/Dockerfile.build mv $(TEMP_DIR)/Dockerfile.build.tmp $(TEMP_DIR)/Dockerfile.build

2
build/debian-hyperkube-base/Makefile
View File

@ -23,7 +23,7 @@ TAG=0.10.1
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2
CNI_VERSION=v0.6.0 CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

2
build/debian-iptables/Makefile
View File

@ -20,7 +20,7 @@ TAG=v10.1
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2
build: build:
cp ./* $(TEMP_DIR) cp ./* $(TEMP_DIR)

8
test/images/pets/peer-finder/BASEIMAGE
View File

@ -1,4 +1,4 @@
amd64=k8s.gcr.io/debian-base-amd64:0.3.1 amd64=k8s.gcr.io/debian-base-amd64:0.3.2
arm=k8s.gcr.io/debian-base-arm:0.3.1 arm=k8s.gcr.io/debian-base-arm:0.3.2
arm64=k8s.gcr.io/debian-base-arm64:0.3.1 arm64=k8s.gcr.io/debian-base-arm64:0.3.2
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2

8
test/images/pets/redis-installer/BASEIMAGE
View File

@ -1,4 +1,4 @@
amd64=k8s.gcr.io/debian-base-amd64:0.3.1 amd64=k8s.gcr.io/debian-base-amd64:0.3.2
arm=k8s.gcr.io/debian-base-arm:0.3.1 arm=k8s.gcr.io/debian-base-arm:0.3.2
arm64=k8s.gcr.io/debian-base-arm64:0.3.1 arm64=k8s.gcr.io/debian-base-arm64:0.3.2
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2

8
test/images/pets/zookeeper-installer/BASEIMAGE
View File

@ -1,4 +1,4 @@
amd64=k8s.gcr.io/debian-base-amd64:0.3.1 amd64=k8s.gcr.io/debian-base-amd64:0.3.2
arm=k8s.gcr.io/debian-base-arm:0.3.1 arm=k8s.gcr.io/debian-base-arm:0.3.2
arm64=k8s.gcr.io/debian-base-arm64:0.3.1 arm64=k8s.gcr.io/debian-base-arm64:0.3.2
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2

8
test/images/resource-consumer/BASEIMAGE
View File

@ -1,4 +1,4 @@
amd64=k8s.gcr.io/debian-base-amd64:0.3.1 amd64=k8s.gcr.io/debian-base-amd64:0.3.2
arm=k8s.gcr.io/debian-base-arm:0.3.1 arm=k8s.gcr.io/debian-base-arm:0.3.2
arm64=k8s.gcr.io/debian-base-arm64:0.3.1 arm64=k8s.gcr.io/debian-base-arm64:0.3.2
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2