Skip to content

fix: use PV/SC mapper for volumeName and storageClassName translation #3889

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
ChellaVigneshKP wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: use PV/SC mapper for volumeName and storageClassName translation #3889

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
8aef667
fix: use PV/SC mapper for volumeName and storageClassName translation
ChellaVigneshKP Apr 24, 2026
5002d50
fix: route PV Sync reconcile storageClassName through mapper
ChellaVigneshKP Apr 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
8 changes: 4 additions & 4 deletions pkg/controllers/resources/persistentvolumeclaims/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (s *persistentVolumeClaimSyncer) translateSelector(ctx *synccontext.SyncCon

// translate storage class if we manage those in vcluster
if s.storageClassesEnabled && storageClassName != "" {
translated := translate.Default.HostNameCluster(storageClassName)
translated := mappings.VirtualToHostName(ctx, storageClassName, "", mappings.StorageClasses())
delete(vPvc.Annotations, deprecatedStorageClassAnnotation)
vPvc.Spec.StorageClassName = &translated
}
Expand All @@ -67,20 +67,20 @@ func (s *persistentVolumeClaimSyncer) translateSelector(ctx *synccontext.SyncCon
vPvc.Spec.Selector = translate.HostLabelSelector(vPvc.Spec.Selector)
}
if vPvc.Spec.VolumeName != "" {
vPvc.Spec.VolumeName = translate.Default.HostNameCluster(vPvc.Spec.VolumeName)
vPvc.Spec.VolumeName = mappings.VirtualToHostName(ctx, vPvc.Spec.VolumeName, "", mappings.PersistentVolumes())
}
// check if the storage class exists in the physical cluster
if !s.storageClassesEnabled && storageClassName != "" {
// Should the PVC be dynamically provisioned or not?
if vPvc.Spec.Selector == nil && vPvc.Spec.VolumeName == "" {
err := ctx.HostClient.Get(ctx, types.NamespacedName{Name: storageClassName}, &storagev1.StorageClass{})
if err != nil && kerrors.IsNotFound(err) {
translated := translate.Default.HostNameCluster(storageClassName)
translated := mappings.VirtualToHostName(ctx, storageClassName, "", mappings.StorageClasses())
delete(vPvc.Annotations, deprecatedStorageClassAnnotation)
vPvc.Spec.StorageClassName = &translated
}
} else {
translated := translate.Default.HostNameCluster(storageClassName)
translated := mappings.VirtualToHostName(ctx, storageClassName, "", mappings.StorageClasses())
delete(vPvc.Annotations, deprecatedStorageClassAnnotation)
vPvc.Spec.StorageClassName = &translated
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/resources/persistentvolumes/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (s *persistentVolumeSyncer) Sync(ctx *synccontext.SyncContext, event *syncc
// update host object
if event.Virtual.Annotations[constants.HostClusterPersistentVolumeAnnotation] == "" {
// TODO: translate the storage secrets
event.Host.Spec.StorageClassName = translate.Default.HostNameCluster(event.Virtual.Spec.StorageClassName)
event.Host.Spec.StorageClassName = mappings.VirtualToHostName(ctx, event.Virtual.Spec.StorageClassName, "", mappings.StorageClasses())
}

// bi-directional sync of annotations and labels
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/resources/persistentvolumes/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func (s *persistentVolumeSyncer) translate(ctx *synccontext.SyncContext, vPv *co

// TODO: translate the storage secrets
if pPV.Spec.StorageClassName != "" {
pPV.Spec.StorageClassName = translate.Default.HostNameCluster(vPv.Spec.StorageClassName)
pPV.Spec.StorageClassName = mappings.VirtualToHostName(ctx, vPv.Spec.StorageClassName, "", mappings.StorageClasses())
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Align PV storageClass mapping with Sync reconcile logic

With sync.toHost.storageClasses.enabled=false, this new call resolves through the StorageClass mirror mapper and keeps the original class name, but persistentvolumes/syncer.go still forces translate.Default.HostNameCluster(...) in Sync (event.Host.Spec.StorageClassName at lines 249-251). That makes the create path and steady-state reconcile path disagree for the same PV, and after this commit PVC translation now also keeps the unmodified class, so host PV/PVC storage class names can diverge and prevent binding (or cause repeated reconcile attempts if the field update is rejected).

Useful? React with 👍 / 👎.

}
return pPV, nil
}
Expand Down