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

Merge pull request #128905 from carlory/fix-128849

Browse Source 
fix flaky behavior due to the test ordering between DynamicProvisioner and Retroactive StorageClass Assignment
This commit is contained in:
Kubernetes Prow Robot 2025-01-17 15:28:34 -08:00 committed by GitHub
commit 6b54ed3c7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,14 +56,14 @@ var _ = utils.SIGDescribe("Retroactive StorageClass Assignment", func() {
ginkgo.DeferCleanup(func(cleanupContext context.Context) { ginkgo.DeferCleanup(func(cleanupContext context.Context) {
// Restore existing default StorageClasses at the end of the test // Restore existing default StorageClasses at the end of the test
for _, sc := range defaultSCs { for _, sc := range defaultSCs {
setStorageClassDefault(cleanupContext, client, sc.Name, "true") updateDefaultStorageClass(cleanupContext, client, sc.Name, "true")
} }
}) })
// Unset all default StorageClasses // Unset all default StorageClasses
for _, sc := range defaultSCs { for _, sc := range defaultSCs {
klog.InfoS("Unsetting default StorageClass", "StorageClass", sc.Name) klog.InfoS("Unsetting default StorageClass", "StorageClass", sc.Name)
setStorageClassDefault(ctx, client, sc.Name, "false") updateDefaultStorageClass(ctx, client, sc.Name, "false")
} }
// Ensure no default StorageClasses exist // Ensure no default StorageClasses exist
@ -108,19 +108,6 @@ func getDefaultStorageClasses(ctx context.Context, client clientset.Interface) (
return defaultSCs, nil return defaultSCs, nil
} }
func setStorageClassDefault(ctx context.Context, client clientset.Interface, scName string, isDefault string) {
sc, err := client.StorageV1().StorageClasses().Get(ctx, scName, metav1.GetOptions{})
framework.ExpectNoError(err, "Error getting StorageClass")
if sc.Annotations == nil {
sc.Annotations = make(map[string]string)
}
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = isDefault
_, err = client.StorageV1().StorageClasses().Update(ctx, sc, metav1.UpdateOptions{})
framework.ExpectNoError(err, "Error updating StorageClass")
}
func ensureNoDefaultStorageClasses(ctx context.Context, client clientset.Interface) { func ensureNoDefaultStorageClasses(ctx context.Context, client clientset.Interface) {
gomega.Eventually(ctx, func() (int, error) { gomega.Eventually(ctx, func() (int, error) {
defaultSCs, err := getDefaultStorageClasses(ctx, client) defaultSCs, err := getDefaultStorageClasses(ctx, client)