github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/storage/drivers/csi.go
View File

@ -241,18 +241,16 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo
return err return err
} }
// Remove csi-external-health-monitor-agent and // Remove csi-external-health-monitor-agent because it is
// csi-external-health-monitor-controller // obsolete and shouldn't have been deployed by csi-driver-host-path v1.7.2.
// containers. They are not needed for any of the // This can be removed when updating to a newer driver that
// tests and may be causing too much overhead when // doesn't deploy the agent.
// running in a large cluster (see
// https://github.com/kubernetes/kubernetes/issues/102452#issuecomment-854452816).
switch item := item.(type) { switch item := item.(type) {
case *appsv1.StatefulSet: case *appsv1.StatefulSet:
var containers []v1.Container var containers []v1.Container
for _, container := range item.Spec.Template.Spec.Containers { for _, container := range item.Spec.Template.Spec.Containers {
switch container.Name { switch container.Name {
case "csi-external-health-monitor-agent", "csi-external-health-monitor-controller": case "csi-external-health-monitor-agent":
// Remove these containers. // Remove these containers.
default: default:
// Keep the others. // Keep the others.