From 897240ce9849bebe35d9a44c960bcc15b7dcee34 Mon Sep 17 00:00:00 2001 From: Romain Guichard Date: Wed, 11 Jan 2023 15:32:22 +0100 Subject: [PATCH 01/22] feat: update semantic-release plugin version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index daddb4660..c808cbf1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 - name: Semantic Release - uses: cycjimmy/semantic-release-action@v2 + uses: cycjimmy/semantic-release-action@v3 with: branches: | [ From 5fae94d7cd69baec49131bee6a1b950aa33c806f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 16:37:22 +0000 Subject: [PATCH 02/22] feat(charts): update helm release kube-prometheus-stack to v43.3.0 (#1717) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 33c61874d..edb961b89 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -63,7 +63,7 @@ dependencies: version: 2.14.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 43.2.1 + version: 43.3.0 repository: https://prometheus-community.github.io/helm-charts - name: kyverno version: 2.6.5 From 9aa9ad3a2df4c6d7917165455a848aaab734cee1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:51:15 +0000 Subject: [PATCH 03/22] feat(charts): update helm release cert-manager to v1.11.0 (#1718) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index edb961b89..948c3adba 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -27,7 +27,7 @@ dependencies: version: 0.3.11 repository: https://aws.github.io/eks-charts - name: cert-manager - version: v1.10.2 + version: v1.11.0 repository: https://charts.jetstack.io - name: cert-manager-csi-driver version: v0.5.0 From df552ad44cd77867aa08e15e0a126c038735c19c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:54:23 +0000 Subject: [PATCH 04/22] feat(charts): update helm release loki to v3.9.0 (#1719) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 948c3adba..d1d173542 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -84,7 +84,7 @@ dependencies: version: 2.8.9 repository: https://grafana.github.io/helm-charts - name: loki - version: 3.8.2 + version: 3.9.0 repository: https://grafana.github.io/helm-charts - name: promtail version: 6.8.1 From 35c5b67144c35f1bc6b07504be7b683cba3513be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:27:33 +0000 Subject: [PATCH 05/22] feat(charts): update helm release loki to v3.10.0 (#1720) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index d1d173542..247f14fa5 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -84,7 +84,7 @@ dependencies: version: 2.8.9 repository: https://grafana.github.io/helm-charts - name: loki - version: 3.9.0 + version: 3.10.0 repository: https://grafana.github.io/helm-charts - name: promtail version: 6.8.1 From 09c4b223aa6f6082895b33cd77ad1ba62c32530f Mon Sep 17 00:00:00 2001 From: Eugen Olteanu Date: Thu, 12 Jan 2023 11:27:32 +0200 Subject: [PATCH 06/22] fix: decouple canary from self-monitoring (#1721) Signed-off-by: Eugen Olteanu Signed-off-by: Eugen Olteanu --- modules/aws/loki-stack.tf | 4 ++-- modules/scaleway/loki-stack.tf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/aws/loki-stack.tf b/modules/aws/loki-stack.tf index 8ab414a97..85685bc72 100644 --- a/modules/aws/loki-stack.tf +++ b/modules/aws/loki-stack.tf @@ -29,12 +29,12 @@ locals { test: enabled: false monitoring: + lokiCanary: + enabled: false selfMonitoring: enabled: false grafanaAgent: installOperator: false - lokiCanary: - enabled: false serviceMonitor: enabled: ${local.kube-prometheus-stack["enabled"] || local.victoria-metrics-k8s-stack["enabled"]} priorityClassName: ${local.priority-class["create"] ? kubernetes_priority_class.kubernetes_addons[0].metadata[0].name : ""} diff --git a/modules/scaleway/loki-stack.tf b/modules/scaleway/loki-stack.tf index 897b9b18c..7ce34e826 100644 --- a/modules/scaleway/loki-stack.tf +++ b/modules/scaleway/loki-stack.tf @@ -25,12 +25,12 @@ locals { global dnsService: coredns monitoring: + lokiCanary: + enabled: false selfMonitoring: enabled: false grafanaAgent: installOperator: false - lokiCanary: - enabled: false serviceMonitor: enabled: ${local.kube-prometheus-stack["enabled"] || local.victoria-metrics-k8s-stack["enabled"]} priorityClassName: ${local.priority-class["create"] ? kubernetes_priority_class.kubernetes_addons[0].metadata[0].name : ""} From ccf07299aea0c601e23af8ab3517f5cfb3b8d399 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 19:22:22 +0000 Subject: [PATCH 07/22] fix(charts): update helm release kube-prometheus-stack to v43.3.1 (#1722) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 247f14fa5..745ce6edc 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -63,7 +63,7 @@ dependencies: version: 2.14.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 43.3.0 + version: 43.3.1 repository: https://prometheus-community.github.io/helm-charts - name: kyverno version: 2.6.5 From c8919a2a87744b555defbf4fecf758013a8cc62b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:08:12 +0000 Subject: [PATCH 08/22] fix(charts): update helm release aws-ebs-csi-driver to v2.15.1 (#1723) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 745ce6edc..fe9655c67 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -9,7 +9,7 @@ dependencies: version: 1.3.0 repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts - name: aws-ebs-csi-driver - version: 2.15.0 + version: 2.15.1 repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: aws-efs-csi-driver version: 2.3.6 From 16a8eb8743982a258d974f8b137f947b23adbaa7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 02:52:00 +0000 Subject: [PATCH 09/22] fix(charts): update helm release aws-load-balancer-controller to v1.4.7 (#1724) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index fe9655c67..151bb8e48 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -18,7 +18,7 @@ dependencies: version: 0.1.22 repository: https://aws.github.io/eks-charts - name: aws-load-balancer-controller - version: 1.4.6 + version: 1.4.7 repository: https://aws.github.io/eks-charts - name: aws-node-termination-handler version: 0.20.2 From 8593548d1f31aa3bde02031ace252fcb3c4eeeac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 21:16:39 +0000 Subject: [PATCH 10/22] feat(charts): update helm release tigera-operator to v3.25.0 (#1725) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 151bb8e48..946904f97 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -120,7 +120,7 @@ dependencies: version: 11.6.8 repository: https://charts.bitnami.com/bitnami - name: tigera-operator - version: v3.24.5 + version: v3.25.0 repository: https://docs.projectcalico.org/charts - name: traefik version: 20.8.0 From 65bb5bdc0bd68f352382e354713650ba2e31f186 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Jan 2023 00:48:09 +0000 Subject: [PATCH 11/22] feat(charts): update helm release aws-ebs-csi-driver to v2.16.0 (#1726) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 946904f97..c926c8956 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -9,7 +9,7 @@ dependencies: version: 1.3.0 repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts - name: aws-ebs-csi-driver - version: 2.15.1 + version: 2.16.0 repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: aws-efs-csi-driver version: 2.3.6 From 2a6d89c01d8437eaa459ec8688ffc66523d1472f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 19:28:40 +0000 Subject: [PATCH 12/22] fix(charts): update helm release sealed-secrets to v2.7.3 (#1728) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index c926c8956..17c3f3b22 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -111,7 +111,7 @@ dependencies: version: v0.0.1 repository: https://particuleio.github.io/charts - name: sealed-secrets - version: 2.7.2 + version: 2.7.3 repository: https://bitnami-labs.github.io/sealed-secrets - name: strimzi-kafka-operator version: 0.32.0 From e4682ba33041f528945400dce993ae58cd44c8ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 19:31:45 +0000 Subject: [PATCH 13/22] fix(charts): update helm release victoria-metrics-k8s-stack to v0.14.4 (#1729) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 17c3f3b22..88f0a2fd1 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -135,5 +135,5 @@ dependencies: version: 3.1.0 repository: https://vmware-tanzu.github.io/helm-charts - name: victoria-metrics-k8s-stack - version: 0.14.3 + version: 0.14.4 repository: https://victoriametrics.github.io/helm-charts/ From 09bf32a27b87977a3935841a03228f1652967adb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 23:25:02 +0000 Subject: [PATCH 14/22] fix(charts): update helm release keda to v2.9.3 (#1730) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 88f0a2fd1..9cb69b333 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -54,7 +54,7 @@ dependencies: version: 1.7.2 repository: https://charts.helm.sh/stable - name: keda - version: 2.9.1 + version: 2.9.3 repository: https://kedacore.github.io/charts - name: keycloak version: 18.4.0 From c8062d4d3bea491452e5381b6f815fa98e12a33c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 03:58:40 +0000 Subject: [PATCH 15/22] fix(charts): update helm release aws-node-termination-handler to v0.20.3 (#1731) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 9cb69b333..ce4b965fa 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -21,7 +21,7 @@ dependencies: version: 1.4.7 repository: https://aws.github.io/eks-charts - name: aws-node-termination-handler - version: 0.20.2 + version: 0.20.3 repository: https://aws.github.io/eks-charts - name: aws-calico version: 0.3.11 From 09131c47405cd725fa3fd4b985e158fd5f21e45a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 23:40:36 +0000 Subject: [PATCH 16/22] fix(charts): update helm release victoria-metrics-k8s-stack to v0.14.5 (#1733) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index ce4b965fa..9e5d5b955 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -135,5 +135,5 @@ dependencies: version: 3.1.0 repository: https://vmware-tanzu.github.io/helm-charts - name: victoria-metrics-k8s-stack - version: 0.14.4 + version: 0.14.5 repository: https://victoriametrics.github.io/helm-charts/ From 3dfebd1e2b70b5b35bfacbb54fc4ebeb6078983e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:30:13 +0000 Subject: [PATCH 17/22] feat(charts): update helm release prometheus-adapter to v4 (#1712) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 9e5d5b955..b0dd8e4ea 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -96,7 +96,7 @@ dependencies: version: 2.3.2 repository: https://charts.deliveryhero.io/ - name: prometheus-adapter - version: 3.5.0 + version: 4.0.1 repository: https://prometheus-community.github.io/helm-charts - name: prometheus-cloudwatch-exporter version: 0.22.0 From c4b9341812c7b87ceb545a0732a43507a77f5866 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:32:49 +0000 Subject: [PATCH 18/22] feat(charts): update helm release thanos to v12 (#1734) Signed-off-by: Renovate Bot Signed-off-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index b0dd8e4ea..830e5abe1 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -117,7 +117,7 @@ dependencies: version: 0.32.0 repository: https://strimzi.io/charts/ - name: thanos - version: 11.6.8 + version: 12.0.0 repository: https://charts.bitnami.com/bitnami - name: tigera-operator version: v3.25.0 From 4fa9b6c4973a178f10f4bfba64d7f69682f82105 Mon Sep 17 00:00:00 2001 From: Kevin Lefevre Date: Fri, 20 Jan 2023 12:23:00 +0100 Subject: [PATCH 19/22] feat: ignore annotations and labels on prometheus namespace Signed-off-by: Kevin Lefevre --- kube-prometheus.tf | 7 +++++++ modules/aws/kube-prometheus.tf | 7 +++++++ modules/scaleway/kube-prometheus.tf | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/kube-prometheus.tf b/kube-prometheus.tf index 18144fe6a..e3d69b17e 100644 --- a/kube-prometheus.tf +++ b/kube-prometheus.tf @@ -103,6 +103,13 @@ resource "kubernetes_namespace" "kube-prometheus-stack" { name = local.kube-prometheus-stack["namespace"] } + + lifecycle { + ignore_changes = [ + metadata[0].annotations, + metadata[0].labels, + ] + } } resource "random_string" "grafana_password" { diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf index 4f07200dc..e2dc880c2 100644 --- a/modules/aws/kube-prometheus.tf +++ b/modules/aws/kube-prometheus.tf @@ -432,6 +432,13 @@ resource "kubernetes_namespace" "kube-prometheus-stack" { name = local.kube-prometheus-stack["namespace"] } + + lifecycle { + ignore_changes = [ + metadata[0].annotations, + metadata[0].labels, + ] + } } resource "random_string" "grafana_password" { diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf index a9272860d..a780010fa 100644 --- a/modules/scaleway/kube-prometheus.tf +++ b/modules/scaleway/kube-prometheus.tf @@ -272,6 +272,13 @@ resource "kubernetes_namespace" "kube-prometheus-stack" { name = local.kube-prometheus-stack["namespace"] } + + lifecycle { + ignore_changes = [ + metadata[0].annotations, + metadata[0].labels, + ] + } } resource "scaleway_object_bucket" "kube-prometheus-stack_thanos_bucket" { From 5fd8483190f7c6e210fa16c0dcd4fdd15e24d741 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:30:41 +0000 Subject: [PATCH 20/22] feat(charts): update helm release loki to v4 Signed-off-by: Renovate Bot --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 830e5abe1..cfc765e70 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -84,7 +84,7 @@ dependencies: version: 2.8.9 repository: https://grafana.github.io/helm-charts - name: loki - version: 3.10.0 + version: 4.4.0 repository: https://grafana.github.io/helm-charts - name: promtail version: 6.8.1 From f495f07eaeb8938dff530c9b9c9246fe34cd7214 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:30:36 +0000 Subject: [PATCH 21/22] feat(charts): update helm release kube-prometheus-stack to v44 Signed-off-by: Renovate Bot --- helm-dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index cfc765e70..593d3d2ef 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -63,7 +63,7 @@ dependencies: version: 2.14.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 43.3.1 + version: 44.2.1 repository: https://prometheus-community.github.io/helm-charts - name: kyverno version: 2.6.5 From 88d2838c16983fbe3b6ab5304edadce1fad8886d Mon Sep 17 00:00:00 2001 From: Kevin Lefevre Date: Fri, 20 Jan 2023 13:03:56 +0100 Subject: [PATCH 22/22] fix: prometheus operator CRDs url BREAKING CHANGE: * upstream chart add a `v` in AppVersion which breaks compatibility, this module is compatible with kube-prometheus-stake charts >= 44.2.1 Signed-off-by: Kevin Lefevre --- kube-prometheus-crd.tf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kube-prometheus-crd.tf b/kube-prometheus-crd.tf index 35c2456c7..80d7a3fd3 100644 --- a/kube-prometheus-crd.tf +++ b/kube-prometheus-crd.tf @@ -3,14 +3,14 @@ locals { prometheus-operator_crd_version = (local.victoria-metrics-k8s-stack.enabled && local.victoria-metrics-k8s-stack.install_prometheus_operator_crds) || (local.kube-prometheus-stack.enabled && local.kube-prometheus-stack.manage_crds) ? yamldecode(data.http.prometheus-operator_version.0.response_body).appVersion : "" prometheus-operator_crds = [ - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml", - "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml" + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml", + "https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${local.prometheus-operator_crd_version}/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml" ] prometheus-operator_chart = "https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-${local.kube-prometheus-stack.chart_version}/charts/kube-prometheus-stack/Chart.yaml"