Unverified Commit 508e8bcd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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. ```
parents 93c990d7 025a0b3b
...@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io ...@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= debian-base IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build
TAG ?= 0.3 TAG ?= 0.3.1
TAR_FILE ?= rootfs.tar TAR_FILE ?= rootfs.tar
ARCH?=amd64 ARCH?=amd64
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
REGISTRY?=staging-k8s.gcr.io REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.10 TAG=0.10.1
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 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 CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
REGISTRY?="staging-k8s.gcr.io" REGISTRY?="staging-k8s.gcr.io"
IMAGE=debian-iptables IMAGE=debian-iptables
TAG=v10 TAG=v10.1
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1
...@@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x) ...@@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
QEMUARCH=s390x QEMUARCH=s390x
endif endif
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1
build: build:
cp ./* $(TEMP_DIR) cp ./* $(TEMP_DIR)
......
amd64=k8s.gcr.io/debian-base-amd64:0.3 amd64=k8s.gcr.io/debian-base-amd64:0.3.1
arm=k8s.gcr.io/debian-base-arm:0.3 arm=k8s.gcr.io/debian-base-arm:0.3.1
arm64=k8s.gcr.io/debian-base-arm64:0.3 arm64=k8s.gcr.io/debian-base-arm64:0.3.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1
amd64=k8s.gcr.io/debian-base-amd64:0.3 amd64=k8s.gcr.io/debian-base-amd64:0.3.1
arm=k8s.gcr.io/debian-base-arm:0.3 arm=k8s.gcr.io/debian-base-arm:0.3.1
arm64=k8s.gcr.io/debian-base-arm64:0.3 arm64=k8s.gcr.io/debian-base-arm64:0.3.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1
amd64=k8s.gcr.io/debian-base-amd64:0.3 amd64=k8s.gcr.io/debian-base-amd64:0.3.1
arm=k8s.gcr.io/debian-base-arm:0.3 arm=k8s.gcr.io/debian-base-arm:0.3.1
arm64=k8s.gcr.io/debian-base-arm64:0.3 arm64=k8s.gcr.io/debian-base-arm64:0.3.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1
amd64=k8s.gcr.io/debian-base-amd64:0.3 amd64=k8s.gcr.io/debian-base-amd64:0.3.1
arm=k8s.gcr.io/debian-base-arm:0.3 arm=k8s.gcr.io/debian-base-arm:0.3.1
arm64=k8s.gcr.io/debian-base-arm64:0.3 arm64=k8s.gcr.io/debian-base-arm64:0.3.1
ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3 ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment