Skip to content

#8878 fix: pv: check sc fstype before node os; allow node os check fail #8892

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
CarlQLange wants to merge 3 commits into from
Closed

#8878 fix: pv: check sc fstype before node os; allow node os check fail #8892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10d7c74
Tests for #8878
CarlQLange Apr 28, 2025
33dd795
Fix #8878: check sc fstype before node os, allow node os check fail, …
CarlQLange Apr 28, 2025
cea45af
Add changelog
CarlQLange Apr 28, 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
Prev Previous commit
Next Next commit
Fix #8878: check sc fstype before node os, allow node os check fail, … 
…fallback to linux
  • Loading branch information
@CarlQLange
CarlQLange committed Apr 28, 2025
commit 33dd7951e604d97f193604aab0fd8f4b3e70420b
28 changes: 14 additions & 14 deletions pkg/util/kube/pvc_pv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,17 @@ func GetPVCAttachingNodeOS(pvc *corev1api.PersistentVolumeClaim, nodeClient core
log.Warnf("PVC %s/%s is not with storage class", pvc.Namespace, pvc.Name)
}

if pvc.Spec.StorageClassName != nil {
sc, err := storageClient.StorageClasses().Get(context.Background(), *pvc.Spec.StorageClassName, metav1.GetOptions{})
if err != nil {
return "", errors.Wrapf(err, "error to get storage class %s", *pvc.Spec.StorageClassName)
}

if sc.Parameters != nil {
scFsType = strings.ToLower(sc.Parameters["csi.storage.k8s.io/fstype"])
}
}

nodeName := ""
if value := pvc.Annotations[KubeAnnSelectedNode]; value != "" {
nodeName = value
Expand All @@ -503,20 +514,9 @@ func GetPVCAttachingNodeOS(pvc *corev1api.PersistentVolumeClaim, nodeClient core
if nodeName != "" {
os, err := GetNodeOS(context.Background(), nodeName, nodeClient)
if err != nil {
return "", errors.Wrapf(err, "error to get os from node %s for PVC %s/%s", nodeName, pvc.Namespace, pvc.Name)
}

nodeOS = os
}

if pvc.Spec.StorageClassName != nil {
sc, err := storageClient.StorageClasses().Get(context.Background(), *pvc.Spec.StorageClassName, metav1.GetOptions{})
if err != nil {
return "", errors.Wrapf(err, "error to get storage class %s", *pvc.Spec.StorageClassName)
}

if sc.Parameters != nil {
scFsType = strings.ToLower(sc.Parameters["csi.storage.k8s.io/fstype"])
log.Warnf("Failed to get OS from node %s for PVC %s/%s: %v", nodeName, pvc.Namespace, pvc.Name, err)
} else {
nodeOS = os
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/kube/pvc_pv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,7 +1783,7 @@ func TestGetPVCAttachingNodeOS(t *testing.T) {
{
name: "node doesn't exist",
pvc: pvcObjWithNode,
err: "error to get os from node fake-node for PVC fake-namespace/fake-pvc: error getting node fake-node: nodes \"fake-node\" not found",
expectedNodeOS: NodeOSLinux,
},
{
name: "node without os label",
Expand Down