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

feat: Allow users to specify the Windows Server version; 2019 (default) or 2022 #1078

Merged
merged 8 commits into from
Oct 25, 2022
Merged

feat: Allow users to specify the Windows Server version; 2019 (default) or 2022 #1078

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5077ca3
todo - refactor logic to define custom AMI ID
IgorEulalio Oct 21, 2022
6bf084f
including variable to specify windows server version, setting default…
IgorEulalio Oct 21, 2022
56a1197
fix windows_server_version variable to match map value
IgorEulalio Oct 21, 2022
08b65ec
creating condition to validate windows server 2022 compatibility
Oct 24, 2022
d812f75
Merge pull request #1 from IgorEulalio/feature/windows-self-managed-n…
IgorEulalio Oct 24, 2022
07f6774
Merge branch 'main' of github.com:aws-ia/terraform-aws-eks-blueprints
bryantbiggs Oct 25, 2022
5c334eb
chore: Update windows server version usage to allow users to specify
bryantbiggs Oct 25, 2022
c73052f
Merge branch 'main' into main
bryantbiggs Oct 25, 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
4 changes: 3 additions & 1 deletion modules/aws-eks-self-managed-node-groups/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ locals {
capacity_rebalance = false
spot_allocation_strategy = "capacity-optimized-prioritized"
launch_template_os = "amazonlinux2eks" # amazonlinux2eks/bottlerocket/windows # Used to identify the launch template
windows_server_version = "2019"
pre_userdata = ""
post_userdata = ""
kubelet_extra_args = ""
Expand Down Expand Up @@ -50,11 +51,12 @@ locals {
)

enable_windows_support = local.self_managed_node_group["launch_template_os"] == "windows"
windows_server_version = local.self_managed_node_group["windows_server_version"]

predefined_ami_names = {
amazonlinux2eks = "amazon-eks-node-${var.context.cluster_version}-*"
bottlerocket = "bottlerocket-aws-k8s-${var.context.cluster_version}-x86_64-*"
windows = "Windows_Server-2019-English-Core-EKS_Optimized-${var.context.cluster_version}-*"
windows = "Windows_Server-${local.windows_server_version}-English-Core-EKS_Optimized-${var.context.cluster_version}-*"
bryantbiggs marked this conversation as resolved.
Show resolved Hide resolved
}

predefined_ami_types = keys(local.predefined_ami_names)
Expand Down