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

Merge pull request #67026 from satyasm/upgrade_debian_base 

Automatic merge from submit-queue (batch tested with PRs 67026, 62945, 66917). 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>.

Upgrade debian-base to 0.3.1 for CVEs

**What this PR does / why we need it**:
Upgrade debian-base to 0.3.1 in response to CVE fixes in debian-base

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

**Special notes for your reviewer**:
Bumps up the version number of related components.

**Release note**:

```release-note
Bump up version number of debian-base, debian-hyperkube-base and debian-iptables. 
Also updates dependencies of users of debian-base. 
debian-base version 0.3.1 is already available.
```
pull/8/head
Kubernetes Submit Queue 2018-08-08 20:52:59 -07:00 committed by GitHub
parent 93c990d708 025a0b3bf3
commit 508e8bcd84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/debian-base/Makefile
View File

@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build
TAG ?= 0.3
TAG ?= 0.3.1
TAR_FILE ?= rootfs.tar
ARCH?=amd64

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

@ -19,11 +19,11 @@
REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base
TAG=0.10
TAG=0.10.1
ARCH?=amd64
CACHEBUST?=1
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1
CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d)

4
build/debian-iptables/Makefile
View File

@ -16,7 +16,7 @@
REGISTRY?="staging-k8s.gcr.io"
IMAGE=debian-iptables
TAG=v10
TAG=v10.1
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1
@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
QEMUARCH=s390x
endif
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1
build:
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
arm=k8s.gcr.io/debian-base-arm:0.3
arm64=k8s.gcr.io/debian-base-arm64:0.3
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3
amd64=k8s.gcr.io/debian-base-amd64:0.3.1
arm=k8s.gcr.io/debian-base-arm:0.3.1
arm64=k8s.gcr.io/debian-base-arm64:0.3.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1

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

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

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

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

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

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