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

bump new version due to base image changed

pull/6/head
Di Xu 2017-08-19 14:06:48 +08:00
parent d4aa1611bd
commit ec2fbbc85d
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -85,7 +85,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
#
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v7
debian_iptables_version=v8
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD.
case $1 in

2
build/debian-base/Makefile
View File

@ -18,7 +18,7 @@ REGISTRY ?= gcr.io/google-containers
IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build
TAG ?= 0.1
TAG ?= 0.2
TAR_FILE ?= rootfs.tar
ARCH?=amd64

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

@ -19,11 +19,11 @@
REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base
TAG=0.1
TAG=0.2
ARCH?=amd64
CACHEBUST?=1
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.1
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
TEMP_DIR:=$(shell mktemp -d)

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)

1
build/root/WORKSPACE
View File

@ -54,6 +54,7 @@ http_file(
url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz",
)
# TODO(dixudx): update the sha and tag (to v8) when the image get pushed
docker_pull(
name = "debian-iptables-amd64",
digest = "sha256:bc20977ac38abfb43071b4c61c4b7edb30af894c05eb06758dd61d05118d2842",

2
cluster/images/hyperkube/Makefile
View File

@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers
ARCH?=amd64
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.1
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.2
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
all: build

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

@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/debian-base-amd64:0.1
arm=gcr.io/google-containers/debian-base-arm:0.1
arm64=gcr.io/google-containers/debian-base-arm64:0.1
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.1
amd64=gcr.io/google-containers/debian-base-amd64:0.2
arm=gcr.io/google-containers/debian-base-arm:0.2
arm64=gcr.io/google-containers/debian-base-arm64:0.2
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2

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

@ -1 +1 @@
1.1
1.2