storytold/terraform-aws-observability-accelerator
2
0
Fork 0
mirror of https://github.com/storytold/terraform-aws-observability-accelerator.git synced 2026-10-19 07:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes

Browse Source
This commit is contained in:
Rodrigue Koffi
2022-09-03 16:21:15 +02:00
parent 075780a160
commit b2e631140c
6 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/workloads/infra/main.tf
+17 -16
View File
@@ -9,15 +9,15 @@ terraform {
resource "helm_release" "kube_state_metrics" {
count = var.enable_kube_state_metrics ? 1 : 0
chart = var.config.ksm_helm_chart_name
create_namespace = var.config.kms_create_namespace
namespace = var.config.ksm_k8s_namespace
name = var.config.ksm_helm_release_name
version = var.config.ksm_helm_chart_version
repository = var.config.ksm_helm_repo_url
chart = var.ksm_config.helm_chart_name
create_namespace = var.ksm_config.create_namespace
namespace = var.ksm_config.k8s_namespace
name = var.ksm_config.helm_release_name
version = var.ksm_config.helm_chart_version
repository = var.ksm_config.helm_repo_url
dynamic "set" {
for_each = var.config.ksm_helm_settings
for_each = var.ksm_config.helm_settings
content {
name = set.key
value = set.value
@@ -27,15 +27,15 @@ resource "helm_release" "kube_state_metrics" {
resource "helm_release" "prometheus_node_exporter" {
count = var.enable_node_exporter ? 1 : 0
chart = var.config.ne_helm_chart_name
create_namespace = var.config.ne_create_namespace
namespace = var.config.ne_k8s_namespace
name = var.config.ne_helm_release_name
version = var.config.ne_helm_chart_version
repository = var.config.ne_helm_repo_url
chart = var.ne_config.helm_chart_name
create_namespace = var.ne_config.create_namespace
namespace = var.ne_config.k8s_namespace
name = var.ne_config.helm_release_name
version = var.ne_config.helm_chart_version
repository = var.ne_config.helm_repo_url
dynamic "set" {
for_each = var.config.ne_helm_settings
for_each = var.ne_config.helm_settings
content {
name = set.key
value = set.value
@@ -46,6 +46,8 @@ resource "helm_release" "prometheus_node_exporter" {
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon"
count = 1
helm_config = merge(
{
name = local.name
@@ -90,14 +92,13 @@ module "helm_addon" {
name = "ekscluster"
value = local.context.eks_cluster_id
},
]
irsa_config = {
create_kubernetes_namespace = true
kubernetes_namespace = local.namespace
create_kubernetes_service_account = true
kubernetes_service_account = try(var.config.helm_config.service_account, local.name)
kubernetes_service_account = try(var.helm_config.service_account, local.name)
irsa_iam_policies = ["arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonPrometheusRemoteWriteAccess"]
}