Make update kube-proxy not use minimal images for >= 1.34 (#8557)

Author: NicholasBlaskey

pkg/addons/default/kube_proxy.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/kubernetes"
 	"github.com/weaveworks/eksctl/pkg/printers"
+	eksctlversion "github.com/weaveworks/eksctl/pkg/utils/version"
 )
 
 const (
@@ -157,22 +158,31 @@ func getLatestImageVersionFromEKS(ctx context.Context, addonDescriber AddonVersi
 		return versions[j].LessThan(versions[i])
 	})
 
-	return toMinimalVersion(versions[0]), nil
+	return toMinimalVersion(versions[0], controlPlaneMajorMinor)
 }
 
-func toMinimalVersion(v *version.Version) string {
+func toMinimalVersion(v *version.Version, controlPlaneMajorMinor string) (string, error) {
 	preRelease := v.Prerelease()
 	if preRelease == "" {
-		return v.Original()
+		return v.Original(), nil
 	}
+	// Kube-proxy stopped publishing minimal versions after 1.34+.
+	supported, err := eksctlversion.IsMinVersion("1.34", controlPlaneMajorMinor)
+	if err != nil {
+		return "", err
+	}
+	if supported {
+		return v.Original(), nil
+	}
+
 	const versionPrefix = "v"
 	var tagPrefix string
 	if strings.HasPrefix(v.Original(), versionPrefix) {
 		tagPrefix = versionPrefix
 	}
 
 	minimalBuildTag := fmt.Sprintf("%s%s-minimal-%s", tagPrefix, v.Core(), preRelease)
-	return minimalBuildTag
+	return minimalBuildTag, nil
 }
 
 func versionWithOnlyMajorAndMinor(v string) (string, error) {

pkg/addons/default/kube_proxy_test.go

@@ -251,6 +251,44 @@ var _ = Describe("KubeProxy", func() {
 		})
 	})
 
+	When("version 1.34 and above is used", func() {
+		BeforeEach(func() {
+			mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything, &awseks.DescribeAddonVersionsInput{
+				AddonName:         aws.String("kube-proxy"),
+				KubernetesVersion: aws.String("1.34"),
+			}).Return(&awseks.DescribeAddonVersionsOutput{
+				Addons: []ekstypes.AddonInfo{
+					{
+						AddonName: aws.String("kube-proxy"),
+						AddonVersions: []ekstypes.AddonVersionInfo{
+							{
+								AddonVersion: aws.String("v1.34.0-eksbuild.1"),
+							},
+							{
+								// Latest, unordered list to ensure we sort correctly
+								AddonVersion: aws.String("v1.34.1-eksbuild.2"),
+							},
+							{
+								AddonVersion: aws.String("v1.34.1-eksbuild.1"),
+							},
+						},
+					},
+				},
+			}, nil)
+			input.ControlPlaneVersion = "1.34.1"
+		})
+
+		It("does not use minimal container image", func() {
+			input134 := input
+			input134.ControlPlaneVersion = "1.34.1"
+
+			_, err := da.UpdateKubeProxy(context.Background(), input, false)
+			Expect(err).NotTo(HaveOccurred())
+			image := kubeProxyImage(clientSet)
+			Expect(image).To(Equal("602401143452.dkr.ecr.eu-west-1.amazonaws.com/eks/kube-proxy:v1.34.1-eksbuild.2"))
+			Expect(kubeProxyNodeSelectorValues(clientSet)).To(ConsistOf("amd64", "arm64"))
+		})
+	})
 })
 
 func kubeProxyImage(clientSet kubernetes.Interface) string {