github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123051 from yangjunmyfm192085/fixe2e

Browse Source 
fix e2e test `test should assign default SC to PVCs that have no SC set` failure
This commit is contained in:
Kubernetes Prow Robot
2024-02-19 00:48:39 -08:00
committed by GitHub
parent 70af917493 97640d3e2d
commit 7090b9d098
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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{})
framework.ExpectNoError(err)
var changedClasses []storagev1.StorageClass
changedClasses := make(map[string]bool)
for _, sc := range classes.Items {
if sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] == "true" {
changedClasses = append(changedClasses, sc)
changedClasses[sc.GetName()] = true
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "false"
_, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{})
framework.ExpectNoError(err)
@@ -148,10 +148,14 @@ func temporarilyUnsetDefaultClasses(ctx context.Context, client clientset.Interf
}
return func() {
for _, sc := range changedClasses {
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = "true"
_, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{})
framework.ExpectNoError(err)
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"
_, err := client.StorageV1().StorageClasses().Update(ctx, &sc, metav1.UpdateOptions{})
framework.ExpectNoError(err)
}
}
}