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 May 29, 2024
2 parents 2568e84 + 4db48e0 commit 3247199
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 32 deletions.
28 changes: 14 additions & 14 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ dependencies:
version: 1.4.3
repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts
- name: aws-ebs-csi-driver
version: 2.30.0
version: 2.31.0
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
- name: aws-efs-csi-driver
version: 3.0.3
repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
- name: aws-for-fluent-bit
version: 0.1.32
version: 0.1.33
repository: https://aws.github.io/eks-charts
- name: aws-load-balancer-controller
version: 1.7.2
version: 1.8.0
repository: https://aws.github.io/eks-charts
- name: aws-node-termination-handler
version: 0.21.0
Expand All @@ -27,7 +27,7 @@ dependencies:
version: v1.14.5
repository: https://charts.jetstack.io
- name: cert-manager-csi-driver
version: v0.8.0
version: v0.8.1
repository: https://charts.jetstack.io
- name: cluster-autoscaler
version: 9.37.0
Expand All @@ -48,7 +48,7 @@ dependencies:
version: 1.7.2
repository: https://charts.helm.sh/stable
- name: karpenter
version: 0.36.1
version: 0.37.0
repository: oci://public.ecr.aws/karpenter
- name: keda
version: 2.14.2
Expand All @@ -57,7 +57,7 @@ dependencies:
version: 2.38.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 58.5.0
version: 59.0.0
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.11
repository: https://helm.linkerd.io/stable
- name: loki
version: 6.5.2
version: 6.6.2
repository: https://grafana.github.io/helm-charts
- name: promtail
version: 6.15.5
Expand All @@ -90,31 +90,31 @@ dependencies:
version: 0.25.3
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-blackbox-exporter
version: 8.16.0
version: 8.17.0
repository: https://prometheus-community.github.io/helm-charts
- name: scaleway-webhook
version: v0.0.1
repository: https://particuleio.github.io/charts
- name: sealed-secrets
version: 2.15.3
version: 2.15.4
repository: https://bitnami-labs.github.io/sealed-secrets
- name: thanos
version: 15.4.4
version: 15.5.1
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.28.0
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 28.0.0
version: 28.1.0
repository: https://helm.traefik.io/traefik
- name: memcached
version: 7.0.5
version: 7.4.1
repository: https://charts.bitnami.com/bitnami
- name: velero
version: 6.0.0
version: 6.5.0
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.22.0
version: 0.22.1
repository: https://victoriametrics.github.io/helm-charts/
- name: yet-another-cloudwatch-exporter
version: 0.14.0
Expand Down
18 changes: 9 additions & 9 deletions modules/google/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ Provides various Kubernetes addons that are often used on Kubernetes with GCP

