diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 5d4756d48..3ab7a6b73 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -57,7 +57,7 @@ dependencies: version: 2.39.3 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 61.3.1 + version: 61.3.2 repository: https://prometheus-community.github.io/helm-charts - name: linkerd2-cni version: 30.12.2 @@ -120,5 +120,5 @@ dependencies: version: 0.14.0 repository: https://nerdswords.github.io/yet-another-cloudwatch-exporter - name: reloader - version: 1.0.116 + version: 1.0.119 repository: https://stakater.github.io/stakater-charts diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf index ac1ba6d95..1a01451c4 100644 --- a/modules/aws/kube-prometheus.tf +++ b/modules/aws/kube-prometheus.tf @@ -19,7 +19,7 @@ locals { thanos_bucket = "thanos-store-${var.cluster-name}" thanos_bucket_force_destroy = false thanos_store_config = null - thanos_version = "v0.34.1" + thanos_version = "v0.35.1" enabled = false allowed_cidrs = ["0.0.0.0/0"] default_network_policy = true diff --git a/modules/google/kube-prometheus.tf b/modules/google/kube-prometheus.tf index adeeb5970..810c3e937 100644 --- a/modules/google/kube-prometheus.tf +++ b/modules/google/kube-prometheus.tf @@ -22,7 +22,7 @@ locals { thanos_bucket_location = "" thanos_kms_bucket_location = "" thanos_store_config = null - thanos_version = "v0.34.1" + thanos_version = "v0.35.1" thanos_service_account = "" enabled = false allowed_cidrs = ["0.0.0.0/0"] diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf index 639c80e69..6846e01d8 100644 --- a/modules/scaleway/kube-prometheus.tf +++ b/modules/scaleway/kube-prometheus.tf @@ -13,7 +13,7 @@ locals { thanos_bucket = "thanos-store-${var.cluster-name}" thanos_bucket_region = local.scaleway["region"] thanos_store_config = null - thanos_version = "v0.34.1" + thanos_version = "v0.35.1" enabled = false allowed_cidrs = ["0.0.0.0/0"] default_network_policy = true diff --git a/modules/scaleway/templates/cert-manager-cluster-issuers.yaml.tpl b/modules/scaleway/templates/cert-manager-cluster-issuers.yaml.tpl index 5b6ab5031..c8f3a9d95 100644 --- a/modules/scaleway/templates/cert-manager-cluster-issuers.yaml.tpl +++ b/modules/scaleway/templates/cert-manager-cluster-issuers.yaml.tpl @@ -13,17 +13,25 @@ spec: %{ if acme_dns01_enabled } %{ if acme_dns01_provider == "route53" } - dns01: - route53: - hostedZoneID: ${acme_dns01_hosted_zone_id} - %{ if acme_dns01_region != "" } - region: '${acme_dns01_region}' - %{ endif } - accessKeyIDSecretRef: - name: ${acme_dns01_aws_secret} - key: ${acme_dns01_aws_access_key_id} - secretAccessKeySecretRef: - name: ${acme_dns01_aws_secret} - key: ${acme_dns01_aws_access_key_secret} + route53: + hostedZoneID: ${acme_dns01_hosted_zone_id} + %{ if acme_dns01_region != "" } + region: '${acme_dns01_region}' + %{ endif } + accessKeyIDSecretRef: + name: ${acme_dns01_aws_secret} + key: ${acme_dns01_aws_access_key_id} + secretAccessKeySecretRef: + name: ${acme_dns01_aws_secret} + key: ${acme_dns01_aws_access_key_secret} + %{ else } + %{if acme_dns01_provider == "google" } + - dns01: + clouddns: + project: '${acme_dns01_google_project}' + serviceAccountSecretRef: + name: '${acme_dns01_google_secret}' + key: '${acme_dns01_google_service_account_key}' %{ else } - dns01: webhook: @@ -38,6 +46,7 @@ spec: name: '${secret_name}' %{ endif } %{ endif } + %{ endif } %{ if acme_http01_enabled } - http01: ingress: