chore: cleanup unneeded logic for EOL versions (#2353)

Delete some old overrides for AMI versions that have gone EOL
Fix a few lint findings

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Testing Done

Unit tests

Author: fletcherw

nodeadm/internal/kubelet/config.go

@@ -167,7 +167,7 @@ func (ksc *kubeletConfig) withOutpostSetup(cfg *api.NodeConfig) error {
 		zap.L().Info("Setting up outpost..")
 
 		if cfg.Spec.Cluster.ID == "" {
-			return fmt.Errorf("clusterId cannot be empty when outpost is enabled.")
+			return fmt.Errorf("clusterId cannot be empty when outpost is enabled")
 		}
 		apiUrl, err := url.Parse(cfg.Spec.Cluster.APIServerEndpoint)
 		if err != nil {
@@ -225,7 +225,7 @@ func (ksc *kubeletConfig) withVersionToggles(cfg *api.NodeConfig, flags map[stri
 
 	// for K8s versions that suport API Priority & Fairness, increase our API server QPS
 	// in 1.27, the default is already increased to 50/100, so use the higher defaults
-	if semver.Compare(cfg.Status.KubeletVersion, "v1.22.0") >= 0 && semver.Compare(cfg.Status.KubeletVersion, "v1.27.0") < 0 {
+	if semver.Compare(cfg.Status.KubeletVersion, "v1.27.0") < 0 {
 		ksc.KubeAPIQPS = ptr.Int(10)
 		ksc.KubeAPIBurst = ptr.Int(20)
 	}
@@ -323,7 +323,7 @@ func (k *kubelet) writeKubeletConfigToFile(cfg *api.NodeConfig) error {
 	}
 
 	var kubeletConfigBytes []byte
-	if cfg.Spec.Kubelet.Config != nil && len(cfg.Spec.Kubelet.Config) > 0 {
+	if len(cfg.Spec.Kubelet.Config) > 0 {
 		mergedMap, err := util.Merge(kubeletConfig, cfg.Spec.Kubelet.Config, json.Marshal, json.Unmarshal)
 		if err != nil {
 			return err
@@ -367,7 +367,7 @@ func (k *kubelet) writeKubeletConfigToDir(cfg *api.NodeConfig) error {
 		return err
 	}
 
-	if cfg.Spec.Kubelet.Config != nil && len(cfg.Spec.Kubelet.Config) > 0 {
+	if len(cfg.Spec.Kubelet.Config) > 0 {
 		dirPath := path.Join(kubeletConfigRoot, kubeletConfigDir)
 		k.flags["config-dir"] = dirPath
 

nodeadm/internal/kubelet/config_test.go

@@ -14,7 +14,6 @@ func TestKubeletCredentialProvidersFeatureFlag(t *testing.T) {
 		kubeletVersion string
 		expectedValue  *bool
 	}{
-		{kubeletVersion: "v1.23.0", expectedValue: ptr.Bool(true)},
 		{kubeletVersion: "v1.27.0", expectedValue: ptr.Bool(true)},
 		{kubeletVersion: "v1.28.0", expectedValue: nil},
 	}
@@ -78,9 +77,6 @@ func TestKubeAPILimits(t *testing.T) {
 		expectedKubeAPIQS    *int
 		expectedKubeAPIBurst *int
 	}{
-		{kubeletVersion: "v1.21.0", expectedKubeAPIQS: nil, expectedKubeAPIBurst: nil},
-		{kubeletVersion: "v1.22.0", expectedKubeAPIQS: ptr.Int(10), expectedKubeAPIBurst: ptr.Int(20)},
-		{kubeletVersion: "v1.23.0", expectedKubeAPIQS: ptr.Int(10), expectedKubeAPIBurst: ptr.Int(20)},
 		{kubeletVersion: "v1.26.0", expectedKubeAPIQS: ptr.Int(10), expectedKubeAPIBurst: ptr.Int(20)},
 		{kubeletVersion: "v1.27.0", expectedKubeAPIQS: nil, expectedKubeAPIBurst: nil},
 		{kubeletVersion: "v1.28.0", expectedKubeAPIQS: nil, expectedKubeAPIBurst: nil},
@@ -104,7 +100,6 @@ func TestProviderID(t *testing.T) {
 		kubeletVersion        string
 		expectedCloudProvider string
 	}{
-		{kubeletVersion: "v1.23.0", expectedCloudProvider: "aws"},
 		{kubeletVersion: "v1.25.0", expectedCloudProvider: "aws"},
 		{kubeletVersion: "v1.26.0", expectedCloudProvider: "external"},
 		{kubeletVersion: "v1.27.0", expectedCloudProvider: "external"},

nodeadm/test/e2e/cases/kubelet-version/run.sh

@@ -9,21 +9,6 @@ source /helpers.sh
 mock::aws
 wait::dbus-ready
 
-mock::kubelet 1.21.0
-nodeadm init --skip run --config-source file://config.yaml
-assert::file-not-contains /etc/kubernetes/kubelet/config.json '"kubeAPIQPS"'
-assert::file-not-contains /etc/kubernetes/kubelet/config.json '"kubeAPIBurst"'
-
-mock::kubelet 1.22.0-eks-5e0fdde
-nodeadm init --skip run --config-source file://config.yaml
-assert::file-contains /etc/kubernetes/kubelet/config.json '"kubeAPIQPS": 10'
-assert::file-contains /etc/kubernetes/kubelet/config.json '"kubeAPIBurst": 20'
-
-mock::kubelet 1.22.0
-nodeadm init --skip run --config-source file://config.yaml
-assert::file-contains /etc/kubernetes/kubelet/config.json '"kubeAPIQPS": 10'
-assert::file-contains /etc/kubernetes/kubelet/config.json '"kubeAPIBurst": 20'
-
 mock::kubelet 1.26.0-eks-5e0fdde
 nodeadm init --skip run --config-source file://config.yaml
 assert::file-contains /etc/kubernetes/kubelet/config.json '"kubeAPIQPS": 10'

templates/al2/provisioners/install-worker.sh

@@ -358,13 +358,6 @@ sudo mkdir -p /etc/systemd/system/kubelet.service.d
 sudo mv $WORKING_DIR/kubelet-kubeconfig /var/lib/kubelet/kubeconfig
 sudo chown root:root /var/lib/kubelet/kubeconfig
 
-# Inject CSIServiceAccountToken feature gate to kubelet config if kubernetes version starts with 1.20.
-# This is only injected for 1.20 since CSIServiceAccountToken will be moved to beta starting 1.21.
-if [[ $KUBERNETES_VERSION == "1.20"* ]]; then
-  KUBELET_CONFIG_WITH_CSI_SERVICE_ACCOUNT_TOKEN_ENABLED=$(cat $WORKING_DIR/kubelet-config.json | jq '.featureGates += {CSIServiceAccountToken: true}')
-  echo $KUBELET_CONFIG_WITH_CSI_SERVICE_ACCOUNT_TOKEN_ENABLED > $WORKING_DIR/kubelet-config.json
-fi
-
 # Enable Feature Gate for KubeletCredentialProviders in versions less than 1.28 since this feature flag was removed in 1.28.
 # TODO: Remove this during 1.27 EOL
 if vercmp $KUBERNETES_VERSION lt "1.28"; then