From d94e6275b23c4f4374261f3d1d68c02d1bf8b24d Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Tue, 13 Oct 2020 22:42:11 -0700 Subject: [PATCH] Don't require PriorityClassName to pass missing-static-pod checks --- pkg/validation/validate_cluster.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/validation/validate_cluster.go b/pkg/validation/validate_cluster.go index 8ab668ec29831..9117e66995814 100644 --- a/pkg/validation/validate_cluster.go +++ b/pkg/validation/validate_cluster.go @@ -225,6 +225,12 @@ func (v *ValidationCluster) collectPodFailures(ctx context.Context, client kuber return client.CoreV1().Pods(metav1.NamespaceAll).List(ctx, opts) })).EachListItem(context.TODO(), metav1.ListOptions{}, func(obj runtime.Object) error { pod := obj.(*v1.Pod) + + app := pod.GetLabels()["k8s-app"] + if pod.Namespace == "kube-system" && masterWithoutPod[nodeByAddress[pod.Status.HostIP]][app] { + delete(masterWithoutPod[nodeByAddress[pod.Status.HostIP]], app) + } + priority := pod.Spec.PriorityClassName if priority != "system-cluster-critical" && priority != "system-node-critical" { return nil @@ -262,11 +268,6 @@ func (v *ValidationCluster) collectPodFailures(ctx context.Context, client kuber }) } - - app := pod.GetLabels()["k8s-app"] - if pod.Namespace == "kube-system" && masterWithoutPod[nodeByAddress[pod.Status.HostIP]][app] { - delete(masterWithoutPod[nodeByAddress[pod.Status.HostIP]], app) - } return nil }) if err != nil {