From 9de2846c72c694f6f9dc31f0c534d65285e9d973 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 17 May 2023 09:57:47 +0530 Subject: [PATCH 1/3] remove glusterdynamic provisioner images reference from tests GlusterFS code has been removed from the repo in v1.26 and this image no longer required. Signed-off-by: Humble Chirammal --- test/e2e/common/util.go | 1 - test/utils/image/manifest.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index 1102ce2c367..e135275d479 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -63,7 +63,6 @@ var PrePulledImages = sets.NewString( imageutils.GetE2EImage(imageutils.Nginx), imageutils.GetE2EImage(imageutils.Httpd), imageutils.GetE2EImage(imageutils.VolumeNFSServer), - imageutils.GetE2EImage(imageutils.VolumeGlusterServer), imageutils.GetE2EImage(imageutils.NonRoot), ) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 9e6222f6fa1..4c69e8d903b 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -173,8 +173,6 @@ const ( DistrolessIptables // Etcd image Etcd - // GlusterDynamicProvisioner image - GlusterDynamicProvisioner // Httpd image Httpd // HttpdNew image @@ -226,8 +224,6 @@ const ( VolumeNFSServer // VolumeISCSIServer image VolumeISCSIServer - // VolumeGlusterServer image - VolumeGlusterServer // VolumeRBDServer image VolumeRBDServer // WindowsServer image @@ -247,7 +243,6 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.2.4"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.9-0"} - configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"} @@ -274,7 +269,6 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[SdDummyExporter] = Config{list.GcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.3"} configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.3"} - configs[VolumeGlusterServer] = Config{list.PromoterE2eRegistry, "volume/gluster", "1.3"} configs[VolumeRBDServer] = Config{list.PromoterE2eRegistry, "volume/rbd", "1.0.4"} configs[WindowsServer] = Config{list.MicrosoftRegistry, "windows", "1809"} From d83c3ce7ca82d18ee47be90a17c893b14f6c85fd Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 17 May 2023 10:37:38 +0530 Subject: [PATCH 2/3] make rbd and iscsi test images in parity with the test code Signed-off-by: Humble Chirammal --- test/utils/image/manifest.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 4c69e8d903b..39ab77481b5 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -268,8 +268,8 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.13"} configs[SdDummyExporter] = Config{list.GcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.3"} - configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.3"} - configs[VolumeRBDServer] = Config{list.PromoterE2eRegistry, "volume/rbd", "1.0.4"} + configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.5"} + configs[VolumeRBDServer] = Config{list.PromoterE2eRegistry, "volume/rbd", "1.0.6"} configs[WindowsServer] = Config{list.MicrosoftRegistry, "windows", "1809"} // This adds more config entries. Those have no pre-defined ImageID number, From 36f0caf7ecd44c97ddd00e779e10cb09f4621e29 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 17 May 2023 13:08:51 +0530 Subject: [PATCH 3/3] remove GlusterFS references from test/e2e/* comments/descriptions Signed-off-by: Humble Chirammal --- test/e2e/common/storage/volumes.go | 7 ++----- test/e2e/framework/pv/pv.go | 2 +- test/e2e/framework/volume/fixtures.go | 8 ++++---- test/e2e/storage/drivers/csi.go | 4 ++-- test/e2e/storage/drivers/in_tree.go | 4 ++-- test/e2e/storage/testsuites/volumes.go | 3 --- test/e2e/storage/volume_provisioning.go | 2 +- test/images/README.md | 2 +- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/test/e2e/common/storage/volumes.go b/test/e2e/common/storage/volumes.go index 65e0b8b1a16..40b7dfdabaa 100644 --- a/test/e2e/common/storage/volumes.go +++ b/test/e2e/common/storage/volumes.go @@ -18,14 +18,14 @@ limitations under the License. * This test checks that various VolumeSources are working. * * There are two ways, how to test the volumes: - * 1) With containerized server (NFS, Ceph, Gluster, iSCSI, ...) + * 1) With containerized server (NFS, Ceph, iSCSI, ...) * The test creates a server pod, exporting simple 'index.html' file. * Then it uses appropriate VolumeSource to import this file into a client pod * and checks that the pod can see the file. It does so by importing the file * into web server root and loading the index.html from it. * * These tests work only when privileged containers are allowed, exporting - * various filesystems (NFS, GlusterFS, ...) usually needs some mounting or + * various filesystems (ex: NFS) usually needs some mounting or * other privileged magic in the server pod. * * Note that the server containers are for testing purposes only and should not @@ -37,9 +37,6 @@ limitations under the License. * and checks, that Kubernetes can use it as a volume. */ -// GlusterFS test is duplicated from test/e2e/volumes.go. Any changes made there -// should be duplicated here - package storage import ( diff --git a/test/e2e/framework/pv/pv.go b/test/e2e/framework/pv/pv.go index f4bb56707f6..006091870e5 100644 --- a/test/e2e/framework/pv/pv.go +++ b/test/e2e/framework/pv/pv.go @@ -78,7 +78,7 @@ type pvcval struct{} type PVCMap map[types.NamespacedName]pvcval // PersistentVolumeConfig is consumed by MakePersistentVolume() to generate a PV object -// for varying storage options (NFS, ceph, glusterFS, etc.). +// for varying storage options (NFS, ceph, etc.). // (+optional) prebind holds a pre-bound PVC // Example pvSource: // diff --git a/test/e2e/framework/volume/fixtures.go b/test/e2e/framework/volume/fixtures.go index 031a187ab33..19e3c275da0 100644 --- a/test/e2e/framework/volume/fixtures.go +++ b/test/e2e/framework/volume/fixtures.go @@ -18,14 +18,14 @@ limitations under the License. * This test checks that various VolumeSources are working. * * There are two ways, how to test the volumes: - * 1) With containerized server (NFS, Ceph, Gluster, iSCSI, ...) + * 1) With containerized server (NFS, Ceph, iSCSI, ...) * The test creates a server pod, exporting simple 'index.html' file. * Then it uses appropriate VolumeSource to import this file into a client pod * and checks that the pod can see the file. It does so by importing the file - * into web server root and loadind the index.html from it. + * into web server root and loading the index.html from it. * * These tests work only when privileged containers are allowed, exporting - * various filesystems (NFS, GlusterFS, ...) usually needs some mounting or + * various filesystems (ex: NFS) usually needs some mounting or * other privileged magic in the server pod. * * Note that the server containers are for testing purposes only and should not @@ -87,7 +87,7 @@ const ( VolumeServerPodStartupTimeout = 3 * time.Minute // PodCleanupTimeout is a waiting period for pod to be cleaned up and unmount its volumes so we - // don't tear down containers with NFS/Ceph/Gluster server too early. + // don't tear down containers with NFS/Ceph server too early. PodCleanupTimeout = 20 * time.Second ) diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index 09548a1c2f4..9056f5f28a5 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -18,10 +18,10 @@ limitations under the License. * This file defines various csi volume test drivers for TestSuites. * * There are two ways, how to prepare test drivers: - * 1) With containerized server (NFS, Ceph, Gluster, iSCSI, ...) + * 1) With containerized server (NFS, Ceph, iSCSI, ...) * It creates a server pod which defines one volume for the tests. * These tests work only when privileged containers are allowed, exporting - * various filesystems (NFS, GlusterFS, ...) usually needs some mounting or + * various filesystems (ex: NFS) usually needs some mounting or * other privileged magic in the server pod. * * Note that the server containers are for testing purposes only and should not diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 223bc463655..70a278f4a10 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -18,10 +18,10 @@ limitations under the License. * This file defines various in-tree volume test drivers for TestSuites. * * There are two ways, how to prepare test drivers: - * 1) With containerized server (NFS, Ceph, Gluster, iSCSI, ...) + * 1) With containerized server (NFS, Ceph, iSCSI, ...) * It creates a server pod which defines one volume for the tests. * These tests work only when privileged containers are allowed, exporting - * various filesystems (NFS, GlusterFS, ...) usually needs some mounting or + * various filesystems (like NFS) usually needs some mounting or * other privileged magic in the server pod. * * Note that the server containers are for testing purposes only and should not diff --git a/test/e2e/storage/testsuites/volumes.go b/test/e2e/storage/testsuites/volumes.go index ffefc1e7720..131a9f77da0 100644 --- a/test/e2e/storage/testsuites/volumes.go +++ b/test/e2e/storage/testsuites/volumes.go @@ -16,9 +16,6 @@ limitations under the License. // This test checks that various VolumeSources are working. -// test/e2e/common/volumes.go duplicates the GlusterFS test from this file. Any changes made to this -// test should be made there as well. - package testsuites import ( diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index 08d77aeda01..e589a646684 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -638,7 +638,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() { ginkgo.By("creating a StorageClass") test.Class = testsuites.SetupStorageClass(ctx, test.Client, newStorageClass(test, ns, "invalid-aws")) - ginkgo.By("creating a claim object with a suffix for gluster dynamic provisioner") + ginkgo.By("creating a claim object") claim := e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{ ClaimSize: test.ClaimSize, StorageClassName: &test.Class.Name, diff --git a/test/images/README.md b/test/images/README.md index 15d9e3d3db4..9929a8c37ad 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -210,7 +210,7 @@ sudo chmod o+x /etc/docker ``` A few images have been mirrored from dockerhub into the `gcr.io/k8s-staging-e2e-test-images` registry -(`busybox`, `glusterdynamic-provisioner`, `httpd`, `httpd-new`, `nginx`, `nginx-new`, `perl`), and they +(`busybox`,`httpd`, `httpd-new`, `nginx`, `nginx-new`, `perl`), and they only have a noop Dockerfile. However, due to an [issue](https://github.com/kubernetes/test-infra/issues/20884), the same SHA cannot be pushed twice. A small change to them is required in order to generate a new SHA, which can then be pushed and promoted.