github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

fix test test should assign default SC to PVCs that have no SC set failure

Browse Source
This commit is contained in:
杨军10092085 2024-01-31 21:42:25 +08:00
parent 46c9bd1267
commit 97640d3e2d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/storage/pvc_storageclass.go
View File

@ -136,11 +136,11 @@ func temporarilyUnsetDefaultClasses(ctx context.Context, client clientset.Interf
classes, err := client.StorageV1().StorageClasses().List(ctx, metav1.ListOptions{}) classes, err := client.StorageV1().StorageClasses().List(ctx, metav1.ListOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
var changedClasses []storagev1.StorageClass changedClasses := make(map[string]bool)
for _, sc := range classes.Items { for _, sc := range classes.Items {
if sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] == "true" { if sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] == "true" {
changedClasses = append(changedClasses, sc) changedClasses[sc.GetName()] = true
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "false" sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "false"
_, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{}) _, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -148,12 +148,16 @@ func temporarilyUnsetDefaultClasses(ctx context.Context, client clientset.Interf
} }
return func() { return func() {
for _, sc := range changedClasses { classes, err = client.StorageV1().StorageClasses().List(ctx, metav1.ListOptions{})
framework.ExpectNoError(err)
for _, sc := range classes.Items {
if _, found := changedClasses[sc.GetName()]; found {
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "true" sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "true"
_, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{}) _, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
} }
}
} }