| Name | Source | Version |
|------|--------|---------|
| <a name="module_cert_manager_workload_identity"></a> [cert\_manager\_workload\_identity](#module\_cert\_manager\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.3.0 |
| <a name="module_external_dns_workload_identity"></a> [external\_dns\_workload\_identity](#module\_external\_dns\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.3.0 |
| <a name="module_iam_assumable_sa_kube-prometheus-stack_grafana"></a> [iam\_assumable\_sa\_kube-prometheus-stack\_grafana](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_grafana) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_kube-prometheus-stack_thanos"></a> [iam\_assumable\_sa\_kube-prometheus-stack\_thanos](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_loki-stack"></a> [iam\_assumable\_sa\_loki-stack](#module\_iam\_assumable\_sa\_loki-stack) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_thanos"></a> [iam\_assumable\_sa\_thanos](#module\_iam\_assumable\_sa\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_thanos-compactor"></a> [iam\_assumable\_sa\_thanos-compactor](#module\_iam\_assumable\_sa\_thanos-compactor) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_thanos-sg"></a> [iam\_assumable\_sa\_thanos-sg](#module\_iam\_assumable\_sa\_thanos-sg) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_iam_assumable_sa_thanos-storegateway"></a> [iam\_assumable\_sa\_thanos-storegateway](#module\_iam\_assumable\_sa\_thanos-storegateway) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 |
| <a name="module_cert_manager_workload_identity"></a> [cert\_manager\_workload\_identity](#module\_cert\_manager\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0.0 |
| <a name="module_external_dns_workload_identity"></a> [external\_dns\_workload\_identity](#module\_external\_dns\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0.0 |
| <a name="module_iam_assumable_sa_kube-prometheus-stack_grafana"></a> [iam\_assumable\_sa\_kube-prometheus-stack\_grafana](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_grafana) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_kube-prometheus-stack_thanos"></a> [iam\_assumable\_sa\_kube-prometheus-stack\_thanos](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_loki-stack"></a> [iam\_assumable\_sa\_loki-stack](#module\_iam\_assumable\_sa\_loki-stack) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_thanos"></a> [iam\_assumable\_sa\_thanos](#module\_iam\_assumable\_sa\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_thanos-compactor"></a> [iam\_assumable\_sa\_thanos-compactor](#module\_iam\_assumable\_sa\_thanos-compactor) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_thanos-sg"></a> [iam\_assumable\_sa\_thanos-sg](#module\_iam\_assumable\_sa\_thanos-sg) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_iam_assumable_sa_thanos-storegateway"></a> [iam\_assumable\_sa\_thanos-storegateway](#module\_iam\_assumable\_sa\_thanos-storegateway) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 31.0 |
| <a name="module_kube-prometheus-stack_grafana-iam-member"></a> [kube-prometheus-stack\_grafana-iam-member](#module\_kube-prometheus-stack\_grafana-iam-member) | terraform-google-modules/iam/google//modules/member_iam | ~> 7.6 |
| <a name="module_kube-prometheus-stack_kube-prometheus-stack_bucket"></a> [kube-prometheus-stack\_kube-prometheus-stack\_bucket](#module\_kube-prometheus-stack\_kube-prometheus-stack\_bucket) | terraform-google-modules/cloud-storage/google//modules/simple_bucket | ~> 6.0 |
| <a name="module_kube-prometheus-stack_thanos_kms_bucket"></a> [kube-prometheus-stack\_thanos\_kms\_bucket](#module\_kube-prometheus-stack\_thanos\_kms\_bucket) | terraform-google-modules/kms/google | ~> 2.2 |
Expand Down
2 changes: 1 addition & 1 deletion modules/google/cert-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ VALUES
module "cert_manager_workload_identity" {
count = local.cert-manager.create_iam_resources && local.cert-manager.enabled ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.3.0"
version = "~> 31.0.0"
name = local.cert-manager.service_account_name
namespace = local.cert-manager.namespace
project_id = local.cert-manager.project_id
Expand Down
2 changes: 1 addition & 1 deletion modules/google/external-dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ locals {
# to be allowed to use the workload identity on GKE.
module "external_dns_workload_identity" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.3.0"
version = "~> 31.0.0"

for_each = { for k, v in local.external-dns : k => v if v.enabled && v.create_iam_resources }

Expand Down
4 changes: 2 additions & 2 deletions modules/google/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ VALUES
module "iam_assumable_sa_kube-prometheus-stack_grafana" {
count = local.kube-prometheus-stack["enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.kube-prometheus-stack["namespace"]
project_id = var.project_id
name = local.kube-prometheus-stack["grafana_service_account_name"]
Expand All @@ -265,7 +265,7 @@ module "iam_assumable_sa_kube-prometheus-stack_grafana" {
module "iam_assumable_sa_kube-prometheus-stack_thanos" {
count = local.kube-prometheus-stack["enabled"] && local.kube-prometheus-stack["thanos_sidecar_enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.kube-prometheus-stack["namespace"]
project_id = var.project_id
name = "${local.kube-prometheus-stack["name_prefix"]}-thanos"
Expand Down
2 changes: 1 addition & 1 deletion modules/google/loki-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ locals {
module "iam_assumable_sa_loki-stack" {
count = local.loki-stack["enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.loki-stack["namespace"]
project_id = var.project_id
name = local.loki-stack["name"]
Expand Down
2 changes: 1 addition & 1 deletion modules/google/thanos-storegateway.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ locals {
module "iam_assumable_sa_thanos-storegateway" {
for_each = local.thanos-storegateway
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = each.value["namespace"]
project_id = data.google_project.current.id
name = "${each.value["name_prefix"]}-${each.key}"
Expand Down
6 changes: 3 additions & 3 deletions modules/google/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ locals {
module "iam_assumable_sa_thanos" {
count = local.thanos["enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.thanos["namespace"]
project_id = var.project_id
name = local.thanos["name"]
Expand All @@ -233,7 +233,7 @@ module "iam_assumable_sa_thanos" {
module "iam_assumable_sa_thanos-compactor" {
count = local.thanos["enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.thanos["namespace"]
project_id = var.project_id
name = "${local.thanos["name"]}-compactor"
Expand All @@ -242,7 +242,7 @@ module "iam_assumable_sa_thanos-compactor" {
module "iam_assumable_sa_thanos-sg" {
count = local.thanos["enabled"] ? 1 : 0
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 30.0"
version = "~> 31.0"
namespace = local.thanos["namespace"]
project_id = var.project_id
name = "${local.thanos["name"]}-sg"
Expand Down

0 comments on commit 3247199

Please sign in to comment.