Skip to content

OADP-2785: Add PriorityClassName support to PodConfig in DataProtectionApplication #2010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: oadp-dev
Choose a base branch
from
+151 −16
Open

OADP-2785: Add PriorityClassName support to PodConfig in DataProtectionApplication #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c24396c
Add PriorityClassName support to PodConfig in DataProtectionApplication
kaovilai Nov 5, 2025
5e23ee3
Add test cases for NodeAgent and Velero deployments without PriorityC…
kaovilai Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/v1alpha1/dataprotectionapplication_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ type PodConfig struct {
// env defines the list of environment variables to be supplied to podSpec
// +optional
Env []corev1.EnvVar `json:"env,omitempty"`
// priorityClassName defines the PriorityClass name to be applied to the pod
// +optional
PriorityClassName string `json:"priorityClassName,omitempty"`
}

type NodeAgentCommonFields struct {
Expand Down
9 changes: 9 additions & 0 deletions bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down Expand Up @@ -848,6 +851,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down Expand Up @@ -1365,6 +1371,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down Expand Up @@ -848,6 +851,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down Expand Up @@ -1365,6 +1371,9 @@ spec:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
priorityClassName:
description: priorityClassName defines the PriorityClass name to be applied to the pod
type: string
resourceAllocations:
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
nullable: true
Expand Down
6 changes: 6 additions & 0 deletions internal/controller/nodeagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,12 @@ func (r *DataProtectionApplicationReconciler) buildNodeAgentDaemonset(ds *appsv1
install.WithServiceAccountName(common.Velero),
install.WithNodeAgentConfigMap(configMapName),
install.WithLabels(map[string]string{NodeAgentCMVersionLabel: configMapGeneration}),
install.WithPriorityClassName(func() string {
if dpa.Spec.Configuration.NodeAgent != nil && dpa.Spec.Configuration.NodeAgent.PodConfig != nil {
return dpa.Spec.Configuration.NodeAgent.PodConfig.PriorityClassName
}
return ""
}()),
)
ds.TypeMeta = installDs.TypeMeta
var err error
Expand Down
51 changes: 51 additions & 0 deletions internal/controller/nodeagent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ type TestBuiltNodeAgentDaemonSetOptions struct {
toleration []corev1.Toleration
nodeSelector map[string]string
disableFsBackup *bool
priorityClassName string
}

func createTestBuiltNodeAgentDaemonSet(options TestBuiltNodeAgentDaemonSetOptions) *appsv1.DaemonSet {
Expand Down Expand Up @@ -567,6 +568,10 @@ func createTestBuiltNodeAgentDaemonSet(options TestBuiltNodeAgentDaemonSetOption
testBuiltNodeAgentDaemonSet.Spec.Template.Spec.Containers[0].Args = append(testBuiltNodeAgentDaemonSet.Spec.Template.Spec.Containers[0].Args, fmt.Sprintf("--log-format=%s", *options.logFormat))
}

if len(options.priorityClassName) > 0 {
testBuiltNodeAgentDaemonSet.Spec.Template.Spec.PriorityClassName = options.priorityClassName
}

return testBuiltNodeAgentDaemonSet
}

Expand Down Expand Up @@ -706,6 +711,52 @@ func TestDPAReconciler_buildNodeAgentDaemonset(t *testing.T) {
annotations: map[string]string{"test-annotation": "awesome annotation"},
}),
},
{
name: "valid DPA CR with PodConfig PriorityClassName, NodeAgent DaemonSet is built with PriorityClassName",
dpa: createTestDpaWith(
nil,
oadpv1alpha1.DataProtectionApplicationSpec{
Configuration: &oadpv1alpha1.ApplicationConfig{
Velero: &oadpv1alpha1.VeleroConfig{},
NodeAgent: &oadpv1alpha1.NodeAgentConfig{
NodeAgentCommonFields: oadpv1alpha1.NodeAgentCommonFields{
PodConfig: &oadpv1alpha1.PodConfig{
PriorityClassName: "node-agent-critical",
},
},
UploaderType: "kopia",
},
},
},
),
clientObjects: []client.Object{testGenericInfrastructure},
nodeAgentDaemonSet: testNodeAgentDaemonSet.DeepCopy(),
wantNodeAgentDaemonSet: createTestBuiltNodeAgentDaemonSet(TestBuiltNodeAgentDaemonSetOptions{
priorityClassName: "node-agent-critical",
}),
},
{
name: "valid DPA CR with PodConfig but no PriorityClassName, NodeAgent DaemonSet is built without PriorityClassName",
dpa: createTestDpaWith(
nil,
oadpv1alpha1.DataProtectionApplicationSpec{
Configuration: &oadpv1alpha1.ApplicationConfig{
Velero: &oadpv1alpha1.VeleroConfig{},
NodeAgent: &oadpv1alpha1.NodeAgentConfig{
NodeAgentCommonFields: oadpv1alpha1.NodeAgentCommonFields{
PodConfig: &oadpv1alpha1.PodConfig{},
},
UploaderType: "kopia",
},
},
},
),
clientObjects: []client.Object{testGenericInfrastructure},
nodeAgentDaemonSet: testNodeAgentDaemonSet.DeepCopy(),
wantNodeAgentDaemonSet: createTestBuiltNodeAgentDaemonSet(TestBuiltNodeAgentDaemonSetOptions{
priorityClassName: "",
}),
},
{
name: "valid DPA CR with DataMoverPrepareTimeout, NodeAgent DaemonSet is built with DataMoverPrepareTimeout",
dpa: createTestDpaWith(
Expand Down
6 changes: 6 additions & 0 deletions internal/controller/velero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@ func (r *DataProtectionApplicationReconciler) buildVeleroDeployment(veleroDeploy
// our secrets are appended to containers/volumeMounts in credentials.AppendPluginSpecificSpecs function
install.WithSecret(false),
install.WithServiceAccountName(common.Velero),
install.WithPriorityClassName(func() string {
if dpa.Spec.Configuration.Velero.PodConfig != nil {
return dpa.Spec.Configuration.Velero.PodConfig.PriorityClassName
}
return ""
}()),
)

veleroDeploymentName := veleroDeployment.Name
Expand Down
83 changes: 67 additions & 16 deletions internal/controller/velero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,22 +615,23 @@ func createTestDpaWith(
}

type TestBuiltVeleroDeploymentOptions struct {
args []string
customLabels map[string]string
labels map[string]string
annotations map[string]string
metricsPort int
initContainers []corev1.Container
volumes []corev1.Volume
volumeMounts []corev1.VolumeMount
env []corev1.EnvVar
dnsPolicy corev1.DNSPolicy
dnsConfig *corev1.PodDNSConfig
resourceLimits corev1.ResourceList
resourceRequests corev1.ResourceList
toleration []corev1.Toleration
nodeSelector map[string]string
loadAffinity []corev1.NodeSelectorTerm
args []string
customLabels map[string]string
labels map[string]string
annotations map[string]string
metricsPort int
initContainers []corev1.Container
volumes []corev1.Volume
volumeMounts []corev1.VolumeMount
env []corev1.EnvVar
dnsPolicy corev1.DNSPolicy
dnsConfig *corev1.PodDNSConfig
resourceLimits corev1.ResourceList
resourceRequests corev1.ResourceList
toleration []corev1.Toleration
nodeSelector map[string]string
loadAffinity []corev1.NodeSelectorTerm
priorityClassName string
}

func createTestBuiltVeleroDeployment(options TestBuiltVeleroDeploymentOptions) *appsv1.Deployment {
Expand Down Expand Up @@ -770,6 +771,10 @@ func createTestBuiltVeleroDeployment(options TestBuiltVeleroDeploymentOptions) *
testBuiltVeleroDeployment.Spec.Template.Spec.DNSConfig = options.dnsConfig
}

if len(options.priorityClassName) > 0 {
testBuiltVeleroDeployment.Spec.Template.Spec.PriorityClassName = options.priorityClassName
}

return testBuiltVeleroDeployment
}

Expand Down Expand Up @@ -1030,6 +1035,52 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
},
}),
},
{
name: "valid DPA CR with PodConfig PriorityClassName, Velero Deployment is built with PriorityClassName",
dpa: createTestDpaWith(
nil,
oadpv1alpha1.DataProtectionApplicationSpec{
Configuration: &oadpv1alpha1.ApplicationConfig{
Velero: &oadpv1alpha1.VeleroConfig{
PodConfig: &oadpv1alpha1.PodConfig{
PriorityClassName: "velero-critical",
},
},
},
},
),
veleroDeployment: testVeleroDeployment.DeepCopy(),
wantVeleroDeployment: createTestBuiltVeleroDeployment(TestBuiltVeleroDeploymentOptions{
priorityClassName: "velero-critical",
args: []string{
defaultFileSystemBackupTimeout,
defaultRestoreResourcePriorities,
defaultDisableInformerCache,
},
}),
},
{
name: "valid DPA CR with PodConfig but no PriorityClassName, Velero Deployment is built without PriorityClassName",
dpa: createTestDpaWith(
nil,
oadpv1alpha1.DataProtectionApplicationSpec{
Configuration: &oadpv1alpha1.ApplicationConfig{
Velero: &oadpv1alpha1.VeleroConfig{
PodConfig: &oadpv1alpha1.PodConfig{},
},
},
},
),
veleroDeployment: testVeleroDeployment.DeepCopy(),
wantVeleroDeployment: createTestBuiltVeleroDeployment(TestBuiltVeleroDeploymentOptions{
priorityClassName: "",
args: []string{
defaultFileSystemBackupTimeout,
defaultRestoreResourcePriorities,
defaultDisableInformerCache,
},
}),
},
{
name: "valid DPA CR with noDefaultBackupLocation, all default plugins and unsupportedOverrides operatorType MTC, Velero Deployment is built with secret volumes",
dpa: createTestDpaWith(
Expand Down