Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiFleKs committed Jan 29, 2024
2 parents c40cdee + 7e501f3 commit 1e99ec9
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.1
repository: https://prometheus-community.github.io/helm-charts
- name: linkerd2-cni
version: 30.12.2
Expand All @@ -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
Expand All @@ -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
Expand Down
11 changes: 9 additions & 2 deletions ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"]
}
Expand Down
11 changes: 9 additions & 2 deletions modules/aws/ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"]
}
Expand Down
11 changes: 9 additions & 2 deletions modules/google/ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"]
}
Expand Down
11 changes: 9 additions & 2 deletions modules/scaleway/ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"]
}
Expand Down

0 comments on commit 1e99ec9

Please sign in to comment.