diff --git a/README.md b/README.md index b653c90..82358f5 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ No modules. | [crds\_argo\_sync\_policy](#input\_crds\_argo\_sync\_policy) | ArgoCD syncPolicy manifest parameter | `any` | `{}` | no | | [crds\_helm\_atomic](#input\_crds\_helm\_atomic) | If set, installation process purges chart on fail. The wait flag will be set automatically if atomic is used | `bool` | `false` | no | | [crds\_helm\_chart\_name](#input\_crds\_helm\_chart\_name) | Helm chart name to be installed | `string` | `"karpenter-crd"` | no | -| [crds\_helm\_chart\_version](#input\_crds\_helm\_chart\_version) | Version of the Helm chart | `string` | `"0.36.2"` | no | +| [crds\_helm\_chart\_version](#input\_crds\_helm\_chart\_version) | Version of the Helm chart | `string` | `"1.0.8"` | no | | [crds\_helm\_cleanup\_on\_fail](#input\_crds\_helm\_cleanup\_on\_fail) | Allow deletion of new resources created in this helm upgrade when upgrade fails | `bool` | `false` | no | | [crds\_helm\_dependency\_update](#input\_crds\_helm\_dependency\_update) | Runs helm dependency update before installing the chart | `bool` | `false` | no | | [crds\_helm\_description](#input\_crds\_helm\_description) | Set helm release description attribute (visible in the history) | `string` | `""` | no | @@ -198,7 +198,7 @@ No modules. | [enabled](#input\_enabled) | Variable indicating whether deployment is enabled | `bool` | `true` | no | | [helm\_atomic](#input\_helm\_atomic) | If set, installation process purges chart on fail. The wait flag will be set automatically if atomic is used | `bool` | `false` | no | | [helm\_chart\_name](#input\_helm\_chart\_name) | Helm chart name to be installed | `string` | `"karpenter"` | no | -| [helm\_chart\_version](#input\_helm\_chart\_version) | Version of the Helm chart | `string` | `"0.36.2"` | no | +| [helm\_chart\_version](#input\_helm\_chart\_version) | Version of the Helm chart | `string` | `"1.0.8"` | no | | [helm\_cleanup\_on\_fail](#input\_helm\_cleanup\_on\_fail) | Allow deletion of new resources created in this helm upgrade when upgrade fails | `bool` | `false` | no | | [helm\_create\_namespace](#input\_helm\_create\_namespace) | Create the namespace if it does not yet exist | `bool` | `true` | no | | [helm\_dependency\_update](#input\_helm\_dependency\_update) | Runs helm dependency update before installing the chart | `bool` | `false` | no | diff --git a/iam.tf b/iam.tf index ec456c2..c1bbcd0 100644 --- a/iam.tf +++ b/iam.tf @@ -109,6 +109,15 @@ data "aws_iam_policy_document" "this" { values = ["owned"] } + condition { # Karpenter v1 Migration: Include additional tag-scoping for the eks:eks-cluster-name tag - https://karpenter.sh/docs/reference/cloudformation/#allowscopedresourcetagging + test = "StringEquals" + variable = "aws:RequestTag/eks:eks-cluster-name" + + values = [ + var.cluster_name + ] + } + condition { test = "StringEquals" variable = "ec2:CreateAction" @@ -145,11 +154,20 @@ data "aws_iam_policy_document" "this" { values = ["*"] } + condition { # Karpenter v1 Migration: Include additional tag-scoping for the eks:eks-cluster-name tag - https://karpenter.sh/docs/reference/cloudformation/#allowscopedresourcetagging + test = "StringEqualsIfExists" + variable = "aws:RequestTag/eks:eks-cluster-name" + values = [ + var.cluster_name + ] + } + condition { test = "ForAllValues:StringEquals" variable = "aws:TagKeys" values = [ + "eks:eks-cluster-name", "karpenter.sh/nodeclaim", "Name", ] diff --git a/variables-crds.tf b/variables-crds.tf index ace98cf..a0799c7 100644 --- a/variables-crds.tf +++ b/variables-crds.tf @@ -8,7 +8,7 @@ variable "crds_helm_chart_name" { variable "crds_helm_chart_version" { type = string - default = "0.36.2" + default = "1.0.8" description = "Version of the Helm chart" } diff --git a/variables.tf b/variables.tf index d19d95b..579e9f4 100644 --- a/variables.tf +++ b/variables.tf @@ -41,7 +41,7 @@ variable "helm_chart_name" { variable "helm_chart_version" { type = string - default = "0.36.2" + default = "1.0.8" description = "Version of the Helm chart" }