Merge of #5951

Author: mergify[bot]

e2e/pvc.go

@@ -408,10 +408,6 @@ func checkPVSelectorValuesForPVC(f *framework.Framework, pvc *v1.PersistentVolum
 }
 
 func getMetricsForPVC(f *framework.Framework, pvc *v1.PersistentVolumeClaim, t int) error {
-	if k8sBrokenMetrics(f.ClientSet) {
-		return nil
-	}
-
 	kubelet, err := getKubeletIP(f.ClientSet)
 	if err != nil {
 		return err

e2e/utils.go

@@ -1705,25 +1705,6 @@ func k8sVersionGreaterEquals(c kubernetes.Interface, major, minor int) bool {
 	return (vMajor > major) || (vMajor == major && vMinor >= minor)
 }
 
-var brokenMetrics *bool = nil
-
-// k8sBrokenMetrics detects if Kubernetes 1.34 is used, this version has broken
-// kube_volume_stats_* metrics:
-// https://github.com/kubernetes/kubernetes/issues/133847
-func k8sBrokenMetrics(c kubernetes.Interface) bool {
-	if brokenMetrics == nil {
-		broken := true
-		functional := true
-		if k8sVersionGreaterEquals(c, 1, 34) && !k8sVersionGreaterEquals(c, 1, 35) {
-			brokenMetrics = &broken
-		} else {
-			brokenMetrics = &functional
-		}
-	}
-
-	return *brokenMetrics
-}
-
 // waitForJobCompletion polls the status of the given job and waits until the
 // jobs has succeeded or until the timeout is hit.
 func waitForJobCompletion(c kubernetes.Interface, ns, job string, timeout int) error {