Skip to content

fix(pvc): omit empty volume claim selectors #630

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

Closed
akrem-chabchoub wants to merge 3 commits into from
Closed

fix(pvc): omit empty volume claim selectors #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ec5a49
fix(pvc): handle empty selectors in toK8S conversion to avoid issues …
akrem-chabchoub Oct 15, 2026
f0f7337
fix(pvc): remove empty selector from PersistentVolumeClaim specs in t…
akrem-chabchoub Oct 15, 2026
aa5c353
fix(pvc): update Selector handling in PersistentVolumeClaim specs and…
akrem-chabchoub Oct 24, 2026
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
4 changes: 1 addition & 3 deletions pkg/k8s/persistentvolumeclaim/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ func TestSet(t *testing.T) {
Labels: map[string]string{"label_1": "label_value_1"},
},
expectedSpec: v1.PersistentVolumeClaimSpec{
Selector: &metav1.LabelSelector{},
VolumeMode: func() *v1.PersistentVolumeMode {
m := v1.PersistentVolumeFilesystem
return &m
Expand All @@ -58,7 +57,6 @@ func TestSet(t *testing.T) {
Annotations: map[string]string{"annotation_1": "annotation_value_X", "annotation_2": "annotation_value_2"},
},
expectedSpec: v1.PersistentVolumeClaimSpec{
Selector: &metav1.LabelSelector{},
VolumeMode: func() *v1.PersistentVolumeMode {
m := v1.PersistentVolumeFilesystem
return &m
Expand Down Expand Up @@ -106,7 +104,7 @@ func TestSet(t *testing.T) {
}

if !reflect.DeepEqual(response, expected) {
t.Errorf("response expected: %q, got: %q", response, expected)
t.Errorf("response expected: %q, got: %q", expected, response)
}

} else {
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/persistentvolumeclaim/persistentvolumeclaim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type Spec struct {
AccessModes AccessModes
DataSource DataSource
RequestStorage string
Selector Selector
Selector *Selector
StorageClass string
VolumeMode string
VolumeName string
Expand Down
41 changes: 39 additions & 2 deletions pkg/k8s/persistentvolumeclaim/persistentvolumeclaim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestToK8s(t *testing.T) {
Spec: pvc.Spec{
AccessModes: []pvc.AccessMode{"1", "2"},
RequestStorage: "1Gi",
Selector: pvc.Selector{
Selector: &pvc.Selector{
MatchLabels: map[string]string{"label_1": "label_value_1"},
MatchExpressions: []pvc.LabelSelectorRequirement{
{
Expand Down Expand Up @@ -102,7 +102,6 @@ func TestToK8s(t *testing.T) {
expectedPvcs: []v1.PersistentVolumeClaim{
{
Spec: v1.PersistentVolumeClaimSpec{
Selector: &metav1.LabelSelector{},
VolumeMode: func() *v1.PersistentVolumeMode {
m := v1.PersistentVolumeBlock
return &m
Expand All @@ -113,6 +112,44 @@ func TestToK8s(t *testing.T) {
},
},
},
{
name: "selector_match_expressions_only",
pvcs: pvc.PersistentVolumeClaims{
{
Spec: pvc.Spec{
Selector: &pvc.Selector{
MatchExpressions: []pvc.LabelSelectorRequirement{
{
Key: "label_1",
Operator: "In",
Values: []string{"label_value_1"},
},
},
},
},
},
},
expectedPvcs: []v1.PersistentVolumeClaim{
{
Spec: v1.PersistentVolumeClaimSpec{
Selector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "label_1",
Operator: "In",
Values: []string{"label_value_1"},
},
},
},
VolumeMode: func() *v1.PersistentVolumeMode {
m := v1.PersistentVolumeFilesystem
return &m
}(),
StorageClassName: new(""),
},
},
},
},
}

for _, test := range testTable {
Expand Down
7 changes: 6 additions & 1 deletion pkg/k8s/persistentvolumeclaim/selector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ type Selector struct {
MatchExpressions LabelSelectorRequirements
}

// toK8S converts Selector to Kubernetes client object
// toK8S converts Selector to Kubernetes client object.
// A nil selector is left unset. Dynamic provisioners such as local-path
// reject a claim when spec.selector is present, even if it matches nothing.
func (s *Selector) toK8S() *metav1.LabelSelector {
if s == nil {
return nil
}
return &metav1.LabelSelector{
MatchLabels: s.MatchLabels,
MatchExpressions: s.MatchExpressions.toK8S(),
Expand Down
Loading