mirror of
https://github.com/storytold/terraform-aws-observability-accelerator.git
synced 2026-10-09 00:09:43 +00:00
Support re-using existing cert-manager on cluster
This commit is contained in:
@@ -86,3 +86,11 @@ No inputs.
|
|||||||
|
|
||||||
No outputs.
|
No outputs.
|
||||||
<!-- END_TF_DOCS -->
|
<!-- END_TF_DOCS -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Design Questions
|
||||||
|
|
||||||
|
1. fetching EKS auth as config map? and pass to module (version, etc) as object?
|
||||||
|
2. automatically pass config option as objects? (aws adot add-on: enable cert-manager, cert-manager version?)
|
||||||
|
3. Test case for every option possible?
|
||||||
@@ -36,6 +36,4 @@ locals {
|
|||||||
tags = {
|
tags = {
|
||||||
Source = "github.com/aws-ia/terraform-aws-observability-accelerator"
|
Source = "github.com/aws-ia/terraform-aws-observability-accelerator"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
|
|
||||||
module "eks_observability_accelerator" {
|
module "eks_observability_accelerator" {
|
||||||
#source = "aws-ia/aws-observability-accelerator/terraform/eks"
|
#source = "aws-ia/terrarom-aws-observability-accelerator"
|
||||||
source = "../"
|
source = "../"
|
||||||
|
|
||||||
aws_region = var.aws_region
|
aws_region = var.aws_region
|
||||||
@@ -9,13 +9,9 @@ module "eks_observability_accelerator" {
|
|||||||
|
|
||||||
# deploys AWS Distro for OpenTelemetry operator into the cluster
|
# deploys AWS Distro for OpenTelemetry operator into the cluster
|
||||||
enable_amazon_eks_adot = true
|
enable_amazon_eks_adot = true
|
||||||
# amazon_eks_adot_config = object(
|
|
||||||
# enable_cert_manager = false
|
|
||||||
# )
|
|
||||||
|
|
||||||
# # enable managed add-on for ADOT. Do we enforce this or let users
|
# reusing existing certificate manager? defaults to true
|
||||||
# # have their own configs for OTEL operator
|
enable_cert_manager = false
|
||||||
# enable_amazon_eks_adot = true
|
|
||||||
|
|
||||||
# # -- or enable opentelemetry operator
|
# # -- or enable opentelemetry operator
|
||||||
# enable_open_telemetry_operator = true
|
# enable_open_telemetry_operator = true
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ module "adot_operator" {
|
|||||||
source = "./modules/core/opentelemetry-operator"
|
source = "./modules/core/opentelemetry-operator"
|
||||||
count = var.enable_amazon_eks_adot ? 1 : 0
|
count = var.enable_amazon_eks_adot ? 1 : 0
|
||||||
|
|
||||||
|
enable_cert_manager = var.enable_cert_manager
|
||||||
|
|
||||||
kubernetes_version = local.eks_cluster_version
|
kubernetes_version = local.eks_cluster_version
|
||||||
addon_context = local.context
|
addon_context = local.context
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
module "cert_manager" {
|
module "cert_manager" {
|
||||||
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager"
|
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager"
|
||||||
|
count = var.enable_cert_manager ? 1 : 0
|
||||||
|
|
||||||
helm_config = { version = "v1.8.2" }
|
helm_config = { version = "v1.8.2" }
|
||||||
addon_context = var.addon_context
|
addon_context = var.addon_context
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ variable "addon_context" {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "enable_cert_manager" {
|
||||||
|
type = bool
|
||||||
|
default = true
|
||||||
|
}
|
||||||
|
|
||||||
variable "kubernetes_version" {
|
variable "kubernetes_version" {
|
||||||
type = string
|
type = string
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-6
@@ -15,12 +15,6 @@ variable "aws_region" {
|
|||||||
type = string
|
type = string
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "enable_amazon_eks_adot" {
|
|
||||||
type = bool
|
|
||||||
default = true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
variable "irsa_iam_role_path" {
|
variable "irsa_iam_role_path" {
|
||||||
description = "IAM role path for IRSA roles"
|
description = "IAM role path for IRSA roles"
|
||||||
type = string
|
type = string
|
||||||
@@ -33,6 +27,18 @@ variable "irsa_iam_permissions_boundary" {
|
|||||||
default = ""
|
default = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
variable "enable_amazon_eks_adot" {
|
||||||
|
type = bool
|
||||||
|
default = true
|
||||||
|
}
|
||||||
|
|
||||||
|
variable "enable_cert_manager" {
|
||||||
|
description = "Allow reusing an existing installation of cert-manager"
|
||||||
|
type = bool
|
||||||
|
default = true
|
||||||
|
}
|
||||||
|
|
||||||
variable "tags" {
|
variable "tags" {
|
||||||
description = "Additional tags (e.g. `map('BusinessUnit`,`XYZ`)"
|
description = "Additional tags (e.g. `map('BusinessUnit`,`XYZ`)"
|
||||||
type = map(string)
|
type = map(string)
|
||||||
|
|||||||
Reference in New Issue
Block a user