Skip to content

Commit f65f76f

Browse files
Merge pull request openshift-kni#1593 from shajmakh/rte-prio-class
controller: test: verify RTE has a critical priority class
2 parents 961b93a + 1562965 commit f65f76f

File tree

15 files changed

+178
-20
lines changed

15 files changed

+178
-20
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/go-logr/logr v1.4.2
1010
github.com/google/go-cmp v0.6.0
1111
github.com/jaypipes/ghw v0.16.0
12-
github.com/k8stopologyawareschedwg/deployer v0.22.0
12+
github.com/k8stopologyawareschedwg/deployer v0.23.0
1313
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2
1414
github.com/k8stopologyawareschedwg/podfingerprint v0.2.2
1515
github.com/k8stopologyawareschedwg/resource-topology-exporter v0.21.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,8 +1787,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
17871787
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
17881788
github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
17891789
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
1790-
github.com/k8stopologyawareschedwg/deployer v0.22.0 h1:cQ6su4QwckfcVtu7ATRozlgC9lxIepys3SQirwZJU4E=
1791-
github.com/k8stopologyawareschedwg/deployer v0.22.0/go.mod h1:iuxnqz36KLXka+26vFRI6UIkWl5/yt+rtyBr26YFEVI=
1790+
github.com/k8stopologyawareschedwg/deployer v0.23.0 h1:Or30vJZ3cQNHxiRbnjaI1e8xa4M88D+tA6Txu526fXE=
1791+
github.com/k8stopologyawareschedwg/deployer v0.23.0/go.mod h1:f4G4LRMdkRrc76GBsJR8HOdFqiPPqWq7IYemJqtNgQk=
17921792
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2 h1:uAwqOtyrFYggq3pVf3hs1XKkBxrQ8dkgjWz3LCLJsiY=
17931793
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2/go.mod h1:LBzS4n6GX1C69tzSd5EibZ9cGOXFuHP7GxEMDYVe1sM=
17941794
github.com/k8stopologyawareschedwg/podfingerprint v0.2.2 h1:iFHPfZInM9pz2neye5RdmORMp1hPmte1EGJYpOOzZVg=

internal/controller/numaresourcesoperator_controller_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import (
5555
"github.com/openshift-kni/numaresources-operator/pkg/hash"
5656
"github.com/openshift-kni/numaresources-operator/pkg/images"
5757
rtemetricsmanifests "github.com/openshift-kni/numaresources-operator/pkg/metrics/manifests/monitor"
58+
nrosched "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler"
5859
"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
5960
"github.com/openshift-kni/numaresources-operator/pkg/objectstate/rte"
6061
"github.com/openshift-kni/numaresources-operator/pkg/status"
@@ -282,6 +283,17 @@ var _ = Describe("Test NUMAResourcesOperator Reconcile", func() {
282283
Expect(nro.Status.NodeGroups[1].Config).To(Equal(conf), "default node group config for %q was not updated in the operator status", nro.Status.NodeGroups[1].PoolName)
283284
})
284285

286+
It("RTE ds should have the correct priority class", func() {
287+
dsKey := client.ObjectKey{
288+
Name: objectnames.GetComponentName(nro.Name, pn1),
289+
Namespace: testNamespace,
290+
}
291+
ds := &appsv1.DaemonSet{}
292+
Expect(reconciler.Client.Get(context.TODO(), dsKey, ds)).To(Succeed())
293+
294+
Expect(ds.Spec.Template.Spec.PriorityClassName).To(Equal(nrosched.SchedulerPriorityClassName))
295+
})
296+
285297
It("should update node group statuses with the updated configuration", func() {
286298
defaultConf := nropv1.DefaultNodeGroupConfig()
287299

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/images/consts.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/manifests.go

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/rte/rte.go

Lines changed: 39 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/yaml/rte/daemonset.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/yaml/rte/networkpolicy.apiserver.yaml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/yaml/rte/networkpolicy.metrics.yaml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/k8stopologyawareschedwg/deployer/pkg/manifests/yaml/rte/networkpolicy.yaml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)