Merge pull request #417 from mojaloop/monitoring-chart-repo

fix: configurable chart repository for grafana, prometheus, tempo, loki
mojaloop · Dec 2, 2024 · b4777cf · b4777cf
2 parents 342b8a0 + ffcaa7d
commit b4777cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl
@@ -19,25 +19,25 @@ helmCharts:
 - name: kube-prometheus
   releaseName: ${prometheus_operator_release_name}
   version: ${prometheus_operator_version}
-  repo: oci://registry-1.docker.io/bitnamicharts
+  repo: ${prometheus_operator_repo}
   valuesFile: values-prom-operator.yaml
   namespace: ${monitoring_namespace}
 - name: grafana-operator
   releaseName: grafana
   version: ${grafana_operator_version}
-  repo: oci://registry-1.docker.io/bitnamicharts
+  repo: ${grafana_operator_repo}
   valuesFile: values-grafana-operator.yaml
   namespace: ${monitoring_namespace}
 - name: grafana-loki
   releaseName: ${loki_release_name}
   version: ${loki_chart_version}
-  repo: oci://registry-1.docker.io/bitnamicharts
+  repo: ${loki_repo}
   valuesFile: values-loki.yaml
   namespace: ${monitoring_namespace}
 - name: grafana-tempo
   releaseName: tempo
   version: ${tempo_chart_version}
-  repo: oci://registry-1.docker.io/bitnamicharts
+  repo: ${tempo_repo}
   valuesFile: values-tempo.yaml
   namespace: ${monitoring_namespace}
 - name: opentelemetry-operator
@@ -51,4 +51,4 @@ helmCharts:
   version: ${prometheus_process_exporter_version}
   repo: https://raw.githubusercontent.com/mumoshu/prometheus-process-exporter/master/docs
   valuesFile: values-process-exporter.yaml
-  namespace: ${monitoring_namespace}    
+  namespace: ${monitoring_namespace}
diff --git a/terraform/gitops/k8s-cluster-config/monitoring.tf b/terraform/gitops/k8s-cluster-config/monitoring.tf
@@ -3,14 +3,18 @@ module "generate_monitoring_files" {
   var_map = {
     grafana_crd_version_tag                = try(var.common_var_map.grafana_crd_version_tag, local.grafana_crd_version_tag)
     prometheus_crd_version                 = try(var.common_var_map.prometheus_crd_version, local.prometheus_crd_version)
+    loki_repo                              = try(var.common_var_map.loki_repo, local.bitnami_repo)
     loki_chart_version                     = try(var.common_var_map.loki_chart_version, local.loki_chart_version)
+    prometheus_operator_repo               = try(var.common_var_map.prometheus_operator_repo, local.bitnami_repo)
     prometheus_operator_version            = try(var.common_var_map.prometheus_operator_version, local.prometheus_operator_version)
     prometheus_operator_release_name       = local.prometheus_operator_release_name
     prometheus_process_exporter_version    = try(var.common_var_map.prometheus_process_exporter_version, local.prometheus_process_exporter_version)
     loki_release_name                      = local.loki_release_name
+    grafana_operator_repo                  = try(var.common_var_map.grafana_operator_repo, local.bitnami_repo)
     grafana_operator_version               = try(var.common_var_map.grafana_operator_version, local.grafana_operator_version)
     grafana_version                        = try(var.common_var_map.grafana_version, local.grafana_version)
     grafana_dashboard_tag                  = try(var.common_var_map.grafana_dashboard_tag, local.grafana_dashboard_tag)
+    tempo_repo                             = try(var.common_var_map.tempo_repo, local.bitnami_repo)
     tempo_chart_version                    = try(var.common_var_map.tempo_chart_version, local.tempo_chart_version)
     opentelemetry_chart_version         = try(var.common_var_map.opentelemetry_chart_version, local.opentelemetry_chart_version)
     monitoring_namespace                   = var.monitoring_namespace
@@ -125,6 +129,7 @@ variable "monitoring_namespace" {
 }
 
 locals {
+  bitnami_repo                        = "oci://registry-1.docker.io/bitnamicharts"
   grafana_crd_version_tag             = "v5.6.0"
   prometheus_crd_version              = "8.0.1"
   opentelemetry_chart_version         = "0.56.0"