bug fixes and added versions in the example

Author: Friz-zy

example/main.tf

@@ -161,4 +161,42 @@ module "eks" {
   enable_openobserve                  = false
   enable_openobserve_collector        = false
   enable_kubernetes_dashboard         = false
+
+
+  # disable versions for install latest one
+  # and then set it from the terraform output
+  # to prevent unplanned upgrades
+
+  eks_addons = {
+    coredns             = {addon_version = "v1.11.1-eksbuild.9"}
+    kube-proxy          = {addon_version = "v1.29.3-eksbuild.2"}
+    vpc-cni             = {addon_version = "v1.18.1-eksbuild.3"}
+    aws-ebs-csi-driver  = {addon_version = "v1.30.0-eksbuild.1"}
+    snapshot-controller = {addon_version = "v7.0.1-eksbuild.1"}
+  }
+
+  aws_efs_csi_driver_config              = {chart_version = "3.0.3"}
+  aws_node_termination_handler_config    = {chart_version = "0.21.0"}
+  cert_manager_config                    = {chart_version = "v1.14.5"}
+  cluster_autoscaler_config              = {chart_version = "9.37.0"}
+  metrics_server_config                  = {chart_version = "3.12.1"}
+  vpa_config                             = {chart_version = "4.4.6"}
+
+  ingress_apisix_chart_version           = "0.14.0"
+  ingress_nginx_chart_version            = "4.10.1"
+  victoriametrics_operator_chart_version = "0.31.2"
+  opentelemetry_operator_chart_version   = "0.58.2"
+  clickhouse_operator_chart_version      = "0.23.5"
+  grafana_operator_chart_version         = "4.2.4"
+  victoriametrics_chart_version          = "0.22.1"
+  victoriametrics_auth_chart_version     = "0.4.12"
+  grafana_chart_version                  = "7.3.11"
+  uptrace_chart_version                  = "1.7.4"
+  uptrace_clickhouse_chart_version       = "6.0.7"
+  uptrace_postgresql_chart_version       = "15.3.3"
+  qryn_chart_version                     = "0.1.1"
+  qryn_clickhouse_chart_version          = "6.0.7"
+  openobserve_chart_name                 = "0.10.5"
+  openobserve_collector_chart_version    = "0.3.6"
+  kubernetes_dashboard_chart_version     = "7.4.0"
 }

main.tf

@@ -433,7 +433,7 @@ module "addons" {
 
   # https://github.com/aws-ia/terraform-aws-eks-blueprints-addons/blob/0e9d6c9b7115ecf0404c377c9c2529bffa56d10d/docs/addons/aws-node-termination-handler.md
   # https://github.com/aws/aws-node-termination-handler/blob/main/config/helm/aws-node-termination-handler/values.yaml
-  enable_aws_node_termination_handler   = var.enable_aws_node_termination_handler
+  enable_aws_node_termination_handler   = var.enable_aws_node_termination_handler && length(local.aws_node_termination_handler_asg_arns) > 0
   aws_node_termination_handler          = local.aws_node_termination_handler_config
   aws_node_termination_handler_sqs      = var.aws_node_termination_handler_sqs
   aws_node_termination_handler_asg_arns = local.aws_node_termination_handler_asg_arns

modules/apisix/outputs.tf

@@ -30,5 +30,5 @@ output "app_version" {
 
 output "apisix_admin_key" {
   description = "The apisix admin key"
-  value       = random_password.apisix_admin_key
+  value       = random_password.apisix_admin_key.result
 }

modules/grafana-operator/main.tf

@@ -7,6 +7,8 @@ locals {
           enabled: true
       grafana:
         enabled: false
+      operator:
+        resourcesPreset: "none"
     EOT
   ]
 }

modules/qryn/main.tf

@@ -56,6 +56,7 @@ locals {
         annotations:
           eks.amazonaws.com/role-arn: ${module.role.iam_role_arn}
         automountServiceAccountToken: true
+      resourcesPreset: "none"
       metrics:
         enabled: true
       zookeeper:

modules/uptrace/main.tf

@@ -160,6 +160,7 @@ locals {
         annotations:
           eks.amazonaws.com/role-arn: ${module.role.iam_role_arn}
         automountServiceAccountToken: true
+      resourcesPreset: "none"
       metrics:
         enabled: true
       zookeeper:
@@ -286,6 +287,8 @@ locals {
         size: 1Gi
       readReplicas:
         replicaCount: 0
+      primary:
+        resourcesPreset: "none"
     EOT
   ]
 }
@@ -647,7 +650,7 @@ module "grafana_operator_datasource" {
             matchLabels:
               dashboards: "grafana"
           datasource:
-            name: "Uptrace-${var.namespace}"
+            name: "Uptrace-1-${var.namespace}"
             type: prometheus
             access: proxy
             url: "http://${module.uptrace.chart}.${module.uptrace.namespace}.svc:14318/api/prometheus"
@@ -674,7 +677,7 @@ module "grafana_operator_datasource" {
             matchLabels:
               dashboards: "grafana"
           datasource:
-            name: "Uptrace-Tempo-${var.namespace}"
+            name: "Uptrace-1-${var.namespace}-Tempo"
             type: tempo
             access: proxy
             url: "http://${module.uptrace.chart}.${module.uptrace.namespace}.svc:14318/api/tempo"
@@ -701,7 +704,7 @@ module "grafana_operator_datasource" {
             matchLabels:
               dashboards: "grafana"
           datasource:
-            name: "Uptrace-Monitoring-${var.namespace}"
+            name: "Uptrace-2-${var.namespace}"
             type: prometheus
             access: proxy
             url: "http://${module.uptrace.chart}.${module.uptrace.namespace}.svc:14318/api/prometheus"
@@ -728,7 +731,7 @@ module "grafana_operator_datasource" {
             matchLabels:
               dashboards: "grafana"
           datasource:
-            name: "Uptrace-Monitoring-Tempo-${var.namespace}"
+            name: "Uptrace-2-${var.namespace}-Tempo"
             type: tempo
             access: proxy
             url: "http://${module.uptrace.chart}.${module.uptrace.namespace}.svc:14318/api/tempo"

variables.tf

@@ -127,7 +127,7 @@ variable "group_defaults" {
 
     # Needed by the aws-ebs-csi-driver
     iam_role_additional_policies = {
-      # AmazonEBSCSIDriverPolicy = "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy"
+      AmazonEBSCSIDriverPolicy = "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy"
       AmazonSSMManagedInstanceCore = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
     }