github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: removed uncached client plumbing, keeping the sequencing fix for quota validation

Browse Source
This commit is contained in:
Dev1622
2025-11-26 19:56:42 +05:30
parent f76d0e5aa4
commit d80e73c0a9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/storage/csimock/csi_volume_expansion.go
View File

@@ -21,8 +21,6 @@ import (
"fmt"
"time"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
csipbv1 "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
@@ -584,16 +582,14 @@ var _ = utils.SIGDescribe("CSI Mock volume expansion", func() {
}
if test.expectedQuotaUsage != nil {
// Use uncached client to avoid watch/cache lag when validating quota usage
uncachedClient := f.ClientSet.CoreV1()
validateQuotaUsage(ctx, m, currentQuota, test.expectedQuotaUsage, uncachedClient)
validateQuotaUsage(ctx, m, currentQuota, test.expectedQuotaUsage)
}
})
}
})
})
func validateQuotaUsage(ctx context.Context, m *mockDriverSetup, currentQuota, expectedQuota *v1.ResourceQuota, uncachedClient corev1client.CoreV1Interface) {
func validateQuotaUsage(ctx context.Context, m *mockDriverSetup, currentQuota, expectedQuota *v1.ResourceQuota) {
ginkgo.By("Waiting for resource quota usage to be updated")
var (
quota *v1.ResourceQuota
@@ -605,7 +601,7 @@ func validateQuotaUsage(ctx context.Context, m *mockDriverSetup, currentQuota, e
expectedUsedSize := expectedQuota.Status.Used[pvcSizeQuotaKey]
gomega.Eventually(func() error {
q, err := uncachedClient.ResourceQuotas(currentQuota.Namespace).Get(ctx, currentQuota.Name, metav1.GetOptions{})
q, err := m.cs.CoreV1().ResourceQuotas(currentQuota.Namespace).Get(ctx, currentQuota.Name, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get resource quota %s/%s: %w", currentQuota.Namespace, currentQuota.Name, err)
}