Skip to content
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

Updating Makefile and install script for 1.23 version #935

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Updating Makefile and install script for 1.23 version #935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f12db6
Updating Makefile and install script for 1.23 version
prasad0896 Jun 1, 2022
a7de7a5
Removing Makefile changes
prasad0896 Jun 1, 2022
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
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have we published these binaries yet? We shouldn't merge this PR until we do.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No we haven't. I think I will add this part later.

6 changes: 3 additions & 3 deletions scripts/install-worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down