Merge pull request #80342 from draveness/feature/remove-critical-pod-annotation

feat: cleanup pod critical pod annotations feature

test/e2e/testing-manifests/sample-device-plugin.yaml

@@ -14,7 +14,6 @@ spec:
       labels:
         k8s-app: sample-device-plugin
       annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       priorityClassName: system-node-critical
       tolerations:

test/e2e_node/BUILD

@@ -124,6 +124,7 @@ go_test(
     tags = ["e2e"],
     deps = [
         "//pkg/apis/core:go_default_library",
+        "//pkg/apis/scheduling:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/kubelet:go_default_library",
         "//pkg/kubelet/apis/config:go_default_library",

test/e2e_node/critical_pod_test.go

@@ -19,11 +19,11 @@ package e2e_node
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeapi "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/features"
+	"k8s.io/kubernetes/pkg/apis/scheduling"
 	kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
 	kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -48,7 +48,6 @@ var _ = framework.KubeDescribe("CriticalPod [Serial] [Disruptive] [NodeFeature:C
 			if initialConfig.FeatureGates == nil {
 				initialConfig.FeatureGates = make(map[string]bool)
 			}
-			initialConfig.FeatureGates[string(features.ExperimentalCriticalPodAnnotation)] = true
 		})
 
 		ginkgo.It("should be able to create and delete a critical pod", func() {
@@ -143,11 +142,14 @@ func getTestPod(critical bool, name string, resources v1.ResourceRequirements) *
 	if critical {
 		pod.ObjectMeta.Namespace = kubeapi.NamespaceSystem
 		pod.ObjectMeta.Annotations = map[string]string{
-			kubelettypes.CriticalPodAnnotationKey: "",
+			kubelettypes.ConfigSourceAnnotationKey: kubelettypes.FileSource,
 		}
-		gomega.Expect(kubelettypes.IsCritical(pod.Namespace, pod.Annotations)).To(gomega.BeTrue(), "pod should be a critical pod")
+		podPriority := scheduling.SystemCriticalPriority
+		pod.Spec.Priority = &podPriority
+
+		gomega.Expect(kubelettypes.IsCriticalPod(pod)).To(gomega.BeTrue(), "pod should be a critical pod")
 	} else {
-		gomega.Expect(kubelettypes.IsCritical(pod.Namespace, pod.Annotations)).To(gomega.BeFalse(), "pod should not be a critical pod")
+		gomega.Expect(kubelettypes.IsCriticalPod(pod)).To(gomega.BeFalse(), "pod should not be a critical pod")
 	}
 	return pod
 }

test/kubemark/resources/kube_dns_template.yaml

@@ -57,9 +57,8 @@ spec:
     metadata:
       labels:
         k8s-app: kube-dns
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"