From de28d8afa95d4c823b0669e2c8940594f96863ba Mon Sep 17 00:00:00 2001 From: Rodrigo Bersa Date: Thu, 8 Feb 2024 15:21:28 -0800 Subject: [PATCH] Updating tests and docs --- docs/addons/bottlerocket.md | 6 +++--- tests/complete/main.tf | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/addons/bottlerocket.md b/docs/addons/bottlerocket.md index af5878cb..e6c10acf 100644 --- a/docs/addons/bottlerocket.md +++ b/docs/addons/bottlerocket.md @@ -94,13 +94,13 @@ module "eks_blueprints_addons" { } ``` -You can also customize the Helm charts that deploys `bottlerocket_update_operator` and the `bottlerocket_update_operator_crds` via the following configuration: +You can also customize the Helm charts that deploys `bottlerocket_update_operator` and the `bottlerocket_shadow` via the following configuration: ```hcl enable_bottlerocket_update_operator = true bottlerocket_update_operator = { - name = "brupop" + name = "brupop-operator" description = "A Helm chart for BRUPOP" chart_version = "1.3.0" namespace = "brupop" @@ -110,7 +110,7 @@ bottlerocket_update_operator = { }] } -bottlerocket_update_operator_crds = { +bottlerocket_shadow = { name = "brupop-crds" description = "A Helm chart for BRUPOP CRDs" chart_version = "1.0.0" diff --git a/tests/complete/main.tf b/tests/complete/main.tf index ef13d7b9..d21096bc 100644 --- a/tests/complete/main.tf +++ b/tests/complete/main.tf @@ -129,6 +129,8 @@ module "eks_blueprints_addons" { aws-guardduty-agent = {} } + + enable_aws_efs_csi_driver = true enable_aws_fsx_csi_driver = true enable_argocd = true @@ -136,7 +138,6 @@ module "eks_blueprints_addons" { enable_argo_workflows = true enable_aws_cloudwatch_metrics = true enable_aws_privateca_issuer = true - enable_cert_manager = true enable_cluster_autoscaler = true enable_secrets_store_csi_driver = true enable_secrets_store_csi_driver_provider_aws = true @@ -146,6 +147,12 @@ module "eks_blueprints_addons" { enable_gatekeeper = true enable_ingress_nginx = true + # Wait for all Cert-manager related resources to be ready + enable_cert_manager = true + cert_manager = { + wait = true + } + # Turn off mutation webhook for services to avoid ordering issue enable_aws_load_balancer_controller = true aws_load_balancer_controller = { @@ -216,6 +223,8 @@ module "eks_blueprints_addons" { }] } + enable_bottlerocket_update_operator = true + # Pass in any number of Helm charts to be created for those that are not natively supported helm_releases = { prometheus-adapter = {