From 3fae3579e8ecc6505c4f5e71d91383b69ddf9225 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 21:55:57 +0000 Subject: [PATCH 1/6] feat(charts): update helm release kube-prometheus-stack to v56.2.0 (#2558) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 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 f93c4bfd6..cf28ac69b 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -57,7 +57,7 @@ dependencies: version: 2.34.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 56.1.0 + version: 56.2.0 repository: https://prometheus-community.github.io/helm-charts - name: linkerd2-cni version: 30.12.2 From 1db704ac7f8e5f0b5e4c835fad0547a636ad5464 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 11:46:23 +0000 Subject: [PATCH 2/6] fix(charts): update helm release ingress-nginx to v4.9.1 (#2559) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 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 cf28ac69b..93f0cf871 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -39,7 +39,7 @@ dependencies: version: 1.13.3 repository: https://charts.fluxcd.io - name: ingress-nginx - version: 4.9.0 + version: 4.9.1 repository: https://kubernetes.github.io/ingress-nginx - name: k8gb version: v0.12.2 From 8de770366bff8394595ba999837c8cb04b00223f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 18:36:53 +0000 Subject: [PATCH 3/6] feat(charts): update helm release loki to v5.42.0 (#2560) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 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 93f0cf871..1ef50d6e3 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -72,7 +72,7 @@ dependencies: version: 30.12.10 repository: https://helm.linkerd.io/stable - name: loki - version: 5.41.8 + version: 5.42.0 repository: https://grafana.github.io/helm-charts - name: promtail version: 6.15.4 From c1302751097302fe07008a5295adef6bfc08b6c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:58:12 +0000 Subject: [PATCH 4/6] fix(charts): update helm release thanos to v12.22.1 (#2561) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 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 1ef50d6e3..5c522f3be 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -99,7 +99,7 @@ dependencies: version: 2.14.2 repository: https://bitnami-labs.github.io/sealed-secrets - name: thanos - version: 12.22.0 + version: 12.22.1 repository: https://charts.bitnami.com/bitnami - name: tigera-operator version: v3.27.0 From 86003824b234625ac67d2f210b9bfcdb8064e74b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:27:31 +0000 Subject: [PATCH 5/6] fix(charts): update helm release kube-prometheus-stack to v56.2.1 (#2562) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 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 5c522f3be..1488a26ba 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -57,7 +57,7 @@ dependencies: version: 2.34.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 56.2.0 + version: 56.2.1 repository: https://prometheus-community.github.io/helm-charts - name: linkerd2-cni version: 30.12.2 From 7e501f3696c27c0224941f4f6c4634287d9de51b Mon Sep 17 00:00:00 2001 From: Kevin Lefevre Date: Mon, 29 Jan 2024 10:53:42 +0000 Subject: [PATCH 6/6] feat: add support for custom labels and annotations on ingress-nginx (#2563) Signed-off-by: Kevin Lefevre --- .pre-commit-config.yaml | 2 +- ingress-nginx.tf | 11 +++++++++-- modules/aws/ingress-nginx.tf | 11 +++++++++-- modules/google/ingress-nginx.tf | 11 +++++++++-- modules/scaleway/ingress-nginx.tf | 11 +++++++++-- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6ee64157..4cfb6f109 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,6 @@ repos: - id: check-merge-conflict - id: end-of-file-fixer - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 37.152.1 + rev: 37.154.0 hooks: - id: renovate-config-validator diff --git a/ingress-nginx.tf b/ingress-nginx.tf index 56fdf14ce..1e869f340 100644 --- a/ingress-nginx.tf +++ b/ingress-nginx.tf @@ -14,6 +14,8 @@ locals { linkerd-viz-enabled = false linkerd-viz-namespace = "linkerd-viz" allowed_cidrs = ["0.0.0.0/0"] + extra_ns_labels = {} + extra_ns_annotations = {} }, var.ingress-nginx ) @@ -43,10 +45,15 @@ resource "kubernetes_namespace" "ingress-nginx" { count = local.ingress-nginx["enabled"] ? 1 : 0 metadata { - labels = { + labels = merge({ name = local.ingress-nginx["namespace"] "${local.labels_prefix}/component" = "ingress" - } + }, + local.ingress-nginx["extra_ns_labels"]) + + annotations = merge( + local.ingress-nginx["extra_ns_annotations"] + ) name = local.ingress-nginx["namespace"] } diff --git a/modules/aws/ingress-nginx.tf b/modules/aws/ingress-nginx.tf index b0993dd34..dce4ae89f 100644 --- a/modules/aws/ingress-nginx.tf +++ b/modules/aws/ingress-nginx.tf @@ -17,6 +17,8 @@ locals { linkerd-viz-namespace = "linkerd-viz" ingress_cidrs = ["0.0.0.0/0"] allowed_cidrs = ["0.0.0.0/0"] + extra_ns_labels = {} + extra_ns_annotations = {} }, var.ingress-nginx ) @@ -134,10 +136,15 @@ resource "kubernetes_namespace" "ingress-nginx" { count = local.ingress-nginx["enabled"] ? 1 : 0 metadata { - labels = { + labels = merge({ name = local.ingress-nginx["namespace"] "${local.labels_prefix}/component" = "ingress" - } + }, + local.ingress-nginx["extra_ns_labels"]) + + annotations = merge( + local.ingress-nginx["extra_ns_annotations"] + ) name = local.ingress-nginx["namespace"] } diff --git a/modules/google/ingress-nginx.tf b/modules/google/ingress-nginx.tf index 129b46f18..5fe7df90f 100644 --- a/modules/google/ingress-nginx.tf +++ b/modules/google/ingress-nginx.tf @@ -13,6 +13,8 @@ locals { default_network_policy = true ingress_cidrs = ["0.0.0.0/0"] allowed_cidrs = ["0.0.0.0/0"] + extra_ns_labels = {} + extra_ns_annotations = {} }, var.ingress-nginx ) @@ -71,10 +73,15 @@ resource "kubernetes_namespace" "ingress-nginx" { count = local.ingress-nginx["enabled"] ? 1 : 0 metadata { - labels = { + labels = merge({ name = local.ingress-nginx["namespace"] "${local.labels_prefix}/component" = "ingress" - } + }, + local.ingress-nginx["extra_ns_labels"]) + + annotations = merge( + local.ingress-nginx["extra_ns_annotations"] + ) name = local.ingress-nginx["namespace"] } diff --git a/modules/scaleway/ingress-nginx.tf b/modules/scaleway/ingress-nginx.tf index 617b53607..65fe31bb6 100644 --- a/modules/scaleway/ingress-nginx.tf +++ b/modules/scaleway/ingress-nginx.tf @@ -14,6 +14,8 @@ locals { linkerd-viz-namespace = "linkerd-viz" ingress_cidrs = ["0.0.0.0/0"] allowed_cidrs = ["0.0.0.0/0"] + extra_ns_labels = {} + extra_ns_annotations = {} }, var.ingress-nginx ) @@ -51,10 +53,15 @@ resource "kubernetes_namespace" "ingress-nginx" { count = local.ingress-nginx["enabled"] ? 1 : 0 metadata { - labels = { + labels = merge({ name = local.ingress-nginx["namespace"] "${local.labels_prefix}/component" = "ingress" - } + }, + local.ingress-nginx["extra_ns_labels"]) + + annotations = merge( + local.ingress-nginx["extra_ns_annotations"] + ) name = local.ingress-nginx["namespace"] }