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

Merge pull request #62133 from AishSundar/patch-1 

Automatic merge from submit-queue. 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>.

Migrating test images to gcr.io/kubernetes-e2e-test-images

**What this PR does / why we need it**:
Currently e2e test images are distributed between 2 different registry locations, k8s.gcr.io and gcr.io/kubernetes-e2e-test-images. This is part of a multi-step initiative to house all the images in gcr.io/kubernetes-e2e-test-images.

**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 #62131

**Special notes for your reviewer**:
1. I am starting off with migrating images under k8s/test/images/volumes-tester. 
2. I did not move ceph and nfs images since they are marked for [deprecation and removal](https://github.com/kubernetes/kubernetes/tree/master/test/images/volumes-tester). Let me know if we want them moved as well.
3. I have made a copy of the images in gcr.io/kubernetes-e2e-test-images so the references are not broken post the PR merge. Will work on removing the images from k8s.gcr.io once this change sticks.
pull/8/head
Kubernetes Submit Queue 2018-04-05 23:17:41 -07:00 committed by GitHub
parent 07d1a8cb0c 72d7be5433
commit 5898d5915a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/manifests/e2e-image-puller.manifest
View File

@ -69,11 +69,11 @@ spec:
k8s.gcr.io/test-webserver:e2e
k8s.gcr.io/update-demo:kitten
k8s.gcr.io/update-demo:nautilus
k8s.gcr.io/volume-ceph:0.1
k8s.gcr.io/volume-gluster:0.2
k8s.gcr.io/volume-iscsi:0.1
k8s.gcr.io/volume-nfs:0.8
k8s.gcr.io/volume-rbd:0.1
gcr.io/kubernetes-e2e-test-images/volume-ceph:0.1
gcr.io/kubernetes-e2e-test-images/volume-gluster:0.2
gcr.io/kubernetes-e2e-test-images/volume-iscsi:0.1
gcr.io/kubernetes-e2e-test-images/volume-nfs:0.8
gcr.io/kubernetes-e2e-test-images/volume-rbd:0.1
k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
gcr.io/google_samples/gb-redisslave:nonexistent
; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;

2
test/images/volumes-tester/ceph/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.1
PREFIX = staging-k8s.gcr.io
PREFIX = gcr.io/kubernetes-e2e-test-images
all: push

2
test/images/volumes-tester/gluster/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.5
PREFIX = staging-k8s.gcr.io
PREFIX = gcr.io/kubernetes-e2e-test-images
all: push

2
test/images/volumes-tester/iscsi/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.2
PREFIX = staging-k8s.gcr.io
PREFIX = gcr.io/kubernetes-e2e-test-images
all: push

2
test/images/volumes-tester/nfs/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.8
PREFIX = staging-k8s.gcr.io
PREFIX = gcr.io/kubernetes-e2e-test-images
all: push

2
test/images/volumes-tester/rbd/Makefile
View File

@ -13,7 +13,7 @@
# limitations under the License.
TAG = 0.2
PREFIX = staging-k8s.gcr.io
PREFIX = gcr.io/kubernetes-e2e-test-images
all: push

8
test/utils/image/manifest.go
View File

@ -93,10 +93,10 @@ var (
SDDummyExporter = ImageConfig{gcRegistry, "sd-dummy-exporter", "v0.1.0", false}
ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.0", true}
TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", true}
VolumeNFSServer = ImageConfig{gcRegistry, "volume-nfs", "0.8", false}
VolumeISCSIServer = ImageConfig{gcRegistry, "volume-iscsi", "0.2", false}
VolumeGlusterServer = ImageConfig{gcRegistry, "volume-gluster", "0.5", false}
VolumeRBDServer = ImageConfig{gcRegistry, "volume-rbd", "0.2", false}
VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false}
VolumeISCSIServer = ImageConfig{e2eRegistry, "volume-iscsi", "0.2", false}
VolumeGlusterServer = ImageConfig{e2eRegistry, "volume-gluster", "0.5", false}
VolumeRBDServer = ImageConfig{e2eRegistry, "volume-rbd", "0.2", false}
)
func GetE2EImage(image ImageConfig) string {