Skip to content

🌱 Add retry for SSA requests against Kubernetes < v1.29 in clusterctl upgrade tests #12067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

🌱 Add retry for SSA requests against Kubernetes < v1.29 in clusterctl upgrade tests #12067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions test/e2e/clusterctl_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"strings"
"time"

"github.com/blang/semver/v4"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
coordinationv1 "k8s.io/api/coordination/v1"
Expand Down Expand Up @@ -726,15 +727,28 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
verifyV1Beta2ConditionsTrueV1Beta1(ctx, managementClusterProxy.GetClient(), workloadCluster.Name, workloadCluster.Namespace,
[]string{clusterv1.AvailableV1Beta2Condition, clusterv1.ReadyV1Beta2Condition})

Byf("[%d] Verify client-side SSA still works", i)
clusterUpdate := &unstructured.Unstructured{}
clusterUpdate.SetGroupVersionKind(clusterv1beta1.GroupVersion.WithKind("Cluster"))
clusterUpdate.SetNamespace(workloadCluster.Namespace)
clusterUpdate.SetName(workloadCluster.Name)
clusterUpdate.SetLabels(map[string]string{
fmt.Sprintf("test-label-upgrade-%d", i): "test-label-value",
})
err = managementClusterProxy.GetClient().Patch(ctx, clusterUpdate, client.Apply, client.FieldOwner("e2e-test-client"))
// Note: It is a known issue on Kubernetes < v1.29 that SSA sometimes fail:
// https://github.com/kubernetes/kubernetes/issues/117356
tries := 1
initKubernetesVersionParsed, err := semver.ParseTolerant(initKubernetesVersion)
Expect(err).ToNot(HaveOccurred())
if initKubernetesVersionParsed.LT(semver.MustParse("1.29.0")) {
tries = 10
}
for range tries {
Byf("[%d] Verify client-side SSA still works", i)
clusterUpdate := &unstructured.Unstructured{}
clusterUpdate.SetGroupVersionKind(clusterv1beta1.GroupVersion.WithKind("Cluster"))
clusterUpdate.SetNamespace(workloadCluster.Namespace)
clusterUpdate.SetName(workloadCluster.Name)
clusterUpdate.SetLabels(map[string]string{
fmt.Sprintf("test-label-upgrade-%d", i): "test-label-value",
})
err = managementClusterProxy.GetClient().Patch(ctx, clusterUpdate, client.Apply, client.FieldOwner("e2e-test-client"))
if err == nil {
break
}
}
Expect(err).ToNot(HaveOccurred())

Byf("[%d] THE UPGRADED MANAGEMENT CLUSTER WORKS!", i)
Expand Down