Skip to content

OADP-7017: fix DPA error when podConfig has no nodeSelector with load… #2125

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
PrasadJoshi12 wants to merge 1 commit into
base: oadp-dev
Choose a base branch
from
+44 −0
Open

OADP-7017: fix DPA error when podConfig has no nodeSelector with load… #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions internal/controller/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ func (r *DataProtectionApplicationReconciler) ValidateDataProtectionCR(log logr.

// Ensure DPA spec.configuration.nodeAgent.PodConfig is not different from spec.configuration.nodeAgent.LoadAffinityConfig
// If LoadAffinityConfig is set, it will be used instead of PodConfig; however, if both are set, they must be identical.
// Only validate when podConfig.nodeSelector is explicitly set; an empty podConfig (e.g. only resourceAllocations) is valid alongside loadAffinity.
if r.dpa.Spec.Configuration.NodeAgent != nil &&
r.dpa.Spec.Configuration.NodeAgent.PodConfig != nil &&
len(r.dpa.Spec.Configuration.NodeAgent.PodConfig.NodeSelector) > 0 &&
r.dpa.Spec.Configuration.NodeAgent.LoadAffinityConfig != nil {

if len(r.dpa.Spec.Configuration.NodeAgent.LoadAffinityConfig) > 1 {
Expand Down
42 changes: 42 additions & 0 deletions internal/controller/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2466,6 +2466,48 @@ func TestDPAReconciler_ValidateDataProtectionCR(t *testing.T) {
},
wantErr: false,
},
{
// OADP-7017: podConfig with resourceAllocations but no nodeSelector alongside loadAffinity using matchExpressions should be valid
name: "[valid] PodConfig with resourceAllocations but no nodeSelector and LoadAffinityConfig with matchExpressions only",
dpa: &oadpv1alpha1.DataProtectionApplication{
Spec: oadpv1alpha1.DataProtectionApplicationSpec{
BackupImages: ptr.To(false),
Configuration: &oadpv1alpha1.ApplicationConfig{
Velero: &oadpv1alpha1.VeleroConfig{
NoDefaultBackupLocation: true,
},
NodeAgent: &oadpv1alpha1.NodeAgentConfig{
NodeAgentCommonFields: oadpv1alpha1.NodeAgentCommonFields{
PodConfig: &oadpv1alpha1.PodConfig{
ResourceAllocations: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("500m"),
corev1.ResourceMemory: resource.MustParse("128Mi"),
},
},
},
},
NodeAgentConfigMapSettings: oadpv1alpha1.NodeAgentConfigMapSettings{
LoadAffinityConfig: []*oadpv1alpha1.LoadAffinity{
{
NodeSelector: metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "foo",
Operator: metav1.LabelSelectorOpIn,
Values: []string{"bar"},
},
},
},
},
},
},
},
},
},
},
wantErr: false,
},
{
name: "[valid] Only LoadAffinityConfig is set with MatchExpressions",
dpa: &oadpv1alpha1.DataProtectionApplication{
Expand Down