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

Exclude docker from 1.25+ AMI metadata #1174

Merged
merged 1 commit into from
Feb 7, 2023
Merged

Exclude docker from 1.25+ AMI metadata #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ K8S_VERSION_MINOR := $(word 1,${K8S_VERSION_PARTS}).$(word 2,${K8S_VERSION_PARTS

MAKEFILE_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

# Docker is not present on 1.25+ AMI's
ifeq ($(shell $(MAKEFILE_DIR)/files/bin/vercmp "$(kubernetes_version)" gteq "1.25.0"), true)
# do not tag the AMI with the Docker version
docker_version ?= none
# do not include the Docker version in the AMI description
ami_component_description ?= (k8s: {{ user `kubernetes_version` }}, containerd: {{ user `containerd_version` }})
endif

arch ?= x86_64
ifeq ($(arch), arm64)
instance_type ?= m6g.large
Expand Down
1 change: 1 addition & 0 deletions eks-worker-al2-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"additional_yum_repos": "",
"ami_component_description": "(k8s: {{ user `kubernetes_version` }}, docker: {{ user `docker_version` }}, containerd: {{ user `containerd_version` }})",
"ami_description": "EKS Kubernetes Worker AMI with AmazonLinux2 image",
"ami_regions": "",
"ami_users": "",
Expand Down
3 changes: 2 additions & 1 deletion eks-worker-al2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"_comment": "All template variables are enumerated here; and most variables have a default value defined in eks-worker-al2-variables.json",
"variables": {
"additional_yum_repos": null,
"ami_component_description": null,
"ami_description": null,
"ami_name": null,
"ami_regions": null,
Expand Down Expand Up @@ -107,7 +108,7 @@
"cni_plugin_version": "{{ user `cni_plugin_version`}}"
},
"ami_name": "{{user `ami_name`}}",
"ami_description": "{{ user `ami_description` }}, (k8s: {{ user `kubernetes_version` }}, docker: {{ user `docker_version` }}, containerd: {{ user `containerd_version` }})"
"ami_description": "{{ user `ami_description` }}, {{ user `ami_component_description` }}"
}
],
"provisioners": [
Expand Down