github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115989 from yuanchen8911/closure

Browse Source 
Replace a function argument in statefulset e2e framework
This commit is contained in:
Kubernetes Prow Robot 2023-02-23 09:52:37 -08:00 committed by GitHub
commit 3bf57e3ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/framework/statefulset/rest.go
View File

@ -148,7 +148,7 @@ func Scale(ctx context.Context, c clientset.Interface, ss *appsv1.StatefulSet, c
ns := ss.Namespace ns := ss.Namespace
framework.Logf("Scaling statefulset %s to %d", name, count) framework.Logf("Scaling statefulset %s to %d", name, count)
ss = update(ctx, c, ns, name, func(ss *appsv1.StatefulSet) { *(ss.Spec.Replicas) = count }) ss = update(ctx, c, ns, name, count)
var statefulPodList *v1.PodList var statefulPodList *v1.PodList
pollErr := wait.PollImmediateWithContext(ctx, StatefulSetPoll, StatefulSetTimeout, func(ctx context.Context) (bool, error) { pollErr := wait.PollImmediateWithContext(ctx, StatefulSetPoll, StatefulSetTimeout, func(ctx context.Context) (bool, error) {
@ -173,7 +173,7 @@ func Scale(ctx context.Context, c clientset.Interface, ss *appsv1.StatefulSet, c
// UpdateReplicas updates the replicas of ss to count. // UpdateReplicas updates the replicas of ss to count.
func UpdateReplicas(ctx context.Context, c clientset.Interface, ss *appsv1.StatefulSet, count int32) { func UpdateReplicas(ctx context.Context, c clientset.Interface, ss *appsv1.StatefulSet, count int32) {
update(ctx, c, ss.Namespace, ss.Name, func(ss *appsv1.StatefulSet) { *(ss.Spec.Replicas) = count }) update(ctx, c, ss.Namespace, ss.Name, count)
} }
// Restart scales ss to 0 and then back to its previous number of replicas. // Restart scales ss to 0 and then back to its previous number of replicas.
@ -185,7 +185,7 @@ func Restart(ctx context.Context, c clientset.Interface, ss *appsv1.StatefulSet)
// This way we know the controller has observed all Pod deletions // This way we know the controller has observed all Pod deletions
// before we scale it back up. // before we scale it back up.
WaitForStatusReplicas(ctx, c, ss, 0) WaitForStatusReplicas(ctx, c, ss, 0)
update(ctx, c, ss.Namespace, ss.Name, func(ss *appsv1.StatefulSet) { *(ss.Spec.Replicas) = oldReplicas }) update(ctx, c, ss.Namespace, ss.Name, oldReplicas)
} }
// CheckHostname verifies that all Pods in ss have the correct Hostname. If the returned error is not nil than verification failed. // CheckHostname verifies that all Pods in ss have the correct Hostname. If the returned error is not nil than verification failed.
@ -247,13 +247,13 @@ func ExecInStatefulPods(ctx context.Context, c clientset.Interface, ss *appsv1.S
} }
// update updates a statefulset, and it is only used within rest.go // update updates a statefulset, and it is only used within rest.go
func update(ctx context.Context, c clientset.Interface, ns, name string, update func(ss *appsv1.StatefulSet)) *appsv1.StatefulSet { func update(ctx context.Context, c clientset.Interface, ns, name string, replicas int32) *appsv1.StatefulSet {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
ss, err := c.AppsV1().StatefulSets(ns).Get(ctx, name, metav1.GetOptions{}) ss, err := c.AppsV1().StatefulSets(ns).Get(ctx, name, metav1.GetOptions{})
if err != nil { if err != nil {
framework.Failf("failed to get statefulset %q: %v", name, err) framework.Failf("failed to get statefulset %q: %v", name, err)
} }
update(ss) *(ss.Spec.Replicas) = replicas
ss, err = c.AppsV1().StatefulSets(ns).Update(ctx, ss, metav1.UpdateOptions{}) ss, err = c.AppsV1().StatefulSets(ns).Update(ctx, ss, metav1.UpdateOptions{})
if err == nil { if err == nil {
return ss return ss