github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69995 from ixdy/purge-libsystemd-from-debian-base

Browse Source 
debian-base: purge libsystemd0 to eliminate CVE false-positives
This commit is contained in:
k8s-ci-robot 2018-10-19 16:04:23 -07:00 committed by GitHub
commit 82cba09870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/debian-base/Dockerfile.build
View File

@ -56,6 +56,7 @@ RUN echo "Yes, do as I say!" | apt-get purge \
libprocps6 \ libprocps6 \
libslang2 \ libslang2 \
libss2 \ libss2 \
libsystemd0 \
libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \ libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \
ncurses-base \ ncurses-base \
ncurses-bin \ ncurses-bin \

2
build/debian-base/Makefile
View File

@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= $(REGISTRY)/debian-base IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build
TAG ?= 0.3.2 TAG ?= 0.4.0
TAR_FILE ?= rootfs.tar TAR_FILE ?= rootfs.tar
ARCH?=amd64 ARCH?=amd64

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

@ -19,12 +19,12 @@
REGISTRY?=staging-k8s.gcr.io REGISTRY?=staging-k8s.gcr.io
IMAGE?=$(REGISTRY)/debian-hyperkube-base IMAGE?=$(REGISTRY)/debian-hyperkube-base
TAG=0.11.0 TAG=0.12.0
ARCH?=amd64 ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
CACHEBUST?=1 CACHEBUST?=1
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0
CNI_VERSION=v0.6.0 CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

4
build/debian-iptables/Makefile
View File

@ -16,12 +16,12 @@
REGISTRY?="staging-k8s.gcr.io" REGISTRY?="staging-k8s.gcr.io"
IMAGE=$(REGISTRY)/debian-iptables IMAGE=$(REGISTRY)/debian-iptables
TAG?=v10.2 TAG?=v11.0
ARCH?=amd64 ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.3.2 BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.4.0
# This option is for running docker manifest command # This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled export DOCKER_CLI_EXPERIMENTAL := enabled

4
cluster/addons/addon-manager/CHANGELOG.md
View File

@ -1,3 +1,7 @@
### Version 8.9 (Fri October 19 2018 Jeff Grafton <jgrafton@google.com>)
- Update to use debian-base:0.4.0.
- Update kubectl to v1.11.3.
### Version 8.8 (Mon October 1 2018 Zihong Zheng <zihongz@google.com>) ### Version 8.8 (Mon October 1 2018 Zihong Zheng <zihongz@google.com>)
- Update to use debian-base:0.3.2. - Update to use debian-base:0.3.2.

6
cluster/addons/addon-manager/Makefile
View File

@ -15,10 +15,10 @@
IMAGE=staging-k8s.gcr.io/kube-addon-manager IMAGE=staging-k8s.gcr.io/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.8 VERSION=v8.9
KUBECTL_VERSION?=v1.10.7 KUBECTL_VERSION?=v1.11.3
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0
.PHONY: build push .PHONY: build push

2
test/e2e/common/runtime.go
View File

@ -276,7 +276,7 @@ while true; do sleep 1; done
}, },
{ {
description: "should be able to pull image from gcr.io", description: "should be able to pull image from gcr.io",
image: "gcr.io/google-containers/debian-base:0.3.2", image: "gcr.io/google-containers/debian-base:0.4.0",
phase: v1.PodRunning, phase: v1.PodRunning,
waiting: false, waiting: false,
}, },

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

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

2
test/images/pets/peer-finder/VERSION
View File

@ -1 +1 @@
1.2 1.3

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

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

2
test/images/pets/redis-installer/VERSION
View File

@ -1 +1 @@
1.1 1.2

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

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

2
test/images/pets/zookeeper-installer/VERSION
View File

@ -1 +1 @@
1.1 1.2

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

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

2
test/images/resource-consumer/VERSION
View File

@ -1 +1 @@
1.3 1.4