From 22a5fbcfa98a750a0b9b9f0bceabde2493ebd721 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Wed, 1 May 2019 21:43:49 -0700 Subject: [PATCH] test images: Bumps image versions The way the images are built is going to be changed, and in order to avoid overwritting and breaking the current images, the image versions are bumped. --- test/images/agnhost/VERSION | 2 +- test/images/agnhost/agnhost.go | 2 +- test/images/apparmor-loader/VERSION | 2 +- test/images/cuda-vector-add/VERSION | 2 +- test/images/echoserver/VERSION | 2 +- test/images/ipc-utils/VERSION | 2 +- test/images/jessie-dnsutils/VERSION | 2 +- test/images/kitten/BASEIMAGE | 10 +++++----- test/images/metadata-concealment/VERSION | 2 +- test/images/nautilus/BASEIMAGE | 10 +++++----- test/images/node-perf/npb-ep/VERSION | 2 +- test/images/node-perf/npb-is/VERSION | 2 +- test/images/node-perf/tf-wide-deep/VERSION | 2 +- test/images/nonewprivs/VERSION | 2 +- test/images/nonroot/VERSION | 2 +- test/images/pets/peer-finder/VERSION | 2 +- test/images/pets/redis-installer/VERSION | 2 +- test/images/pets/zookeeper-installer/VERSION | 2 +- test/images/redis/VERSION | 2 +- test/images/regression-issue-74839/VERSION | 2 +- test/images/resource-consumer/README.md | 4 ++-- test/images/resource-consumer/VERSION | 2 +- test/images/sample-apiserver/VERSION | 2 +- test/images/sample-device-plugin/VERSION | 2 +- test/images/volume/gluster/VERSION | 2 +- test/images/volume/iscsi/VERSION | 2 +- test/images/volume/nfs/VERSION | 2 +- test/images/volume/rbd/VERSION | 2 +- 28 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/images/agnhost/VERSION b/test/images/agnhost/VERSION index 37989bd16b4..6a5fe6e8977 100644 --- a/test/images/agnhost/VERSION +++ b/test/images/agnhost/VERSION @@ -1 +1 @@ -2.10 +2.11 diff --git a/test/images/agnhost/agnhost.go b/test/images/agnhost/agnhost.go index 6d6510d8c71..ca82e93c2b8 100644 --- a/test/images/agnhost/agnhost.go +++ b/test/images/agnhost/agnhost.go @@ -48,7 +48,7 @@ import ( ) func main() { - rootCmd := &cobra.Command{Use: "app", Version: "2.10"} + rootCmd := &cobra.Command{Use: "app", Version: "2.11"} rootCmd.AddCommand(auditproxy.CmdAuditProxy) rootCmd.AddCommand(connect.CmdConnect) diff --git a/test/images/apparmor-loader/VERSION b/test/images/apparmor-loader/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/apparmor-loader/VERSION +++ b/test/images/apparmor-loader/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/cuda-vector-add/VERSION b/test/images/cuda-vector-add/VERSION index cd5ac039d67..879b416e609 100644 --- a/test/images/cuda-vector-add/VERSION +++ b/test/images/cuda-vector-add/VERSION @@ -1 +1 @@ -2.0 +2.1 diff --git a/test/images/echoserver/VERSION b/test/images/echoserver/VERSION index 8bbe6cf74a1..bb576dbde10 100644 --- a/test/images/echoserver/VERSION +++ b/test/images/echoserver/VERSION @@ -1 +1 @@ -2.2 +2.3 diff --git a/test/images/ipc-utils/VERSION b/test/images/ipc-utils/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/ipc-utils/VERSION +++ b/test/images/ipc-utils/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/jessie-dnsutils/VERSION +++ b/test/images/jessie-dnsutils/VERSION @@ -1 +1 @@ -1.2 +1.3 diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE index 20b2972e552..a6c10a149fe 100644 --- a/test/images/kitten/BASEIMAGE +++ b/test/images/kitten/BASEIMAGE @@ -1,5 +1,5 @@ -amd64=gcr.io/kubernetes-e2e-test-images/agnhost-amd64:2.7 -arm=gcr.io/kubernetes-e2e-test-images/agnhost-arm:2.7 -arm64=gcr.io/kubernetes-e2e-test-images/agnhost-arm64:2.7 -ppc64le=gcr.io/kubernetes-e2e-test-images/agnhost-ppc64le:2.7 -s390x=gcr.io/kubernetes-e2e-test-images/agnhost-s390x:2.7 +amd64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-amd64:2.11 +arm=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm:2.11 +arm64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm64:2.11 +ppc64le=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-ppc64le:2.11 +s390x=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-s390x:2.11 diff --git a/test/images/metadata-concealment/VERSION b/test/images/metadata-concealment/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/metadata-concealment/VERSION +++ b/test/images/metadata-concealment/VERSION @@ -1 +1 @@ -1.2 +1.3 diff --git a/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE index 20b2972e552..a6c10a149fe 100644 --- a/test/images/nautilus/BASEIMAGE +++ b/test/images/nautilus/BASEIMAGE @@ -1,5 +1,5 @@ -amd64=gcr.io/kubernetes-e2e-test-images/agnhost-amd64:2.7 -arm=gcr.io/kubernetes-e2e-test-images/agnhost-arm:2.7 -arm64=gcr.io/kubernetes-e2e-test-images/agnhost-arm64:2.7 -ppc64le=gcr.io/kubernetes-e2e-test-images/agnhost-ppc64le:2.7 -s390x=gcr.io/kubernetes-e2e-test-images/agnhost-s390x:2.7 +amd64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-amd64:2.11 +arm=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm:2.11 +arm64=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-arm64:2.11 +ppc64le=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-ppc64le:2.11 +s390x=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost-s390x:2.11 diff --git a/test/images/node-perf/npb-ep/VERSION b/test/images/node-perf/npb-ep/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/node-perf/npb-ep/VERSION +++ b/test/images/node-perf/npb-ep/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/node-perf/npb-is/VERSION b/test/images/node-perf/npb-is/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/node-perf/npb-is/VERSION +++ b/test/images/node-perf/npb-is/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/node-perf/tf-wide-deep/VERSION b/test/images/node-perf/tf-wide-deep/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/node-perf/tf-wide-deep/VERSION +++ b/test/images/node-perf/tf-wide-deep/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/nonewprivs/VERSION b/test/images/nonewprivs/VERSION index 9459d4ba2a0..5625e59da88 100644 --- a/test/images/nonewprivs/VERSION +++ b/test/images/nonewprivs/VERSION @@ -1 +1 @@ -1.1 +1.2 diff --git a/test/images/nonroot/VERSION b/test/images/nonroot/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/nonroot/VERSION +++ b/test/images/nonroot/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/pets/peer-finder/VERSION b/test/images/pets/peer-finder/VERSION index 7e32cd56983..c068b2447cc 100644 --- a/test/images/pets/peer-finder/VERSION +++ b/test/images/pets/peer-finder/VERSION @@ -1 +1 @@ -1.3 +1.4 diff --git a/test/images/pets/redis-installer/VERSION b/test/images/pets/redis-installer/VERSION index 7e32cd56983..c068b2447cc 100644 --- a/test/images/pets/redis-installer/VERSION +++ b/test/images/pets/redis-installer/VERSION @@ -1 +1 @@ -1.3 +1.4 diff --git a/test/images/pets/zookeeper-installer/VERSION b/test/images/pets/zookeeper-installer/VERSION index 7e32cd56983..c068b2447cc 100644 --- a/test/images/pets/zookeeper-installer/VERSION +++ b/test/images/pets/zookeeper-installer/VERSION @@ -1 +1 @@ -1.3 +1.4 diff --git a/test/images/redis/VERSION b/test/images/redis/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/redis/VERSION +++ b/test/images/redis/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/regression-issue-74839/VERSION b/test/images/regression-issue-74839/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/regression-issue-74839/VERSION +++ b/test/images/regression-issue-74839/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/resource-consumer/README.md b/test/images/resource-consumer/README.md index e6a168c716d..a88dda3de53 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.4 --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.7 --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/ConsumeCP ## Image -Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.4 +Docker image of Resource Consumer can be found in Google Container Registry as gcr.io/kubernetes-e2e-test-images/resource-consumer:1.7 ## Use cases diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index 810ee4e91e2..d3bdbdf1fda 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/test/images/sample-apiserver/VERSION b/test/images/sample-apiserver/VERSION index 06fb41b6322..b9a05a6dc1d 100644 --- a/test/images/sample-apiserver/VERSION +++ b/test/images/sample-apiserver/VERSION @@ -1 +1 @@ -1.17.2 +1.17.3 diff --git a/test/images/sample-device-plugin/VERSION b/test/images/sample-device-plugin/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/sample-device-plugin/VERSION +++ b/test/images/sample-device-plugin/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/volume/gluster/VERSION b/test/images/volume/gluster/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/volume/gluster/VERSION +++ b/test/images/volume/gluster/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/volume/iscsi/VERSION b/test/images/volume/iscsi/VERSION index cd5ac039d67..879b416e609 100644 --- a/test/images/volume/iscsi/VERSION +++ b/test/images/volume/iscsi/VERSION @@ -1 +1 @@ -2.0 +2.1 diff --git a/test/images/volume/nfs/VERSION b/test/images/volume/nfs/VERSION index d3827e75a5c..9459d4ba2a0 100644 --- a/test/images/volume/nfs/VERSION +++ b/test/images/volume/nfs/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/test/images/volume/rbd/VERSION b/test/images/volume/rbd/VERSION index 7dea76edb3d..6d7de6e6abe 100644 --- a/test/images/volume/rbd/VERSION +++ b/test/images/volume/rbd/VERSION @@ -1 +1 @@ -1.0.1 +1.0.2