feat: add external-dns and acm capabilities

.gitignore

@@ -21,3 +21,6 @@ db.zip
 node_modules
 .npm
 gcp/k8s/secret-volume.yml
+
+aws/k8s/ctfd-ingress.yaml
+wrongsecrets-balancer-ingress.yml

aws/README.md

@@ -42,13 +42,14 @@ The terraform code is loosely based on [this EKS managed Node Group TF example](
 
 1. export your AWS credentials (`export AWS_PROFILE=awsuser`)
 2. check whether you have the right profile by doing `aws sts get-caller-identity`. Make sure you have the right account and have the rights to do this.
-3. Do `terraform init` (if required, use tfenv to select TF 0.14.0 or higher )
-4. The bucket ARN will be asked in the next 2 steps. Take the one provided to you in the output earlier (e.g., `arn:aws:s3:::terraform-20230102231352749300000001`).
-5. Do `terraform plan`
-6. Do `terraform apply`. Note: the apply will take 10 to 20 minutes depending on the speed of the AWS backplane.
-7. When creation is done, do `aws eks update-kubeconfig --region eu-west-1 --name wrongsecrets-exercise-cluster --kubeconfig ~/.kube/wrongsecrets`
-8. Do `export KUBECONFIG=~/.kube/wrongsecrets`
-9. Run `./build-and-deploy-aws.sh` to install all the required materials (helm for calico, secrets management, autoscaling, etc.)
+3. Ensure you have set all the right variables in `terraform.tfvars`. **Optional:** If you want to use a custom domain with TLS, also fill out your domain name(s) and Route53 hosted zone here. Delegate (sub)domains to Route53 nameservers if you're not hosting your domain with Route53: [using the AWS docs](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/CreatingNewSubdomain.html)
+4. Do `terraform init` (if required, use tfenv to select TF 0.14.0 or higher )
+5. The bucket ARN will be asked in the next 2 steps. Take the one provided to you in the output earlier (e.g., `arn:aws:s3:::terraform-20230102231352749300000001`).
+6. Do `terraform plan`
+7. Do `terraform apply`. Note: the apply will take 10 to 20 minutes depending on the speed of the AWS backplane.
+8. When creation is done, do `aws eks update-kubeconfig --region eu-west-1 --name wrongsecrets-exercise-cluster --kubeconfig ~/.kube/wrongsecrets`
+9. Do `export KUBECONFIG=~/.kube/wrongsecrets`
+10. Run `./build-and-deploy-aws.sh` to install all the required materials (helm for calico, secrets management, autoscaling, etc.)
 
 Your EKS cluster should be visible in [eu-west-1](https://eu-west-1.console.aws.amazon.com/eks/home?region=eu-west-1#/clusters) by default. Want a different region? You can modify `terraform.tfvars` or input it directly using the `region` variable in plan/apply.
 
@@ -158,9 +159,12 @@ The documentation below is auto-generated to give insight on what's created via
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_acm_balancer"></a> [acm\_balancer](#module\_acm\_balancer) | terraform-aws-modules/acm/aws | n/a |
+| <a name="module_acm_ctfd"></a> [acm\_ctfd](#module\_acm\_ctfd) | terraform-aws-modules/acm/aws | n/a |
 | <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 |
 | <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 |
 | <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.24.2 |
+| <a name="module_external_dns_irsa_role"></a> [external\_dns\_irsa\_role](#module\_external\_dns\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 |
 | <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.13.0 |
 
@@ -204,24 +208,32 @@ The documentation below is auto-generated to give insight on what's created via
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_balancer_domain_name"></a> [balancer\_domain\_name](#input\_balancer\_domain\_name) | The domain name to use | `string` | `""` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The EKS cluster name | `string` | `"wrongsecrets-exercise-cluster"` | no |
 | <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | The EKS cluster version to use | `string` | `"1.30"` | no |
+| <a name="input_ctfd_domain_name"></a> [ctfd\_domain\_name](#input\_ctfd\_domain\_name) | The domain name to use | `string` | `""` | no |
 | <a name="input_extra_allowed_ip_ranges"></a> [extra\_allowed\_ip\_ranges](#input\_extra\_allowed\_ip\_ranges) | Allowed IP ranges in addition to creator IP | `list(string)` | `[]` | no |
+| <a name="input_hosted_zone_id"></a> [hosted\_zone\_id](#input\_hosted\_zone\_id) | The ID of the Route53 Hosted Zone to use | `string` | `""` | no |
 | <a name="input_region"></a> [region](#input\_region) | The AWS region to use | `string` | `"eu-west-1"` | no |
 | <a name="input_state_bucket_arn"></a> [state\_bucket\_arn](#input\_state\_bucket\_arn) | ARN of the state bucket to grant access to the s3 user | `string` | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
+| <a name="output_balancer_acm_cert_arn"></a> [balancer\_acm\_cert\_arn](#output\_balancer\_acm\_cert\_arn) | Balancer ACM certificate ARN |
+| <a name="output_balancer_domain_name"></a> [balancer\_domain\_name](#output\_balancer\_domain\_name) | Balancer domain name |
 | <a name="output_cluster_autoscaler_role"></a> [cluster\_autoscaler\_role](#output\_cluster\_autoscaler\_role) | Cluster autoscaler role |
 | <a name="output_cluster_autoscaler_role_arn"></a> [cluster\_autoscaler\_role\_arn](#output\_cluster\_autoscaler\_role\_arn) | Cluster autoscaler role arn |
 | <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Endpoint for EKS control plane. |
 | <a name="output_cluster_id"></a> [cluster\_id](#output\_cluster\_id) | The id of the cluster |
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | The EKS cluster name |
 | <a name="output_cluster_security_group_id"></a> [cluster\_security\_group\_id](#output\_cluster\_security\_group\_id) | Security group ids attached to the cluster control plane. |
+| <a name="output_ctfd_acm_cert_arn"></a> [ctfd\_acm\_cert\_arn](#output\_ctfd\_acm\_cert\_arn) | CTFd ACM certificate ARN |
+| <a name="output_ctfd_domain_name"></a> [ctfd\_domain\_name](#output\_ctfd\_domain\_name) | CTFd domain name |
 | <a name="output_ebs_role"></a> [ebs\_role](#output\_ebs\_role) | EBS CSI driver role |
 | <a name="output_ebs_role_arn"></a> [ebs\_role\_arn](#output\_ebs\_role\_arn) | EBS CSI driver role |
+| <a name="output_external_dns_role_arn"></a> [external\_dns\_role\_arn](#output\_external\_dns\_role\_arn) | External DNS role |
 | <a name="output_irsa_role"></a> [irsa\_role](#output\_irsa\_role) | The role name used in the IRSA setup |
 | <a name="output_irsa_role_arn"></a> [irsa\_role\_arn](#output\_irsa\_role\_arn) | The role ARN used in the IRSA setup |
 | <a name="output_load_balancer_controller_role"></a> [load\_balancer\_controller\_role](#output\_load\_balancer\_controller\_role) | Load balancer controller role |

aws/acm.tf

@@ -0,0 +1,34 @@
+# Uncomment for ssl using ACM
+module "acm_balancer" {
+  source = "terraform-aws-modules/acm/aws"
+
+  count = var.balancer_domain_name != "" ? 1 : 0
+
+  validation_method = "DNS"
+
+  domain_name = var.balancer_domain_name
+  zone_id     = var.hosted_zone_id
+
+  subject_alternative_names = [
+    "*.${var.balancer_domain_name}"
+  ]
+
+  wait_for_validation = true
+}
+
+module "acm_ctfd" {
+  source = "terraform-aws-modules/acm/aws"
+
+  count = var.ctfd_domain_name != "" ? 1 : 0
+
+  validation_method = "DNS"
+
+  domain_name = var.ctfd_domain_name
+  zone_id     = var.hosted_zone_id
+
+  subject_alternative_names = [
+    "*.${var.ctfd_domain_name}"
+  ]
+
+  wait_for_validation = true
+}

aws/k8s-aws-alb-script-cleanup.sh

@@ -37,7 +37,4 @@ echo "Cleanup helm chart"
 helm uninstall aws-load-balancer-controller \
   -n kube-system
 
-echo "Cleanup k8s ALB"
-kubectl delete -k "github.com/aws/eks-charts/stable/aws-load-balancer-controller//crds?ref=master"
-
 kubectl delete serviceaccount -n kube-system aws-load-balancer-controller

aws/k8s-aws-alb-script.sh

@@ -71,25 +71,41 @@ sleep 10
 
 EKS_CLUSTER_VERSION=$(aws eks describe-cluster --name $CLUSTERNAME --region $AWS_REGION --query cluster.version --output text)
 
-# echo "apply -f k8s/secret-challenge-vault-service.yml in 10 s"
-# sleep 10
-# kubectl apply -f k8s/secret-challenge-vault-service.yml
-echo "apply -f k8s/wrongsecrets-balancer-service.yml in 10 s"
+EXTERNAL_DNS_ROLE_ARN="$(terraform output -raw external_dns_role_arn)"
+kubectl create serviceaccount -n kube-system external-dns
+kubectl annotate serviceaccount -n kube-system --overwrite external-dns eks.amazonaws.com/role-arn=${EXTERNAL_DNS_ROLE_ARN}
+
+echo "apply -f k8s/external-dns-*.yaml in 10 s"
 sleep 10
+kubectl apply -f k8s/external-dns-clusterrole.yaml
+kubectl apply -f k8s/external-dns-clusterrolebinding.yaml
+kubectl apply -f k8s/external-dns-deployment.yaml
+
+
+echo "apply -f k8s/wrongsecrets-balancer-service.yml"
 kubectl apply -f k8s/wrongsecrets-balancer-service.yml
-# echo "apply -f k8s/secret-challenge-vault-ingress.yml in 1 s"
-# sleep 1
-# kubectl apply -f k8s/secret-challenge-vault-ingress.yml
-echo "apply -f k8s/wrongsecrets-balancer-ingress.yml in 10 s"
-sleep 10
+
+export BALANCER_DOMAIN_NAME="$(terraform output -raw balancer_domain_name)"
+
+envsubst <./k8s/wrongsecrets-balancer-ingress.yml.tpl >./k8s/wrongsecrets-balancer-ingress.yml
+
+echo "apply -f k8s/wrongsecrets-balancer-ingress.yml"
 kubectl apply -f k8s/wrongsecrets-balancer-ingress.yml
 
+echo "apply -f k8s/ctfd-service.yaml"
 kubectl apply -f k8s/ctfd-service.yaml
+
+export CTFD_DOMAIN_NAME="$(terraform output -raw ctfd_domain_name)"
+envsubst <./k8s/ctfd-ingress.yaml.tpl >./k8s/ctfd-ingress.yaml
+
+echo "apply -f k8s/ctfd-ingress.yaml"
 kubectl apply -f k8s/ctfd-ingress.yaml
 
-echo "waiting 10 s for loadBalancer"
-sleep 10
+echo "waiting 20 s for load balancer"
+sleep 20
 echo "Wrongsecrets ingress: http://$(kubectl get ingress wrongsecrets-balancer -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
+echo "Wrongsecrets host: http://$(kubectl get ingress wrongsecrets-balancer -o jsonpath='{.spec.rules[0].host}')"
 echo "ctfd ingress: http://$(kubectl get ingress -n ctfd ctfd -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')"
+echo "ctfd host: http://$(kubectl get ingress -n ctfd ctfd -o jsonpath='{.spec.rules[0].host}')"
 
 echo "Do not forget to cleanup afterwards! Run k8s-aws-alb-script-cleanup.sh"

aws/k8s/ctfd-ingress.yaml → aws/k8s/ctfd-ingress.yaml.tpl

@@ -7,12 +7,13 @@ metadata:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/target-type: instance
     alb.ingress.kubernetes.io/success-codes: 200-399
-    acme.cert-manager.io/http01-edit-in-place: "true"
-    # cert-manager.io/issue-temporary-certificate: "true"
     #uncomment and configure below if you want to use tls, don't forget to override the cookie to a secure value!
-    # alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:<region>:<account>:certificate/xxxxxx
+    # alb.ingress.kubernetes.io/ssl-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
     # alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-    # alb.ingress.kubernetes.io/actions.ssl-redirect: '443'
+    # alb.ingress.kubernetes.io/ssl-redirect: "443"
+    # external-dns.alpha.kubernetes.io/hostname: ${CTFD_DOMAIN_NAME}
+    # The certificate ARN can be discovered automatically by the ALB Ingress Controller based on the host value in the ingress, or you can specify it manually by uncommenting and customizing the line below
+    # alb.ingress.kubernetes.io/certificate-arn: <certificate-arn>
 spec:
   ingressClassName: alb
   rules:
@@ -25,3 +26,4 @@ spec:
                 name: ctfd
                 port:
                   number: 80
+      host: ${CTFD_DOMAIN_NAME} # Specify the hostname to route to the service

aws/k8s/external-dns-clusterrole.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: external-dns
+  labels:
+    app.kubernetes.io/name: external-dns
+rules:
+  - apiGroups: [""]
+    resources: ["services", "endpoints", "pods", "nodes"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["extensions", "networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "watch", "list"]

aws/k8s/external-dns-clusterrolebinding.yaml

@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: external-dns-viewer
+  labels:
+    app.kubernetes.io/name: external-dns
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: external-dns
+subjects:
+  - kind: ServiceAccount
+    name: external-dns
+    namespace: kube-system

aws/k8s/external-dns-deployment.yaml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: external-dns
+  namespace: kube-system
+  labels:
+    app: external-dns
+spec:
+  selector:
+    matchLabels:
+      app: external-dns
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: external-dns
+    spec:
+      serviceAccountName: external-dns
+      securityContext:
+        fsGroup: 65534
+      containers:
+        - name: external-dns
+          image: bitnami/external-dns:0.15.0
+          resources:
+            limits:
+              memory: 256Mi
+              cpu: 500m
+          args:
+            - --source=ingress
+            - --provider=aws
+            - --aws-zone-type=public # only look at public hosted zones (valid values are public, private or no value for both)
+            - --txt-owner-id=external-dns

aws/k8s/wrongsecrets-balancer-ingress.yml → aws/k8s/wrongsecrets-balancer-ingress.yml.tpl

@@ -7,12 +7,13 @@ metadata:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/target-type: instance
     alb.ingress.kubernetes.io/success-codes: 200-399
-    acme.cert-manager.io/http01-edit-in-place: "true"
-    # cert-manager.io/issue-temporary-certificate: "true"
     #uncomment and configure below if you want to use tls, don't forget to override the cookie to a secure value!
-    # alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:<region>:<account>:certificate/xxxxxx
+    # alb.ingress.kubernetes.io/ssl-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
     # alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-    # alb.ingress.kubernetes.io/actions.ssl-redirect: '443'
+    # alb.ingress.kubernetes.io/ssl-redirect: "443"
+    # external-dns.alpha.kubernetes.io/hostname: ${BALANCER_DOMAIN_NAME}
+    # The certificate ARN can be discovered automatically by the ALB Ingress Controller based on the host value in the ingress, or you can specify it manually by uncommenting and customizing the line below
+    # alb.ingress.kubernetes.io/certificate-arn: <certificate-arn>
 spec:
   ingressClassName: alb
   rules:
@@ -25,3 +26,4 @@ spec:
                 name: wrongsecrets-balancer
                 port:
                   number: 80
+      host: ${BALANCER_DOMAIN_NAME} # Specify the hostname to route to the service

aws/main.tf

@@ -208,3 +208,18 @@ module "load_balancer_controller_irsa_role" {
     }
   }
 }
+
+module "external_dns_irsa_role" {
+  source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+  version = "~> 5.46"
+
+  role_name                  = "external-dns"
+  attach_external_dns_policy = true
+
+  oidc_providers = {
+    main = {
+      provider_arn               = module.eks.oidc_provider_arn
+      namespace_service_accounts = ["kube-system:external-dns"]
+    }
+  }
+}

aws/outputs.tf

@@ -68,3 +68,28 @@ output "state_bucket_name" {
   description = "Terraform s3 state bucket name"
   value       = split(":", var.state_bucket_arn)[length(split(":", var.state_bucket_arn)) - 1]
 }
+
+output "balancer_acm_cert_arn" {
+  description = "Balancer ACM certificate ARN"
+  value       = var.balancer_domain_name == "" ? null : one(module.acm_balancer).acm_certificate_arn
+}
+
+output "balancer_domain_name" {
+  description = "Balancer domain name"
+  value       = var.balancer_domain_name
+}
+
+output "ctfd_acm_cert_arn" {
+  description = "CTFd ACM certificate ARN"
+  value       = var.ctfd_domain_name == "" ? null : one(module.acm_ctfd).acm_certificate_arn
+}
+
+output "ctfd_domain_name" {
+  description = "CTFd domain name"
+  value       = var.ctfd_domain_name
+}
+
+output "external_dns_role_arn" {
+  description = "External DNS role"
+  value       = module.external_dns_irsa_role.iam_role_arn
+}

aws/shared-state/main.tf

@@ -2,6 +2,7 @@ terraform {
   required_version = "~> 1.1"
   required_providers {
     aws = {
+      source  = "hashicorp/aws"
       version = "~> 5.0"
     }
   }

aws/terraform.tfvars

@@ -1,2 +1,7 @@
 region = "eu-west-1"
 # state_bucket_arn = "..."
+
+## Optional: use this section for a custom domain with TLS. If you leave it blank, you'll just get the default ALB urls
+# hosted_zone_id      = "..."
+# balancer_domain_name = "..."
+# ctfd_domain_name     = "..."

aws/variables.tf

@@ -3,6 +3,23 @@ variable "region" {
   type        = string
   default     = "eu-west-1"
 }
+variable "balancer_domain_name" {
+  description = "The domain name to use"
+  type        = string
+  default     = ""
+}
+
+variable "ctfd_domain_name" {
+  description = "The domain name to use"
+  type        = string
+  default     = ""
+}
+
+variable "hosted_zone_id" {
+  description = "The ID of the Route53 Hosted Zone to use"
+  type        = string
+  default     = ""
+}
 
 variable "cluster_version" {
   description = "The EKS cluster version to use"