Skip to content

fix: ignore runtime PVC template fields #505

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

Merged
catpineapple merged 1 commit into from
Jul 9, 2026
Merged

fix: ignore runtime PVC template fields #505

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 pkg/controller/sub_controller/disaggregated_cluster/computegroups/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,13 @@ func volumeClaimTemplatesEqual(new, old []corev1.PersistentVolumeClaim) bool {
}

func normalizeVolumeClaimTemplate(pvc corev1.PersistentVolumeClaim) corev1.PersistentVolumeClaim {
pvc.TypeMeta = metav1.TypeMeta{}
pvc.ObjectMeta = metav1.ObjectMeta{
Name: pvc.Name,
Labels: normalizeStringMap(pvc.Labels),
Annotations: normalizeStringMap(pvc.Annotations),
}
pvc.Status = corev1.PersistentVolumeClaimStatus{}
if pvc.Spec.VolumeMode == nil {
volumeMode := corev1.PersistentVolumeFilesystem
pvc.Spec.VolumeMode = &volumeMode
Expand Down
15 changes: 15 additions & 0 deletions pkg/controller/sub_controller/disaggregated_cluster/computegroups/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,21 @@ func TestVolumeClaimTemplatesEqualIgnoresDefaultVolumeMode(t *testing.T) {
}
}

func TestVolumeClaimTemplatesEqualIgnoresRuntimeFields(t *testing.T) {
desired := newTestStatefulSet("default", "doris-cg1", "100Gi").Spec.VolumeClaimTemplates
existing := newTestStatefulSet("default", "doris-cg1", "100Gi").Spec.VolumeClaimTemplates

existing[0].TypeMeta = metav1.TypeMeta{
APIVersion: "v1",
Kind: "PersistentVolumeClaim",
}
existing[0].Status.Phase = corev1.ClaimPending

if !volumeClaimTemplatesEqual(desired, existing) {
t.Fatal("volumeClaimTemplatesEqual should ignore runtime-only pvc template fields")
}
}

func newTestStatefulSet(namespace, name, storage string) *appv1.StatefulSet {
return &appv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{
Expand Down
Loading