fix: use latest managed addon version for kube-proxy image name (#8505)

fix: use latest managed addon version for kube-proxy instead of cluster version

When eksctl updates a self-managed kube-proxy addon, it previously used
the larger version between describe-addon-versions API response and the
k8s cluster version. This assumption is incorrect for cases like k8s
v1.32.8 where the latest available image is v1.32.7-eksbuild.1.

Changes:
- Always use the latest version from managed addon versions API
- Remove version comparison logic and unused helper functions
- Update unit tests to reflect the new behavior
- Add test case for k8s v1.32.8 scenario

This ensures kube-proxy always uses the most recent available image
version from AWS EKS managed addon API, which is more reliable than
assuming cluster version has a corresponding image.

Author: sapphirew

pkg/addons/default/kube_proxy.go

@@ -115,39 +115,13 @@ func addArm64NodeSelector(daemonSet *v1.DaemonSet) error {
 }
 
 func getLatestKubeProxyImage(ctx context.Context, input AddonInput) (string, error) {
-	defaultClusterVersion := generateImageVersionFromClusterVersion(input.ControlPlaneVersion)
+	// Always use the latest version from managed addon versions
 	latestEKSReportedVersion, err := getLatestImageVersionFromEKS(ctx, input.AddonVersionDescriber, input.ControlPlaneVersion)
 	if err != nil {
 		return "", err
 	}
 
-	// Sometimes the EKS API is ahead, sometimes behind. Pick whichever is latest
-	eksVersionIsGreaterThanDefaultVersion, err := versionGreaterThan(latestEKSReportedVersion, defaultClusterVersion)
-	if err != nil {
-		return "", err
-	}
-
-	if eksVersionIsGreaterThanDefaultVersion {
-		return latestEKSReportedVersion, nil
-	}
-
-	return defaultClusterVersion, nil
-}
-
-func versionGreaterThan(v1, v2 string) (bool, error) {
-	v1Version, err := parseVersion(v1)
-	if err != nil {
-		return false, err
-	}
-	v2Version, err := parseVersion(v2)
-	if err != nil {
-		return false, err
-	}
-	return v1Version.GreaterThan(v2Version), nil
-}
-
-func generateImageVersionFromClusterVersion(controlPlaneVersion string) string {
-	return fmt.Sprintf("v%s-eksbuild.1", controlPlaneVersion)
+	return latestEKSReportedVersion, nil
 }
 
 func getLatestImageVersionFromEKS(ctx context.Context, addonDescriber AddonVersionDescriber, controlPlaneVersion string) (string, error) {

pkg/addons/default/kube_proxy_test.go

@@ -151,16 +151,16 @@ var _ = Describe("KubeProxy", func() {
 				expectedImageTag: "1.23.1-minimal-eksbuild.2",
 			}),
 
-			Entry("version that is behind the default cluster version should not be used", versionUpdateEntry{
+			Entry("always uses the latest version from managed addon versions", versionUpdateEntry{
 				addonOutput: ekstypes.AddonInfo{
 					AddonName: aws.String("kube-proxy"),
 					AddonVersions: []ekstypes.AddonVersionInfo{
 						{
 							AddonVersion: aws.String("v1.17.0-eksbuild.1"),
 						},
 						{
-							// Latest, unordered list to ensure we sort correctly
-							// behind the default-cluster version 1.18.1-eksbuild.1.
+							// Latest version from managed addon versions should always be used
+							// regardless of cluster version
 							AddonVersion: aws.String("v1.18.0-eksbuild.2"),
 						},
 						{
@@ -169,7 +169,24 @@ var _ = Describe("KubeProxy", func() {
 					},
 				},
 
-				expectedImageTag: "v1.23.1-eksbuild.1",
+				expectedImageTag: "v1.18.0-minimal-eksbuild.2",
+			}),
+
+			Entry("uses latest managed addon version when cluster version has no corresponding image (k8s v1.32.8 scenario)", versionUpdateEntry{
+				addonOutput: ekstypes.AddonInfo{
+					AddonName: aws.String("kube-proxy"),
+					AddonVersions: []ekstypes.AddonVersionInfo{
+						{
+							AddonVersion: aws.String("v1.32.6-eksbuild.1"),
+						},
+						{
+							// Latest available image is v1.32.7-eksbuild.1, even though cluster is v1.32.8
+							AddonVersion: aws.String("v1.32.7-eksbuild.1"),
+						},
+					},
+				},
+
+				expectedImageTag: "v1.32.7-minimal-eksbuild.1",
 			}),
 		)