Merge pull request #4615 from johnwchadwick/version-check-disregard-failed-pods

Only consider running pods when determining version

pkg/util/versionchecker/fromservice.go

@@ -53,6 +53,10 @@ func (o *versionChecker) extractVersionFromService(
 	}
 
 	for _, pod := range pods.Items {
+		if pod.Status.Phase != corev1.PodRunning {
+			continue
+		}
+
 		if label := extractVersionFromLabels(pod.Labels); label != "" {
 			o.versionSources["webhookPodLabelVersion"] = label
 		}

pkg/util/versionchecker/getpodfromtemplate_test.go

@@ -51,6 +51,9 @@ func getPodFromTemplate(template *v1.PodTemplateSpec, parentObject runtime.Objec
 			Name:         prefix + cmutil.RandStringRunes(5),
 			Finalizers:   desiredFinalizers,
 		},
+		Status: v1.PodStatus{
+			Phase: v1.PodRunning,
+		},
 	}
 	if controllerRef != nil {
 		pod.OwnerReferences = append(pod.OwnerReferences, *controllerRef)