fix: Complete-k8s output & add try to prometheus policy element index (…

…aws-ia#1195) Co-authored-by: Apoorva Kulkarni <kuapoorv@amazon.com>
allamand · Jan 10, 2023 · 03aa4ef · 03aa4ef
1 parent 1dac858
commit 03aa4ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/examples/complete-kubernetes-addons/main.tf b/examples/complete-kubernetes-addons/main.tf
@@ -128,6 +128,7 @@ module "eks_blueprints_kubernetes_addons" {
   amazon_prometheus_workspace_endpoint = module.managed_prometheus.workspace_prometheus_endpoint
 
   enable_aws_for_fluentbit                 = true
+  aws_for_fluentbit_create_cw_log_group    = false
   aws_for_fluentbit_cw_log_group_retention = 30
   aws_for_fluentbit_helm_config = {
     create_namespace = true

diff --git a/examples/complete-kubernetes-addons/outputs.tf b/examples/complete-kubernetes-addons/outputs.tf
@@ -15,5 +15,5 @@ output "kyverno_addon" {
 
 output "kyverno_values" {
   description = "Values used in the Kyverno Helm release"
-  value       = jsondecode(module.eks_blueprints_kubernetes_addons.kyverno.release_metadata[0].values)
+  value       = try(jsondecode(module.eks_blueprints_kubernetes_addons.kyverno.release_metadata[0].values), null)
 }
diff --git a/modules/kubernetes-addons/prometheus/main.tf b/modules/kubernetes-addons/prometheus/main.tf
@@ -109,7 +109,7 @@ module "irsa_amp_ingest" {
   kubernetes_namespace        = local.namespace
 
   kubernetes_service_account    = local.ingest_service_account
-  irsa_iam_policies             = [aws_iam_policy.ingest[0].arn]
+  irsa_iam_policies             = [try(aws_iam_policy.ingest[0].arn, "")]
   irsa_iam_role_path            = var.addon_context.irsa_iam_role_path
   irsa_iam_permissions_boundary = var.addon_context.irsa_iam_permissions_boundary
   eks_cluster_id                = var.addon_context.eks_cluster_id