From 528baa09f6de14d45c99d565728337415410ac9e Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 8 Jun 2021 20:19:52 +0200 Subject: [PATCH] e2e storage: disable health-monitor controller in hostpath deployment This reverts commit c15fd76ee9052b257dc16e275078a354695141e7. Most (all?) of the hostpath tests and several other tests started to fail again in gce-scale-master-correctness after re-enabling the controller. This shows that it was not just the obsolete agent which causes scalability problems, but also the controller. It has to be disabled until the scalability problems are addressed. --- test/e2e/storage/drivers/csi.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index dbbf93fa1b7..92b744b732c 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -242,16 +242,19 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo return err } - // Remove csi-external-health-monitor-agent because it is - // obsolete and shouldn't have been deployed by csi-driver-host-path v1.7.2. - // This can be removed when updating to a newer driver that - // doesn't deploy the agent. + // Remove csi-external-health-monitor-agent and + // csi-external-health-monitor-controller + // containers. The agent is obsolete. + // The controller is not needed for any of the + // tests and is causing too much overhead when + // running in a large cluster (see + // https://github.com/kubernetes/kubernetes/issues/102452#issuecomment-856991009). switch item := item.(type) { case *appsv1.StatefulSet: var containers []v1.Container for _, container := range item.Spec.Template.Spec.Containers { switch container.Name { - case "csi-external-health-monitor-agent": + case "csi-external-health-monitor-agent", "csi-external-health-monitor-controller": // Remove these containers. default: // Keep the others.