From 2d9b3407545c21bd968561015c0b9b8afa64ace7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Heleno?= Date: Tue, 27 Feb 2024 10:59:27 +0100 Subject: [PATCH] docs(eks): update example with new module versions --- examples/eks/apps.tf | 1 + examples/eks/csi_drivers.tf | 4 ++-- examples/eks/locals.tf | 3 ++- examples/eks/main.tf | 28 ++++++++++++++++------------ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/examples/eks/apps.tf b/examples/eks/apps.tf index 5cfec6af02..3497c02cf7 100644 --- a/examples/eks/apps.tf +++ b/examples/eks/apps.tf @@ -46,6 +46,7 @@ module "helloworld_apps" { cluster: name: "${local.cluster_name}" domain: "${local.base_domain}" + subdomain: "${local.subdomain}" issuer: "${local.cluster_issuer}" apps: traefik_dashboard: false diff --git a/examples/eks/csi_drivers.tf b/examples/eks/csi_drivers.tf index 92e1bd5446..b5c9a0f9be 100644 --- a/examples/eks/csi_drivers.tf +++ b/examples/eks/csi_drivers.tf @@ -35,7 +35,7 @@ resource "aws_efs_mount_target" "eks" { } module "efs" { - source = "git::https://github.com/camptocamp/devops-stack-module-efs-csi-driver.git?ref=v3.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-efs-csi-driver.git?ref=v3.1.0" cluster_name = local.cluster_name argocd_project = module.eks.cluster_name @@ -52,7 +52,7 @@ module "efs" { } module "ebs" { - source = "git::https://github.com/camptocamp/devops-stack-module-ebs-csi-driver.git?ref=v3.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-ebs-csi-driver.git?ref=v3.1.0" cluster_name = local.cluster_name argocd_project = module.eks.cluster_name diff --git a/examples/eks/locals.tf b/examples/eks/locals.tf index 3467e1022d..ed7580c066 100644 --- a/examples/eks/locals.tf +++ b/examples/eks/locals.tf @@ -1,7 +1,8 @@ locals { - kubernetes_version = "1.28" + kubernetes_version = "1.29" cluster_name = "YOUR_CLUSTER_NAME" # Must be unique for each DevOps Stack deployment in a single AWS account. Contains only alphanumeric and hyphens. base_domain = "your.domain.here" # Must match a Route 53 zone in the AWS account where you are deploying the DevOps Stack. + subdomain = "apps" cluster_issuer = module.cert-manager.cluster_issuers.staging letsencrypt_issuer_email = "YOUR_EMAIL_ADDRESS" enable_service_monitor = false # Can be enabled after the first bootstrap. diff --git a/examples/eks/main.tf b/examples/eks/main.tf index 0ac7c9e808..577e89cc23 100644 --- a/examples/eks/main.tf +++ b/examples/eks/main.tf @@ -24,11 +24,12 @@ module "vpc" { } module "eks" { - source = "git::https://github.com/camptocamp/devops-stack-module-cluster-eks.git?ref=v3.0.1" + source = "git::https://github.com/camptocamp/devops-stack-module-cluster-eks.git?ref=v3.1.0" cluster_name = local.cluster_name kubernetes_version = local.kubernetes_version base_domain = local.base_domain + subdomain = local.subdomain vpc_id = module.vpc.vpc_id private_subnet_ids = module.vpc.private_subnets @@ -44,7 +45,7 @@ module "eks" { max_size = 3 desired_size = 3 nlbs_attachment = true - disk_size = 100 + disk_size = 50 labels = { "devops-stack.io/nodepool" = "main" } @@ -55,10 +56,11 @@ module "eks" { } module "oidc" { - source = "git::https://github.com/camptocamp/devops-stack-module-oidc-aws-cognito.git?ref=v1.0.1" + source = "git::https://github.com/camptocamp/devops-stack-module-oidc-aws-cognito.git?ref=v1.1.0" cluster_name = module.eks.cluster_name base_domain = module.eks.base_domain + subdomain = local.subdomain create_pool = true @@ -73,7 +75,7 @@ module "oidc" { } module "argocd_bootstrap" { - source = "git::https://github.com/camptocamp/devops-stack-module-argocd.git//bootstrap?ref=v4.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-argocd.git//bootstrap?ref=v4.3.0" argocd_projects = { "${module.eks.cluster_name}" = { @@ -97,10 +99,8 @@ module "metrics-server" { } module "traefik" { - source = "git::https://github.com/camptocamp/devops-stack-module-traefik.git//eks?ref=v5.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-traefik.git//eks?ref=v6.2.0" - cluster_name = module.eks.cluster_name - base_domain = module.eks.base_domain argocd_project = module.eks.cluster_name app_autosync = local.app_autosync @@ -112,7 +112,7 @@ module "traefik" { } module "cert-manager" { - source = "git::https://github.com/camptocamp/devops-stack-module-cert-manager.git//eks?ref=v8.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-cert-manager.git//eks?ref=v8.1.0" cluster_name = module.eks.cluster_name base_domain = module.eks.base_domain @@ -150,14 +150,16 @@ module "loki-stack" { } module "thanos" { - source = "git::https://github.com/camptocamp/devops-stack-module-thanos.git//eks?ref=v3.0.1" + source = "git::https://github.com/camptocamp/devops-stack-module-thanos.git//eks?ref=v4.0.0" cluster_name = module.eks.cluster_name base_domain = module.eks.base_domain + subdomain = local.subdomain cluster_issuer = local.cluster_issuer argocd_project = module.eks.cluster_name - app_autosync = local.app_autosync + app_autosync = local.app_autosync + enable_service_monitor = local.enable_service_monitor metrics_storage = { bucket_id = aws_s3_bucket.thanos_metrics_storage.id @@ -179,10 +181,11 @@ module "thanos" { } module "kube-prometheus-stack" { - source = "git::https://github.com/camptocamp/devops-stack-module-kube-prometheus-stack.git//eks?ref=v9.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-kube-prometheus-stack.git//eks?ref=v9.2.1" cluster_name = module.eks.cluster_name base_domain = module.eks.base_domain + subdomain = local.subdomain cluster_issuer = local.cluster_issuer argocd_project = module.eks.cluster_name @@ -218,10 +221,11 @@ module "kube-prometheus-stack" { } module "argocd" { - source = "git::https://github.com/camptocamp/devops-stack-module-argocd.git?ref=v4.0.0" + source = "git::https://github.com/camptocamp/devops-stack-module-argocd.git?ref=v4.3.0" cluster_name = module.eks.cluster_name base_domain = module.eks.base_domain + subdomain = local.subdomain cluster_issuer = local.cluster_issuer argocd_project = module.eks.cluster_name