From df96215e1781c2b5e432ad5f7980769bef95215e Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 19 Sep 2024 20:59:50 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(versions):=20bump=20versions?= =?UTF-8?q?=20to=20pull=20from=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++----- main.tf | 13 +------------ variables.tf | 4 ++-- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index bd6a95e..8a092fe 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | -| [karpenter\_resources](#module\_karpenter\_resources) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.24.0 | +| [karpenter\_resources](#module\_karpenter\_resources) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.24.1 | ## Resources @@ -43,7 +43,6 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the |------|------| | [aws_ec2_tag.container_subnets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ec2_tag) | resource | | [aws_iam_instance_profile.karpenter_node_instance_profile](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_instance_profile) | resource | -| [aws_iam_service_linked_role.ec2_spot](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_service_linked_role) | resource | | [helm_release.karpenter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [kubectl_manifest.karpenter_ec2_node_class](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource | | [kubectl_manifest.karpenter_node_pool](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource | @@ -51,7 +50,6 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_ecr_image.karpenter_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source | | [aws_ecr_image.kubectl_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source | -| [aws_iam_roles.roles](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_roles) | data source | | [aws_subnets.container_subnets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/subnets) | data source | ## Inputs @@ -60,10 +58,10 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the |------|-------------|------|---------|:--------:| | [cluster\_endpoint](#input\_cluster\_endpoint) | Endpoint for your Kubernetes API server | `string` | n/a | yes | | [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes | -| [karpenter\_helm\_chart](#input\_karpenter\_helm\_chart) | Which helm chart of karpenter | `string` | `"1.0.1"` | no | +| [karpenter\_helm\_chart](#input\_karpenter\_helm\_chart) | Which helm chart of karpenter | `string` | `"1.0.2"` | no | | [karpenter\_helm\_repo](#input\_karpenter\_helm\_repo) | Helm repo for official karpenter chart | `string` | `"oci://public.ecr.aws/karpenter"` | no | | [karpenter\_node\_group\_name](#input\_karpenter\_node\_group\_name) | The cluster node group that will host karpenter, should not be a karpenter managed node group | `string` | n/a | yes | -| [karpenter\_tag](#input\_karpenter\_tag) | Which tag of karpenter image | `string` | `"1.0.1"` | no | +| [karpenter\_tag](#input\_karpenter\_tag) | Which tag of karpenter image | `string` | `"1.0.2"` | no | | [kubectl\_tag](#input\_kubectl\_tag) | Which tag of kubectl image | `string` | `"1.30.4"` | no | | [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN of the OIDC Provider if `enable_irsa = true` | `string` | n/a | yes | | [profile](#input\_profile) | AWS config profile | `string` | `""` | no | diff --git a/main.tf b/main.tf index 8831008..b1d7d0e 100644 --- a/main.tf +++ b/main.tf @@ -18,7 +18,7 @@ data "aws_subnets" "container_subnets" { # Replicating from here: https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/tree/master/modules/karpenter # Karpenter IRSA roles and policies module "karpenter_resources" { - source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.24.0" + source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.24.1" cluster_name = var.cluster_name enable_irsa = true @@ -181,17 +181,6 @@ resource "aws_iam_instance_profile" "karpenter_node_instance_profile" { role = module.karpenter_resources.node_iam_role_name } -# Query to see if service-linked role exists -data "aws_iam_roles" "roles" { - path_prefix = "/aws-reserved/spot.amazonaws.com" -} - -# Permission for spot -resource "aws_iam_service_linked_role" "ec2_spot" { - count = data.aws_iam_roles.roles == null ? 1 : 0 - aws_service_name = "spot.amazonaws.com" -} - # SHOULD PROBABLY PUT THESE OBJECTS INTO A HELM CHART # Create karpenter default resource "kubectl_manifest" "karpenter_ec2_node_class" { diff --git a/variables.tf b/variables.tf index 4feefb8..8e24033 100644 --- a/variables.tf +++ b/variables.tf @@ -39,13 +39,13 @@ variable "karpenter_helm_repo" { variable "karpenter_helm_chart" { description = "Which helm chart of karpenter" type = string - default = "1.0.1" + default = "1.0.2" } variable "karpenter_tag" { description = "Which tag of karpenter image" type = string - default = "1.0.1" + default = "1.0.2" } variable "kubectl_tag" {