add self-managed ubuntu node group with codejail (#66)

* refactor: switch to Terraform templatefile() and bump versions * refactor: fix missing if * chore: make jinja ignore file contents * chore: make jinja ignore file contents * chore: make jinja ignore file contents * chore: make jinja ignore file contents * chore: make jinja ignore file contents * chore: make jinja ignore file contents * chore: make jinja ignore file contents * style: lint * chore: add eks parameters * chore: remove gavinbunney/kubectl * chore: cleanup jinja tags * chore: remove kubectl * refactor: new cluster access auth method w terraform-aws-modules/eks/aws v20.0 * chore: fix stacks.hcl parameter assignments * add codejail * feat: add self managed ubunut node group with codejail * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions * chore: refactor templates and bump versions
cookiecutter-openedx · Feb 13, 2024 · fcf2f71 · fcf2f71
1 parent 01da418
commit fcf2f71
Show file tree

Hide file tree

Showing 41 changed files with 1,017 additions and 346 deletions.
diff --git a/{{cookiecutter.github_repo_name}}/terraform/environments/modules/acm/main.tf b/{{cookiecutter.github_repo_name}}/terraform/environments/modules/acm/main.tf
@@ -19,25 +19,6 @@ data "aws_route53_zone" "environment_domain" {
 }
 
 
-module "acm_root_domain_environment_region" {
-  source  = "terraform-aws-modules/acm/aws"
-  version = "~> {{ cookiecutter.terraform_aws_modules_acm }}"
-
-  providers = {
-    aws = aws.environment_region
-  }
-
-  domain_name = var.root_domain
-  zone_id     = data.aws_route53_zone.root_domain.id
-
-  subject_alternative_names = [
-    "*.${var.root_domain}",
-  ]
-  tags = local.tags
-
-  wait_for_validation = true
-}
-
 module "acm_environment_environment_region" {
   source  = "terraform-aws-modules/acm/aws"
   version = "{{ cookiecutter.terraform_aws_modules_acm }}"
@@ -46,8 +27,9 @@ module "acm_environment_environment_region" {
     aws = aws.environment_region
   }
 
-  domain_name = var.environment_domain
-  zone_id     = data.aws_route53_zone.environment_domain.id
+  domain_name       = var.environment_domain
+  zone_id           = data.aws_route53_zone.environment_domain.id
+  validation_method = "DNS"
 
   subject_alternative_names = [
     "*.${var.environment_domain}",

diff --git a/{{cookiecutter.github_repo_name}}/terraform/environments/modules/acm/outputs.tf b/{{cookiecutter.github_repo_name}}/terraform/environments/modules/acm/outputs.tf
@@ -1,5 +1,6 @@
 
 
-output "acm_root_domain_environment_region_acm_certificate_status" {
-  value = module.acm_root_domain_environment_region.acm_certificate_status
+output "acm_environment_environment_region_acm_certificate_arn" {
+  description = "the ARN of the environment certificate"
+  value       = module.acm_environment_environment_region.acm_certificate_arn
 }
diff --git a/...utter.github_repo_name}}/terraform/environments/modules/cloudfront/certificate_manager.tf b/...utter.github_repo_name}}/terraform/environments/modules/cloudfront/certificate_manager.tf
@@ -19,8 +19,10 @@ module "acm_environment_domain" {
     aws = aws.us-east-1
   }
 
-  domain_name = var.environment_domain
-  zone_id     = data.aws_route53_zone.environment_domain.id
+  domain_name       = var.environment_domain
+  zone_id           = data.aws_route53_zone.environment_domain.id
+  validation_method = "DNS"
+
 
   subject_alternative_names = [
     "*.${var.environment_domain}",

diff --git a/{{cookiecutter.github_repo_name}}/terraform/environments/modules/cloudfront/main.tf b/{{cookiecutter.github_repo_name}}/terraform/environments/modules/cloudfront/main.tf
@@ -39,10 +39,10 @@ data "aws_route53_zone" "environment_domain" {
 # see eks_ec2/acm.tf or eks_fargate/acm.tf for creation of this certificate
 # as well as the definition for the provider "aws.us-east-1"
 data "aws_acm_certificate" "environment_domain" {
-  domain   = var.environment_domain
-  statuses = ["ISSUED"]
-  provider = aws.us-east-1
-  {% if cookiecutter.global_aws_region != "us-east-1" -%}depends_on = [module.acm_environment_domain]{% endif %}
+  domain     = var.environment_domain
+  statuses   = ["ISSUED"]
+  provider   = aws.us-east-1
+  depends_on = [module.acm_environment_domain]
 }
 
 data "aws_s3_bucket" "environment_domain" {