Merge branch 'main' into aws_glue_finops

dominodatalab · Dec 17, 2024 · f1c6a3c · f1c6a3c
2 parents 3a5b55a + 94b8a43
commit f1c6a3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/modules/iam-bootstrap/README.md b/modules/iam-bootstrap/README.md
@@ -24,6 +24,7 @@ No modules.
 |------|------|
 | [aws_iam_policy.deployment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.deployment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
+| [aws_iam_role_policy_attachment.deployment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachments_exclusive.deployment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachments_exclusive) | resource |
 | [aws_caller_identity.admin](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |

diff --git a/modules/iam-bootstrap/main.tf b/modules/iam-bootstrap/main.tf
@@ -45,6 +45,13 @@ resource "aws_iam_role" "deployment" {
 }
 
 
+resource "aws_iam_role_policy_attachment" "deployment" {
+  count      = length(aws_iam_policy.deployment)
+  role       = aws_iam_role.deployment.name
+  policy_arn = aws_iam_policy.deployment[count.index].arn
+}
+
+
 resource "aws_iam_role_policy_attachments_exclusive" "deployment" {
   role_name   = aws_iam_role.deployment.name
   policy_arns = aws_iam_policy.deployment[*].arn

diff --git a/modules/single-node/templates/linux_user_data.tpl b/modules/single-node/templates/linux_user_data.tpl
@@ -8,4 +8,4 @@ spec:
     certificateAuthority: ${cluster_auth_base64}
     cidr: ${cluster_service_ipv4_cidr}
   kubelet:
-    flags: ["${bootstrap_extra_args}"]
+    flags: ["${bootstrap_extra_args}"]