Merge pull request #301 from opendatacube/new_cluster_permissions_fix

Restore previous cluster-auth behaviour
opendatacube · Jul 19, 2024 · 92e3eb8 · 92e3eb8
2 parents 1c8e3c3 + 1d3566f
commit 92e3eb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/odc_eks/main.tf b/odc_eks/main.tf
@@ -73,15 +73,15 @@ module "vpc" {
 
 moved {
   from = module.vpc[0].aws_vpc_endpoint.s3[0]
-  to   =  module.vpc_endpoints[0].aws_vpc_endpoint.this["s3"]
+  to   = module.vpc_endpoints[0].aws_vpc_endpoint.this["s3"]
 }
 
 module "vpc_endpoints" {
   source = "git::https://github.com/terraform-aws-modules/terraform-aws-vpc.git//modules/vpc-endpoints?ref=v5.1.1"
   count  = var.create_vpc && var.enable_s3_endpoint ? 1 : 0
 
-  vpc_id = module.vpc[0].vpc_id
-  security_group_ids = [ module.vpc[0].default_security_group_id ]
+  vpc_id             = module.vpc[0].vpc_id
+  security_group_ids = [module.vpc[0].default_security_group_id]
 
   endpoints = {
     s3 = {

diff --git a/odc_eks/modules/eks/main.tf b/odc_eks/modules/eks/main.tf
@@ -11,7 +11,8 @@ resource "aws_eks_cluster" "eks" {
   }
 
   access_config {
-    authentication_mode = "API_AND_CONFIG_MAP"
+    authentication_mode                         = "API_AND_CONFIG_MAP"
+    bootstrap_cluster_creator_admin_permissions = true
   }
 
   depends_on = [