Merge pull request #102627 from pohly/enable-health-check-controller

e2e storage: enable health-check controller in hostpath deployment
This commit is contained in:
Kubernetes Prow Robot 2021-06-07 13:41:08 -07:00 committed by GitHub
commit d59c06541b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -241,18 +241,16 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo
return err
}
// Remove csi-external-health-monitor-agent and
// csi-external-health-monitor-controller
// containers. They are not needed for any of the
// tests and may be causing too much overhead when
// running in a large cluster (see
// https://github.com/kubernetes/kubernetes/issues/102452#issuecomment-854452816).
// 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.
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", "csi-external-health-monitor-controller":
case "csi-external-health-monitor-agent":
// Remove these containers.
default:
// Keep the others.