Merge branch 'main' into release

particuleio · Oct 10, 2022 · 23c72f1 · 23c72f1
2 parents e79ca57 + 4319014
commit 23c72f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -123,7 +123,7 @@ dependencies:
     version: v3.24.1
     repository: https://docs.projectcalico.org/charts
   - name: traefik
-    version: 12.0.4
+    version: 12.0.7
     repository: https://helm.traefik.io/traefik
   - name: memcached
     version: 6.2.6

diff --git a/modules/aws/README.md b/modules/aws/README.md
@@ -444,7 +444,8 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
 
 | Name | Description |
 |------|-------------|
-| <a name="output_grafana_password"></a> [grafana\_password](#output\_grafana\_password) | n/a |
+| <a name="output_kube-prometheus-stack"></a> [kube-prometheus-stack](#output\_kube-prometheus-stack) | n/a |
+| <a name="output_kube-prometheus-stack_sensitive"></a> [kube-prometheus-stack\_sensitive](#output\_kube-prometheus-stack\_sensitive) | n/a |
 | <a name="output_loki-stack-ca"></a> [loki-stack-ca](#output\_loki-stack-ca) | n/a |
 | <a name="output_promtail-cert"></a> [promtail-cert](#output\_promtail-cert) | n/a |
 | <a name="output_promtail-key"></a> [promtail-key](#output\_promtail-key) | n/a |

diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf
@@ -587,7 +587,16 @@ resource "kubernetes_network_policy" "kube-prometheus-stack_allow_control_plane"
   }
 }
 
-output "grafana_password" {
-  value     = element(concat(random_string.grafana_password.*.result, [""]), 0)
+output "kube-prometheus-stack" {
+  value = {
+    iam_assumable_role_kube-prometheus-stack_grafana = module.iam_assumable_role_kube-prometheus-stack_grafana
+    iam_assumable_role_kube-prometheus-stack_thanos  = module.iam_assumable_role_kube-prometheus-stack_thanos
+  }
+}
+
+output "kube-prometheus-stack_sensitive" {
+  value = {
+    grafana_password = element(concat(random_string.grafana_password.*.result, [""]), 0)
+  }
   sensitive = true
 }