From 0f12db6fc13c003a28c42d64f2b915eb2d695c56 Mon Sep 17 00:00:00 2001
From: Prasad Shende <prshende@amazon.com>
Date: Wed, 1 Jun 2022 14:54:37 -0700
Subject: [PATCH 1/2] Updating Makefile and install script for 1.23 version

---
 Makefile                  | 6 +++++-
 scripts/install-worker.sh | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cbe8d3833..969c0e2bd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ T_YELLOW := \e[0;33m
 T_RESET := \e[0m
 
 .PHONY: all
-all: 1.19 1.20 1.21 1.22
+all: 1.19 1.20 1.21 1.22 1.23
 
 .PHONY: validate
 validate:
@@ -57,3 +57,7 @@ k8s: validate
 .PHONY: 1.22
 1.22:
 	$(MAKE) k8s kubernetes_version=1.22.6 kubernetes_build_date=2022-03-09 pull_cni_from_github=true
+
+.PHONY: 1.23
+1.23:
+	$(MAKE) k8s kubernetes_version=1.23.6 kubernetes_build_date=2022-06-01 pull_cni_from_github=true
diff --git a/scripts/install-worker.sh b/scripts/install-worker.sh
index b5713a726..d7e0b882b 100644
--- a/scripts/install-worker.sh
+++ b/scripts/install-worker.sh
@@ -159,7 +159,7 @@ else
     sudo mv $TEMPLATE_DIR/containerd-config.toml /etc/eks/containerd/containerd-config.toml
 fi
 
-if [[ $KUBERNETES_VERSION == "1.22"* ]]; then
+if [[ ! $KUBERNETES_VERSION =~ "1.19"* || ! $KUBERNETES_VERSION =~ "1.20"* || ! $KUBERNETES_VERSION =~ "1.21"* ]]; then
     # enable CredentialProviders features in kubelet-containerd service file
     IMAGE_CREDENTIAL_PROVIDER_FLAGS='\\\n    --image-credential-provider-config /etc/eks/ecr-credential-provider/ecr-credential-provider-config \\\n   --image-credential-provider-bin-dir /etc/eks/ecr-credential-provider'
     sudo sed -i s,"aws","aws $IMAGE_CREDENTIAL_PROVIDER_FLAGS", $TEMPLATE_DIR/kubelet-containerd.service
@@ -272,7 +272,7 @@ if [[ $KUBERNETES_VERSION == "1.20"* ]]; then
     echo $KUBELET_CONFIG_WITH_CSI_SERVICE_ACCOUNT_TOKEN_ENABLED > $TEMPLATE_DIR/kubelet-config.json
 fi
 
-if [[ $KUBERNETES_VERSION == "1.22"* ]]; then
+if [[ ! $KUBERNETES_VERSION =~ "1.19"* || ! $KUBERNETES_VERSION =~ "1.20"* || ! $KUBERNETES_VERSION =~ "1.21"* ]]; then
     # enable CredentialProviders feature flags in kubelet service file
     IMAGE_CREDENTIAL_PROVIDER_FLAGS='\\\n    --image-credential-provider-config /etc/eks/ecr-credential-provider/ecr-credential-provider-config \\\n    --image-credential-provider-bin-dir /etc/eks/ecr-credential-provider'
     sudo sed -i s,"aws","aws $IMAGE_CREDENTIAL_PROVIDER_FLAGS", $TEMPLATE_DIR/kubelet.service
@@ -311,7 +311,7 @@ fi
 ################################################################################
 ### ECR CREDENTIAL PROVIDER ####################################################
 ################################################################################
-if [[ $KUBERNETES_VERSION == "1.22"* ]]; then
+if [[ ! $KUBERNETES_VERSION =~ "1.19"* || ! $KUBERNETES_VERSION =~ "1.20"* || ! $KUBERNETES_VERSION =~ "1.21"* ]]; then
     ECR_BINARY="ecr-credential-provider"
     if [[ -n "$AWS_ACCESS_KEY_ID" ]]; then
         echo "AWS cli present - using it to copy ecr-credential-provider binaries from s3."

From a7de7a5f581b5c6602c3642725e1afcc22e76f92 Mon Sep 17 00:00:00 2001
From: Prasad Shende <prshende@amazon.com>
Date: Wed, 1 Jun 2022 15:36:48 -0700
Subject: [PATCH 2/2] Removing Makefile changes

---
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 969c0e2bd..cbe8d3833 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ T_YELLOW := \e[0;33m
 T_RESET := \e[0m
 
 .PHONY: all
-all: 1.19 1.20 1.21 1.22 1.23
+all: 1.19 1.20 1.21 1.22
 
 .PHONY: validate
 validate:
@@ -57,7 +57,3 @@ k8s: validate
 .PHONY: 1.22
 1.22:
 	$(MAKE) k8s kubernetes_version=1.22.6 kubernetes_build_date=2022-03-09 pull_cni_from_github=true
-
-.PHONY: 1.23
-1.23:
-	$(MAKE) k8s kubernetes_version=1.23.6 kubernetes_build_date=2022-06-01 pull_cni_from_github=true