From f4d7e38a6d2155d0bb67d5f928be616ff6382159 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Wed, 17 Sep 2025 10:50:04 -0400 Subject: [PATCH 1/8] Add priorityClassName tests for default values --- test/extended/pods/priorityclasses.go | 33 +++++++++++++++++++ .../system-cluster-critical.yaml | 16 +++++++++ .../system-node-critical.yaml | 16 +++++++++ .../generated/zz_generated.annotations.go | 4 +++ 4 files changed, 69 insertions(+) create mode 100644 test/extended/testdata/priority-class-name/system-cluster-critical.yaml create mode 100644 test/extended/testdata/priority-class-name/system-node-critical.yaml diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index 31bdddbc8399..9aee18b41f89 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -3,9 +3,11 @@ package pods import ( "context" "fmt" + "path/filepath" "strings" . "github.com/onsi/ginkgo/v2" + o "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" e2e "k8s.io/kubernetes/test/e2e/framework" @@ -88,6 +90,37 @@ var _ = Describe("[sig-arch] Managed cluster should", func() { }) }) +var _ = Describe("[sig-node] Pod priority should match the default priorityClassName values", func() { + defer GinkgoRecover() + var ( + oc = exutil.NewCLI("priority-class-name") + systemNodeCriticalPodFile = filepath.Join("testdata", "priority-class-name", "system-node-critical.yaml") + systemClusterCriticalPodFile = filepath.Join("testdata", "priority-class-name", "system-cluster-critical.yaml") + ) + + It("system-node-critical=2000001000", func() { + By("creating the pods") + err := oc.Run("create").Args("-f", systemNodeCriticalPodFile).Execute() + o.Expect(err).NotTo(o.HaveOccurred()) + + By("checking the pod priority") + out, err := oc.Run("get").Args("pods/pod-with-system-node-critical-priority-class").Template("{{.spec.priority}}").Output() + o.Expect(err).NotTo(o.HaveOccurred()) + o.Expect(out).To(o.Equal("2000001000")) + }) + + It("system-cluster-critical=2000000000", func() { + By("creating the pods") + err := oc.Run("create").Args("-f", systemClusterCriticalPodFile).Execute() + o.Expect(err).NotTo(o.HaveOccurred()) + + By("checking the pod priority") + out, err := oc.Run("get").Args("pods/pod-with-system-cluster-critical-priority-class").Template("{{.spec.priority}}").Output() + o.Expect(err).NotTo(o.HaveOccurred()) + o.Expect(out).To(o.Equal("2000000000")) + }) +}) + func hasPrefixSet(name string, set sets.String) bool { for _, prefix := range set.List() { if strings.HasPrefix(name, prefix) { diff --git a/test/extended/testdata/priority-class-name/system-cluster-critical.yaml b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml new file mode 100644 index 000000000000..03aa0ca7f824 --- /dev/null +++ b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml @@ -0,0 +1,16 @@ +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: template +objects: +- kind: Pod + apiVersion: v1 + metadata: + name: pod-with-system-cluster-critical-priority-class + spec: + containers: + - name: new-container + image: busybox + command: + - ls + priorityClassName: system-cluster-critical diff --git a/test/extended/testdata/priority-class-name/system-node-critical.yaml b/test/extended/testdata/priority-class-name/system-node-critical.yaml new file mode 100644 index 000000000000..c66de7b2f337 --- /dev/null +++ b/test/extended/testdata/priority-class-name/system-node-critical.yaml @@ -0,0 +1,16 @@ +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: template +objects: +- kind: Pod + apiVersion: v1 + metadata: + name: pod-with-system-node-critical-priority-class + spec: + containers: + - name: new-container + image: busybox + command: + - ls + priorityClassName: system-node-critical diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 7defb7c82eca..991693bab650 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1947,6 +1947,10 @@ var Annotations = map[string]string{ "[sig-node] Managed cluster should verify that nodes have no unexpected reboots [Late]": " [Suite:openshift/conformance/parallel]", + "[sig-node] Pod priority should match the default priorityClassName values system-cluster-critical=2000000000": " [Suite:openshift/conformance/parallel]", + + "[sig-node] Pod priority should match the default priorityClassName values system-node-critical=2000001000": " [Suite:openshift/conformance/parallel]", + "[sig-node] [Conformance] Prevent openshift node labeling on update by the node TestOpenshiftNodeLabeling": " [Suite:openshift/conformance/parallel/minimal]", "[sig-node] [FeatureGate:ImageVolume] ImageVolume should fail when image does not exist": " [Suite:openshift/conformance/parallel]", From 753d94caa8fb70004538fa7782a22b4502815815 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Wed, 17 Sep 2025 15:14:17 -0400 Subject: [PATCH 2/8] update bind data --- test/extended/testdata/bindata.go | 74 +++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 139498077eb0..b3e7bf24d98b 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -467,6 +467,8 @@ // test/extended/testdata/poddisruptionbudgets/always-allow-policy-pdb.yaml // test/extended/testdata/poddisruptionbudgets/if-healthy-budget-policy-pdb.yaml // test/extended/testdata/poddisruptionbudgets/nginx-with-delayed-ready-deployment.yaml +// test/extended/testdata/priority-class-name/system-cluster-critical.yaml +// test/extended/testdata/priority-class-name/system-node-critical.yaml // test/extended/testdata/releases/payload-1/etcd-operator/image-references // test/extended/testdata/releases/payload-1/etcd-operator/manifest.yaml // test/extended/testdata/releases/payload-1/image-registry/10_image-registry_crd.yaml @@ -51139,6 +51141,72 @@ func testExtendedTestdataPoddisruptionbudgetsNginxWithDelayedReadyDeploymentYaml return a, nil } +var _testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml = []byte(`kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: template +objects: +- kind: Pod + apiVersion: v1 + metadata: + name: pod-with-system-cluster-critical-priority-class + spec: + containers: + - name: new-container + image: busybox + command: + - ls + priorityClassName: system-cluster-critical +`) + +func testExtendedTestdataPriorityClassNameSystemClusterCriticalYamlBytes() ([]byte, error) { + return _testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml, nil +} + +func testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml() (*asset, error) { + bytes, err := testExtendedTestdataPriorityClassNameSystemClusterCriticalYamlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "test/extended/testdata/priority-class-name/system-cluster-critical.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml = []byte(`kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: template +objects: +- kind: Pod + apiVersion: v1 + metadata: + name: pod-with-system-node-critical-priority-class + spec: + containers: + - name: new-container + image: busybox + command: + - ls + priorityClassName: system-node-critical +`) + +func testExtendedTestdataPriorityClassNameSystemNodeCriticalYamlBytes() ([]byte, error) { + return _testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml, nil +} + +func testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml() (*asset, error) { + bytes, err := testExtendedTestdataPriorityClassNameSystemNodeCriticalYamlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "test/extended/testdata/priority-class-name/system-node-critical.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _testExtendedTestdataReleasesPayload1EtcdOperatorImageReferences = []byte(`kind: ImageStream apiVersion: image.openshift.io/v1 spec: @@ -56658,6 +56726,8 @@ var _bindata = map[string]func() (*asset, error){ "test/extended/testdata/poddisruptionbudgets/always-allow-policy-pdb.yaml": testExtendedTestdataPoddisruptionbudgetsAlwaysAllowPolicyPdbYaml, "test/extended/testdata/poddisruptionbudgets/if-healthy-budget-policy-pdb.yaml": testExtendedTestdataPoddisruptionbudgetsIfHealthyBudgetPolicyPdbYaml, "test/extended/testdata/poddisruptionbudgets/nginx-with-delayed-ready-deployment.yaml": testExtendedTestdataPoddisruptionbudgetsNginxWithDelayedReadyDeploymentYaml, + "test/extended/testdata/priority-class-name/system-cluster-critical.yaml": testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml, + "test/extended/testdata/priority-class-name/system-node-critical.yaml": testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml, "test/extended/testdata/releases/payload-1/etcd-operator/image-references": testExtendedTestdataReleasesPayload1EtcdOperatorImageReferences, "test/extended/testdata/releases/payload-1/etcd-operator/manifest.yaml": testExtendedTestdataReleasesPayload1EtcdOperatorManifestYaml, "test/extended/testdata/releases/payload-1/image-registry/10_image-registry_crd.yaml": testExtendedTestdataReleasesPayload1ImageRegistry10_imageRegistry_crdYaml, @@ -57460,6 +57530,10 @@ var _bintree = &bintree{nil, map[string]*bintree{ "if-healthy-budget-policy-pdb.yaml": {testExtendedTestdataPoddisruptionbudgetsIfHealthyBudgetPolicyPdbYaml, map[string]*bintree{}}, "nginx-with-delayed-ready-deployment.yaml": {testExtendedTestdataPoddisruptionbudgetsNginxWithDelayedReadyDeploymentYaml, map[string]*bintree{}}, }}, + "priority-class-name": {nil, map[string]*bintree{ + "system-cluster-critical.yaml": {testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml, map[string]*bintree{}}, + "system-node-critical.yaml": {testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml, map[string]*bintree{}}, + }}, "releases": {nil, map[string]*bintree{ "payload-1": {nil, map[string]*bintree{ "etcd-operator": {nil, map[string]*bintree{ From 1d0e265927ca99f8e2a04118458e9113e613d59f Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Thu, 18 Sep 2025 09:30:39 -0400 Subject: [PATCH 3/8] Use the right filepath --- test/extended/pods/priorityclasses.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index 9aee18b41f89..cd060dfd5c13 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -3,7 +3,6 @@ package pods import ( "context" "fmt" - "path/filepath" "strings" . "github.com/onsi/ginkgo/v2" @@ -94,8 +93,8 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass defer GinkgoRecover() var ( oc = exutil.NewCLI("priority-class-name") - systemNodeCriticalPodFile = filepath.Join("testdata", "priority-class-name", "system-node-critical.yaml") - systemClusterCriticalPodFile = filepath.Join("testdata", "priority-class-name", "system-cluster-critical.yaml") + systemNodeCriticalPodFile = exutil.FixturePath("testdata", "priority-class-name", "system-node-critical.yaml") + systemClusterCriticalPodFile = exutil.FixturePath("testdata", "priority-class-name", "system-cluster-critical.yaml") ) It("system-node-critical=2000001000", func() { From 1d668fbc8aadb6b5591a18cc5b94431c5735a87e Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Thu, 18 Sep 2025 12:54:40 -0400 Subject: [PATCH 4/8] no template --- test/extended/testdata/bindata.go | 52 ++++++++----------- .../system-cluster-critical.yaml | 26 ++++------ .../system-node-critical.yaml | 26 ++++------ 3 files changed, 44 insertions(+), 60 deletions(-) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index b3e7bf24d98b..d752e1f477b9 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -51141,22 +51141,18 @@ func testExtendedTestdataPoddisruptionbudgetsNginxWithDelayedReadyDeploymentYaml return a, nil } -var _testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml = []byte(`kind: Template -apiVersion: template.openshift.io/v1 +var _testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml = []byte(`apiVersion: v1 +kind: Pod metadata: - name: template -objects: -- kind: Pod - apiVersion: v1 - metadata: - name: pod-with-system-cluster-critical-priority-class - spec: - containers: - - name: new-container - image: busybox - command: - - ls - priorityClassName: system-cluster-critical + name: pod-with-system-cluster-critical-priority-class +spec: + containers: + - name: busybox + image: busybox + command: + - sleep + - "3600" + priorityClassName: system-cluster-critical `) func testExtendedTestdataPriorityClassNameSystemClusterCriticalYamlBytes() ([]byte, error) { @@ -51174,22 +51170,18 @@ func testExtendedTestdataPriorityClassNameSystemClusterCriticalYaml() (*asset, e return a, nil } -var _testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml = []byte(`kind: Template -apiVersion: template.openshift.io/v1 +var _testExtendedTestdataPriorityClassNameSystemNodeCriticalYaml = []byte(`apiVersion: v1 +kind: Pod metadata: - name: template -objects: -- kind: Pod - apiVersion: v1 - metadata: - name: pod-with-system-node-critical-priority-class - spec: - containers: - - name: new-container - image: busybox - command: - - ls - priorityClassName: system-node-critical + name: pod-with-system-node-critical-priority-class +spec: + containers: + - name: busybox + image: busybox + command: + - sleep + - "3600" + priorityClassName: system-node-critical `) func testExtendedTestdataPriorityClassNameSystemNodeCriticalYamlBytes() ([]byte, error) { diff --git a/test/extended/testdata/priority-class-name/system-cluster-critical.yaml b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml index 03aa0ca7f824..546dd76dffbe 100644 --- a/test/extended/testdata/priority-class-name/system-cluster-critical.yaml +++ b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml @@ -1,16 +1,12 @@ -kind: Template -apiVersion: template.openshift.io/v1 +apiVersion: v1 +kind: Pod metadata: - name: template -objects: -- kind: Pod - apiVersion: v1 - metadata: - name: pod-with-system-cluster-critical-priority-class - spec: - containers: - - name: new-container - image: busybox - command: - - ls - priorityClassName: system-cluster-critical + name: pod-with-system-cluster-critical-priority-class +spec: + containers: + - name: busybox + image: busybox + command: + - sleep + - "3600" + priorityClassName: system-cluster-critical diff --git a/test/extended/testdata/priority-class-name/system-node-critical.yaml b/test/extended/testdata/priority-class-name/system-node-critical.yaml index c66de7b2f337..a4bd818f0f85 100644 --- a/test/extended/testdata/priority-class-name/system-node-critical.yaml +++ b/test/extended/testdata/priority-class-name/system-node-critical.yaml @@ -1,16 +1,12 @@ -kind: Template -apiVersion: template.openshift.io/v1 +apiVersion: v1 +kind: Pod metadata: - name: template -objects: -- kind: Pod - apiVersion: v1 - metadata: - name: pod-with-system-node-critical-priority-class - spec: - containers: - - name: new-container - image: busybox - command: - - ls - priorityClassName: system-node-critical + name: pod-with-system-node-critical-priority-class +spec: + containers: + - name: busybox + image: busybox + command: + - sleep + - "3600" + priorityClassName: system-node-critical From 8e6c2825e4b8002b0a9df46ec2177f286dcf9344 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Thu, 18 Sep 2025 17:35:33 -0400 Subject: [PATCH 5/8] add namespace and delete pods --- test/extended/pods/priorityclasses.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index cd060dfd5c13..c235532f3f37 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -99,24 +99,28 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass It("system-node-critical=2000001000", func() { By("creating the pods") - err := oc.Run("create").Args("-f", systemNodeCriticalPodFile).Execute() + err := oc.Run("create").Args("-n", oc.Namespace(), "-f", systemNodeCriticalPodFile).Execute() o.Expect(err).NotTo(o.HaveOccurred()) By("checking the pod priority") - out, err := oc.Run("get").Args("pods/pod-with-system-node-critical-priority-class").Template("{{.spec.priority}}").Output() + pod, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), "pod-with-system-node-critical-priority-class", metav1.GetOptions{}) + o.Expect(err).NotTo(o.HaveOccurred()) + o.Expect(pod.Spec.Priority).To(o.Equal(2000001000)) + err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Delete(context.Background(), "pod-with-system-node-critical-priority-class", metav1.DeleteOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(out).To(o.Equal("2000001000")) }) It("system-cluster-critical=2000000000", func() { By("creating the pods") - err := oc.Run("create").Args("-f", systemClusterCriticalPodFile).Execute() + err := oc.Run("create").Args("-n", oc.Namespace(), "-f", systemClusterCriticalPodFile).Execute() o.Expect(err).NotTo(o.HaveOccurred()) By("checking the pod priority") - out, err := oc.Run("get").Args("pods/pod-with-system-cluster-critical-priority-class").Template("{{.spec.priority}}").Output() + pod, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.GetOptions{}) + o.Expect(err).NotTo(o.HaveOccurred()) + o.Expect(pod.Spec.Priority).To(o.Equal(2000001000)) + err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Delete(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.DeleteOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(out).To(o.Equal("2000000000")) }) }) From 389b19a9ea75c957b117fbf4f37bfe1eb89144f6 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Thu, 18 Sep 2025 17:35:58 -0400 Subject: [PATCH 6/8] correct priority --- test/extended/pods/priorityclasses.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index c235532f3f37..c979bb45592b 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -118,7 +118,7 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass By("checking the pod priority") pod, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(pod.Spec.Priority).To(o.Equal(2000001000)) + o.Expect(pod.Spec.Priority).To(o.Equal(2000000000)) err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Delete(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.DeleteOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) }) From 47ce8ab3964b02c5dd81787565a8f26e3abff469 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Thu, 18 Sep 2025 22:57:57 -0400 Subject: [PATCH 7/8] cast --- test/extended/pods/priorityclasses.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index c979bb45592b..8936534c84da 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -105,7 +105,7 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass By("checking the pod priority") pod, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), "pod-with-system-node-critical-priority-class", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(pod.Spec.Priority).To(o.Equal(2000001000)) + o.Expect((int)(*pod.Spec.Priority)).To(o.Equal(2000001000)) err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Delete(context.Background(), "pod-with-system-node-critical-priority-class", metav1.DeleteOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) }) @@ -118,7 +118,7 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass By("checking the pod priority") pod, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Get(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - o.Expect(pod.Spec.Priority).To(o.Equal(2000000000)) + o.Expect((int)(*pod.Spec.Priority)).To(o.Equal(2000000000)) err = oc.KubeClient().CoreV1().Pods(oc.Namespace()).Delete(context.Background(), "pod-with-system-cluster-critical-priority-class", metav1.DeleteOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) }) From 84ad3df85c187b3cf38015608191d727b83a2eb7 Mon Sep 17 00:00:00 2001 From: Corey Cook Date: Wed, 24 Sep 2025 03:37:59 -0400 Subject: [PATCH 8/8] rename tests and update image --- test/extended/pods/priorityclasses.go | 4 ++-- test/extended/testdata/bindata.go | 8 ++++---- .../priority-class-name/system-cluster-critical.yaml | 4 ++-- .../priority-class-name/system-node-critical.yaml | 4 ++-- .../util/annotate/generated/zz_generated.annotations.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/extended/pods/priorityclasses.go b/test/extended/pods/priorityclasses.go index 8936534c84da..0282f55de097 100644 --- a/test/extended/pods/priorityclasses.go +++ b/test/extended/pods/priorityclasses.go @@ -97,7 +97,7 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass systemClusterCriticalPodFile = exutil.FixturePath("testdata", "priority-class-name", "system-cluster-critical.yaml") ) - It("system-node-critical=2000001000", func() { + It("system-node-critical", func() { By("creating the pods") err := oc.Run("create").Args("-n", oc.Namespace(), "-f", systemNodeCriticalPodFile).Execute() o.Expect(err).NotTo(o.HaveOccurred()) @@ -110,7 +110,7 @@ var _ = Describe("[sig-node] Pod priority should match the default priorityClass o.Expect(err).NotTo(o.HaveOccurred()) }) - It("system-cluster-critical=2000000000", func() { + It("system-cluster-critical", func() { By("creating the pods") err := oc.Run("create").Args("-n", oc.Namespace(), "-f", systemClusterCriticalPodFile).Execute() o.Expect(err).NotTo(o.HaveOccurred()) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index d752e1f477b9..6ab1d881862a 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -51147,8 +51147,8 @@ metadata: name: pod-with-system-cluster-critical-priority-class spec: containers: - - name: busybox - image: busybox + - name: tools + image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest command: - sleep - "3600" @@ -51176,8 +51176,8 @@ metadata: name: pod-with-system-node-critical-priority-class spec: containers: - - name: busybox - image: busybox + - name: tools + image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest command: - sleep - "3600" diff --git a/test/extended/testdata/priority-class-name/system-cluster-critical.yaml b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml index 546dd76dffbe..94a5e5bb0708 100644 --- a/test/extended/testdata/priority-class-name/system-cluster-critical.yaml +++ b/test/extended/testdata/priority-class-name/system-cluster-critical.yaml @@ -4,8 +4,8 @@ metadata: name: pod-with-system-cluster-critical-priority-class spec: containers: - - name: busybox - image: busybox + - name: tools + image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest command: - sleep - "3600" diff --git a/test/extended/testdata/priority-class-name/system-node-critical.yaml b/test/extended/testdata/priority-class-name/system-node-critical.yaml index a4bd818f0f85..7ca94d6ef440 100644 --- a/test/extended/testdata/priority-class-name/system-node-critical.yaml +++ b/test/extended/testdata/priority-class-name/system-node-critical.yaml @@ -4,8 +4,8 @@ metadata: name: pod-with-system-node-critical-priority-class spec: containers: - - name: busybox - image: busybox + - name: tools + image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest command: - sleep - "3600" diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 991693bab650..b0f9a7cffe41 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1947,9 +1947,9 @@ var Annotations = map[string]string{ "[sig-node] Managed cluster should verify that nodes have no unexpected reboots [Late]": " [Suite:openshift/conformance/parallel]", - "[sig-node] Pod priority should match the default priorityClassName values system-cluster-critical=2000000000": " [Suite:openshift/conformance/parallel]", + "[sig-node] Pod priority should match the default priorityClassName values system-cluster-critical": " [Suite:openshift/conformance/parallel]", - "[sig-node] Pod priority should match the default priorityClassName values system-node-critical=2000001000": " [Suite:openshift/conformance/parallel]", + "[sig-node] Pod priority should match the default priorityClassName values system-node-critical": " [Suite:openshift/conformance/parallel]", "[sig-node] [Conformance] Prevent openshift node labeling on update by the node TestOpenshiftNodeLabeling": " [Suite:openshift/conformance/parallel/minimal]",