From 003404685d48dacfc5fd97804f7aca61d9e74d9c Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Wed, 24 Oct 2018 16:18:53 -0700 Subject: [PATCH 1/3] Update to use debian-iptables v11.0 and debian-hyperkube-base 0.12.0 --- build/common.sh | 2 +- build/root/WORKSPACE | 8 ++++---- cluster/images/conformance/Makefile | 2 +- cluster/images/hyperkube/Makefile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/common.sh b/build/common.sh index 28d0f2a683..057bb40210 100755 --- a/build/common.sh +++ b/build/common.sh @@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # # $1 - server architecture kube::build::get_docker_wrapped_binaries() { - debian_iptables_version=v10.2 + debian_iptables_version=v11.0 ### If you change any of these lists, please also update DOCKERIZED_BINARIES ### in build/BUILD. And kube::golang::server_image_targets case $1 in diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 43357c33a0..e0e2e45240 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -67,18 +67,18 @@ http_file( docker_pull( name = "debian-iptables-amd64", - digest = "sha256:0987db7ce42949d20ed2647a65d4bee0b616b4d40c7ea54769cc24b7ad003677", + digest = "sha256:d4ff8136b9037694a3165a7fff6a91e7fc828741b8ea1eda226d4d9ea5d23abb", registry = "k8s.gcr.io", repository = "debian-iptables-amd64", - tag = "v10.2", # ignored, but kept here for documentation + tag = "v11.0", # ignored, but kept here for documentation ) docker_pull( name = "debian-hyperkube-base-amd64", - digest = "sha256:b180af61c8c40a3e011630be135c091e7af6b6c784bedce839d31b9fad63c435", + digest = "sha256:4a77bc882f7d629c088a11ff144a2e86660268fddf63b61f52b6a93d16ab83f0", registry = "k8s.gcr.io", repository = "debian-hyperkube-base-amd64", - tag = "0.11.0", # ignored, but kept here for documentation + tag = "0.12.0", # ignored, but kept here for documentation ) docker_pull( diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index d5f7582e81..43f61ddf53 100644 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -25,7 +25,7 @@ KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubec E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test CLUSTER_DIR?=$(shell pwd)/../../../cluster/ -BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.11.0 +BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.0 TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) all: build diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 16af35b9c1..2bd17d3416 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -22,7 +22,7 @@ ARCH?=amd64 OUT_DIR?=_output HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube -BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.11.0 +BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.0 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) all: build From 7b93b50e401b5c880ab4b27ab351b1217db8fe68 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Wed, 24 Oct 2018 16:19:51 -0700 Subject: [PATCH 2/3] Update to use kube-addon-manager:v8.9 --- cluster/gce/manifests/kube-addon-manager.yaml | 2 +- test/kubemark/resources/manifests/kube-addon-manager.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml index d91570f0bf..9694f88a05 100644 --- a/cluster/gce/manifests/kube-addon-manager.yaml +++ b/cluster/gce/manifests/kube-addon-manager.yaml @@ -14,7 +14,7 @@ spec: - name: kube-addon-manager # When updating version also bump it in: # - test/kubemark/resources/manifests/kube-addon-manager.yaml - image: k8s.gcr.io/kube-addon-manager:v8.8 + image: k8s.gcr.io/kube-addon-manager:v8.9 command: - /bin/bash - -c diff --git a/test/kubemark/resources/manifests/kube-addon-manager.yaml b/test/kubemark/resources/manifests/kube-addon-manager.yaml index 6341235ed5..e9bc87e1eb 100644 --- a/test/kubemark/resources/manifests/kube-addon-manager.yaml +++ b/test/kubemark/resources/manifests/kube-addon-manager.yaml @@ -9,7 +9,7 @@ spec: hostNetwork: true containers: - name: kube-addon-manager - image: {{kube_docker_registry}}/kube-addon-manager:v8.8 + image: {{kube_docker_registry}}/kube-addon-manager:v8.9 command: - /bin/bash - -c From 162c00bdbc6ddb8871752754d542dd5f94139a33 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Wed, 24 Oct 2018 16:23:08 -0700 Subject: [PATCH 3/3] Update e2e test image manifests --- test/e2e/testing-manifests/statefulset/redis/statefulset.yaml | 2 +- .../testing-manifests/statefulset/zookeeper/statefulset.yaml | 2 +- test/images/resource-consumer/README.md | 4 ++-- test/utils/image/manifest.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml index b2ca79d799..b099b9c087 100644 --- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.1 + image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.2 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml index 90398e772f..3dd19fc51d 100644 --- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.1 + image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.2 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/images/resource-consumer/README.md b/test/images/resource-consumer/README.md index 0b78bca10b..298836ab67 100644 --- a/test/images/resource-consumer/README.md +++ b/test/images/resource-consumer/README.md @@ -48,7 +48,7 @@ Custom metrics in Prometheus format are exposed on "/metrics" endpoint. ### CURL example ```console -$ kubectl run resource-consumer --image=gcr.io/kubernetes-e2e-test-images/resource-consumer:1.3 --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080 --requests='cpu=500m,memory=256Mi' +$ kubectl run resource-consumer --image=gcr.io/kubernetes-e2e-test-images/resource-consumer:1.4 --expose --service-overrides='{ "spec": { "type": "LoadBalancer" } }' --port 8080 --requests='cpu=500m,memory=256Mi' $ kubectl get services resource-consumer ``` @@ -62,7 +62,7 @@ $ curl --data "millicores=300&durationSec=600" http://:8080/Consume ## Image -Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.3 +Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.4 ## Use cases diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index f4583d286b..6b68cc0954 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -117,7 +117,7 @@ var ( Porter = ImageConfig{e2eRegistry, "porter", "1.0"} PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"} Redis = ImageConfig{e2eRegistry, "redis", "1.0"} - ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3"} + ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.4"} ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"} ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1"} TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0"}