Skip to content

Commit

Permalink
Merge pull request #4445 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…4438-to-release-1.12

[release-1.12] fix HTTP 409 flake in AKS Cluster Class test
  • Loading branch information
k8s-ci-robot authored Jan 9, 2024
2 parents d883996 + 781be3a commit c36ddd2
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions test/e2e/aks_clusterclass.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"
)

type AKSClusterClassInput struct {
Expand Down Expand Up @@ -102,6 +103,8 @@ func AKSClusterClassSpec(ctx context.Context, inputGetter func() AKSClusterClass

By("Upgrading the cluster topology version")
Eventually(func(g Gomega) {
err := mgmtClient.Get(ctx, client.ObjectKeyFromObject(input.Cluster), input.Cluster)
g.Expect(err).NotTo(HaveOccurred())
input.Cluster.Spec.Topology.Version = input.KubernetesVersionUpgradeTo
g.Expect(mgmtClient.Update(ctx, input.Cluster)).To(Succeed())
}, inputGetter().WaitIntervals...).Should(Succeed())
Expand Down

0 comments on commit c36ddd2

Please sign in to comment.