diff --git a/modules/karpenter/karpenter.tf b/modules/karpenter/karpenter.tf index 3c7464a3..8d92a4eb 100644 --- a/modules/karpenter/karpenter.tf +++ b/modules/karpenter/karpenter.tf @@ -1,17 +1,14 @@ module "karpenter" { source = "terraform-aws-modules/eks/aws//modules/karpenter" - version = "~> 19.18.0" + version = "~> 20.5.0" cluster_name = var.cluster_name irsa_oidc_provider_arn = var.oidc_provider_arn - irsa_namespace_service_accounts = ["karpenter:karpenter"] - - create_iam_role = false - iam_role_arn = var.worker_iam_role_arn - - enable_karpenter_instance_profile_creation = true # Might be removed in later versions https://github.com/terraform-aws-modules/terraform-aws-eks/pull/2800/files + irsa_namespace_service_accounts = ["kube-system:karpenter"] + create_iam_role = false + node_iam_role_arn = var.worker_iam_role_arn } resource "helm_release" "karpenter" { @@ -52,14 +49,10 @@ module "karpenter-crds" { version = "~> 0.3.0" crds_urls = [ - "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.sh_provisioners.yaml", - "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.k8s.aws_awsnodetemplates.yaml", - "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.sh_machines.yaml", "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml", "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.sh_nodeclaims.yaml", "https://raw.githubusercontent.com/aws/karpenter/${var.karpenter_chart_version}/pkg/apis/crds/karpenter.sh_nodepools.yaml", ] - } ######################### diff --git a/modules/karpenter/templates/nodetemplate.tftpl b/modules/karpenter/templates/nodetemplate.tftpl deleted file mode 100644 index 71022418..00000000 --- a/modules/karpenter/templates/nodetemplate.tftpl +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: karpenter.k8s.aws/v1alpha1 -kind: AWSNodeTemplate -metadata: - name: ${node_template_name} -spec: - amiFamily: ${karpenter_ami_family} - blockDeviceMappings: - ${indent(4,karpenter_block_device_mapping_yaml)} - securityGroupSelector: - ${indent(4,karpenter_security_group_selector_map_yaml)} - subnetSelector: - ${indent(4,karpenter_subnet_selector_map_yaml)} - tags: - ${indent(4,karpenter_nodetemplate_tag_map_yaml)} diff --git a/modules/karpenter/templates/provisioner.tftpl b/modules/karpenter/templates/provisioner.tftpl deleted file mode 100644 index 6689bb41..00000000 --- a/modules/karpenter/templates/provisioner.tftpl +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: karpenter.sh/v1alpha5 -kind: Provisioner -metadata: - name: ${provisioner_name} -spec: -%{ if karpenter_provisioner_node_labels_yaml != ""} - labels: - ${indent(4, karpenter_provisioner_node_labels_yaml)} -%{ endif } -%{ if karpenter_provisioner_node_taints_yaml != ""} - taints: - ${indent(4, karpenter_provisioner_node_taints_yaml)} -%{ endif } - limits: - resources: - cpu: 1k - providerRef: - name: default - requirements: - ${indent(4, karpenter_requirements_yaml)} - ttlSecondsAfterEmpty: 30 diff --git a/modules/karpenter/variables.tf b/modules/karpenter/variables.tf index fee95f25..63a4aa65 100644 --- a/modules/karpenter/variables.tf +++ b/modules/karpenter/variables.tf @@ -29,7 +29,7 @@ variable "karpenter_chart_repository" { variable "karpenter_chart_version" { description = "Chart version for Karpenter" type = string - default = "v0.32.1" + default = "v0.33.2" } variable "karpenter_nodepools" {