diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4cfb6f109..18a0d67d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.86.0 + rev: v1.88.0 hooks: - id: terraform_fmt - id: terraform_validate @@ -14,6 +14,6 @@ repos: - id: check-merge-conflict - id: end-of-file-fixer - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 37.154.0 + rev: 37.213.0 hooks: - id: renovate-config-validator diff --git a/README.md b/README.md index 83a0caab0..dba278a08 100644 --- a/README.md +++ b/README.md @@ -81,9 +81,9 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [flux](#requirement\_flux) | ~> 1.0 | -| [github](#requirement\_github) | ~> 5.0 | +| [github](#requirement\_github) | ~> 6.0 | | [helm](#requirement\_helm) | ~> 2.0 | | [http](#requirement\_http) | >= 3 | | [kubectl](#requirement\_kubectl) | ~> 2.0 | @@ -95,7 +95,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi | Name | Version | |------|---------| | [flux](#provider\_flux) | ~> 1.0 | -| [github](#provider\_github) | ~> 5.0 | +| [github](#provider\_github) | ~> 6.0 | | [helm](#provider\_helm) | ~> 2.0 | | [http](#provider\_http) | >= 3 | | [kubectl](#provider\_kubectl) | ~> 2.0 | diff --git a/flux2.tf b/flux2.tf index 92ecdc307..f99c9dbe5 100644 --- a/flux2.tf +++ b/flux2.tf @@ -10,7 +10,7 @@ locals { create_ns = true namespace = "flux-system" path = "gitops/clusters/${var.cluster-name}" - version = "v2.1.2" + version = "v2.2.3" create_github_repository = false repository = "gitops" repository_visibility = "public" diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml index 1488a26ba..55b7e7b46 100644 --- a/helm-dependencies.yaml +++ b/helm-dependencies.yaml @@ -9,28 +9,28 @@ dependencies: version: 1.4.1 repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts - name: aws-ebs-csi-driver - version: 2.27.0 + version: 2.28.1 repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: aws-efs-csi-driver - version: 2.5.4 + version: 2.5.6 repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver - name: aws-for-fluent-bit version: 0.1.32 repository: https://aws.github.io/eks-charts - name: aws-load-balancer-controller - version: 1.6.2 + version: 1.7.1 repository: https://aws.github.io/eks-charts - name: aws-node-termination-handler version: 0.21.0 repository: https://aws.github.io/eks-charts - name: cert-manager - version: v1.13.3 + version: v1.14.3 repository: https://charts.jetstack.io - name: cert-manager-csi-driver - version: v0.6.0 + version: v0.7.1 repository: https://charts.jetstack.io - name: cluster-autoscaler - version: 9.34.1 + version: 9.35.0 repository: https://kubernetes.github.io/autoscaler - name: external-dns version: 1.14.3 @@ -39,7 +39,7 @@ dependencies: version: 1.13.3 repository: https://charts.fluxcd.io - name: ingress-nginx - version: 4.9.1 + version: 4.10.0 repository: https://kubernetes.github.io/ingress-nginx - name: k8gb version: v0.12.2 @@ -48,37 +48,37 @@ dependencies: version: 1.7.2 repository: https://charts.helm.sh/stable - name: karpenter - version: v0.33.1 + version: 0.35.0 repository: oci://public.ecr.aws/karpenter - name: keda - version: 2.13.1 + version: 2.13.2 repository: https://kedacore.github.io/charts - name: kong - version: 2.34.0 + version: 2.38.0 repository: https://charts.konghq.com - name: kube-prometheus-stack - version: 56.2.1 + version: 56.21.2 repository: https://prometheus-community.github.io/helm-charts - name: linkerd2-cni version: 30.12.2 repository: https://helm.linkerd.io/stable - name: linkerd-control-plane - version: 1.16.10 + version: 1.16.11 repository: https://helm.linkerd.io/stable - name: linkerd-crds version: 1.8.0 repository: https://helm.linkerd.io/stable - name: linkerd-viz - version: 30.12.10 + version: 30.12.11 repository: https://helm.linkerd.io/stable - name: loki - version: 5.42.0 + version: 5.43.5 repository: https://grafana.github.io/helm-charts - name: promtail - version: 6.15.4 + version: 6.15.5 repository: https://grafana.github.io/helm-charts - name: metrics-server - version: 3.11.0 + version: 3.12.0 repository: https://kubernetes-sigs.github.io/metrics-server/ - name: node-problem-detector version: 2.3.12 @@ -90,31 +90,31 @@ dependencies: version: 0.25.3 repository: https://prometheus-community.github.io/helm-charts - name: prometheus-blackbox-exporter - version: 8.10.0 + version: 8.12.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.14.2 + version: 2.15.0 repository: https://bitnami-labs.github.io/sealed-secrets - name: thanos - version: 12.22.1 + version: 12.23.2 repository: https://charts.bitnami.com/bitnami - name: tigera-operator - version: v3.27.0 + version: v3.27.2 repository: https://docs.projectcalico.org/charts - name: traefik - version: 26.0.0 + version: 26.1.0 repository: https://helm.traefik.io/traefik - name: memcached - version: 6.9.0 + version: 6.14.0 repository: https://charts.bitnami.com/bitnami - name: velero version: 4.4.1 repository: https://vmware-tanzu.github.io/helm-charts - name: victoria-metrics-k8s-stack - version: 0.18.11 + version: 0.19.4 repository: https://victoriametrics.github.io/helm-charts/ - name: yet-another-cloudwatch-exporter version: 0.14.0 diff --git a/modules/aws/README.md b/modules/aws/README.md index 44a915939..d95911f65 100644 --- a/modules/aws/README.md +++ b/modules/aws/README.md @@ -20,10 +20,10 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing- | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [aws](#requirement\_aws) | >= 5.27 | | [flux](#requirement\_flux) | ~> 1.0 | -| [github](#requirement\_github) | ~> 5.0 | +| [github](#requirement\_github) | ~> 6.0 | | [helm](#requirement\_helm) | ~> 2.0 | | [http](#requirement\_http) | >= 3 | | [kubectl](#requirement\_kubectl) | ~> 2.0 | @@ -36,7 +36,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing- |------|---------| | [aws](#provider\_aws) | >= 5.27 | | [flux](#provider\_flux) | ~> 1.0 | -| [github](#provider\_github) | ~> 5.0 | +| [github](#provider\_github) | ~> 6.0 | | [helm](#provider\_helm) | ~> 2.0 | | [http](#provider\_http) | >= 3 | | [kubectl](#provider\_kubectl) | ~> 2.0 | @@ -65,7 +65,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing- | [iam\_assumable\_role\_thanos-storegateway](#module\_iam\_assumable\_role\_thanos-storegateway) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 | | [iam\_assumable\_role\_velero](#module\_iam\_assumable\_role\_velero) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 | | [iam\_assumable\_role\_yet-another-cloudwatch-exporter](#module\_iam\_assumable\_role\_yet-another-cloudwatch-exporter) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 | -| [karpenter](#module\_karpenter) | terraform-aws-modules/eks/aws//modules/karpenter | ~> 19.0 | +| [karpenter](#module\_karpenter) | terraform-aws-modules/eks/aws//modules/karpenter | ~> 20.0 | | [kube-prometheus-stack\_thanos\_bucket](#module\_kube-prometheus-stack\_thanos\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | | [loki\_bucket](#module\_loki\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | | [s3\_logging\_bucket](#module\_s3\_logging\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | diff --git a/modules/aws/cluster-autoscaler.tf b/modules/aws/cluster-autoscaler.tf index 4dc7326f7..7ae257f2b 100644 --- a/modules/aws/cluster-autoscaler.tf +++ b/modules/aws/cluster-autoscaler.tf @@ -75,9 +75,13 @@ data "aws_iam_policy_document" "cluster-autoscaler" { "autoscaling:DescribeAutoScalingGroups", "autoscaling:DescribeAutoScalingInstances", "autoscaling:DescribeLaunchConfigurations", + "autoscaling:DescribeScalingActivities", "autoscaling:DescribeTags", "ec2:DescribeInstanceTypes", "ec2:DescribeLaunchTemplateVersions", + "ec2:DescribeImages", + "ec2:GetInstanceTypesFromInstanceRequirements", + "eks:DescribeNodegroup" ] resources = ["*"] @@ -90,7 +94,6 @@ data "aws_iam_policy_document" "cluster-autoscaler" { actions = [ "autoscaling:SetDesiredCapacity", "autoscaling:TerminateInstanceInAutoScalingGroup", - "autoscaling:UpdateAutoScalingGroup", ] resources = ["*"] diff --git a/modules/aws/karpenter.tf b/modules/aws/karpenter.tf index db5a4716d..27bfaf4cd 100644 --- a/modules/aws/karpenter.tf +++ b/modules/aws/karpenter.tf @@ -14,7 +14,7 @@ locals { irsa_oidc_provider_arn = var.eks["oidc_provider_arn"] irsa_namespace_service_accounts = ["karpenter:karpenter"] allowed_cidrs = ["0.0.0.0/0"] - iam_role_arn = "" + iam_role_name = "" repository_username = "" repository_password = "" @@ -68,23 +68,23 @@ resource "aws_iam_policy" "karpenter_additional" { module "karpenter" { source = "terraform-aws-modules/eks/aws//modules/karpenter" - version = "~> 19.0" + version = "~> 20.0" create = local.karpenter["enabled"] cluster_name = var.cluster-name - policies = { + node_iam_role_additional_policies = { AmazonSSMManagedInstanceCore = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore", KarpeneterAdditional = local.karpenter["enabled"] ? aws_iam_policy.karpenter_additional[0].arn : "" } - irsa_use_name_prefix = false + iam_role_use_name_prefix = false irsa_oidc_provider_arn = local.karpenter["irsa_oidc_provider_arn"] irsa_namespace_service_accounts = local.karpenter["irsa_namespace_service_accounts"] create_iam_role = false - iam_role_arn = local.karpenter["iam_role_arn"] + iam_role_name = local.karpenter["iam_role_name"] tags = local.tags } @@ -137,7 +137,7 @@ resource "helm_release" "karpenter" { set { name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" - value = module.karpenter.irsa_arn + value = module.karpenter.iam_role_arn } set { diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf index 0257d36dc..99cf9715d 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.33.0" + thanos_version = "v0.34.1" enabled = false allowed_cidrs = ["0.0.0.0/0"] default_network_policy = true diff --git a/modules/aws/versions.tf b/modules/aws/versions.tf index 8a72114e0..7d7959c7c 100644 --- a/modules/aws/versions.tf +++ b/modules/aws/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.0" + required_version = ">= 1.3" required_providers { aws = ">= 5.27" helm = "~> 2.0" @@ -14,7 +14,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 5.0" + version = "~> 6.0" } tls = { source = "hashicorp/tls" diff --git a/modules/azure/README.md b/modules/azure/README.md index bd639cf36..15e7435e8 100644 --- a/modules/azure/README.md +++ b/modules/azure/README.md @@ -7,10 +7,10 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [azurerm](#requirement\_azurerm) | ~> 3.0 | | [flux](#requirement\_flux) | ~> 1.0 | -| [github](#requirement\_github) | ~> 5.0 | +| [github](#requirement\_github) | ~> 6.0 | | [helm](#requirement\_helm) | ~> 2.0 | | [http](#requirement\_http) | >= 3 | | [kubectl](#requirement\_kubectl) | ~> 2.0 | @@ -22,7 +22,7 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure | Name | Version | |------|---------| | [flux](#provider\_flux) | ~> 1.0 | -| [github](#provider\_github) | ~> 5.0 | +| [github](#provider\_github) | ~> 6.0 | | [helm](#provider\_helm) | ~> 2.0 | | [http](#provider\_http) | >= 3 | | [kubectl](#provider\_kubectl) | ~> 2.0 | diff --git a/modules/azure/version.tf b/modules/azure/version.tf index 5908621ff..97239cc54 100644 --- a/modules/azure/version.tf +++ b/modules/azure/version.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.0" + required_version = ">= 1.3" required_providers { azurerm = "~> 3.0" helm = "~> 2.0" @@ -14,7 +14,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 5.0" + version = "~> 6.0" } tls = { source = "hashicorp/tls" diff --git a/modules/google/README.md b/modules/google/README.md index 71da4a841..b3b891f90 100644 --- a/modules/google/README.md +++ b/modules/google/README.md @@ -16,14 +16,14 @@ Provides various Kubernetes addons that are often used on Kubernetes with GCP | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [flux](#requirement\_flux) | ~> 1.0 | -| [github](#requirement\_github) | ~> 5.0 | +| [github](#requirement\_github) | ~> 6.0 | | [google](#requirement\_google) | >= 4.69 | | [google-beta](#requirement\_google-beta) | >= 4.69 | | [helm](#requirement\_helm) | ~> 2.0 | | [http](#requirement\_http) | >= 3 | -| [jinja](#requirement\_jinja) | ~> 1.15 | +| [jinja](#requirement\_jinja) | ~> 2.0 | | [kubectl](#requirement\_kubectl) | ~> 2.0 | | [kubernetes](#requirement\_kubernetes) | ~> 2.0, != 2.12 | | [tls](#requirement\_tls) | ~> 4.0 | @@ -33,11 +33,11 @@ Provides various Kubernetes addons that are often used on Kubernetes with GCP | Name | Version | |------|---------| | [flux](#provider\_flux) | ~> 1.0 | -| [github](#provider\_github) | ~> 5.0 | +| [github](#provider\_github) | ~> 6.0 | | [google](#provider\_google) | >= 4.69 | | [helm](#provider\_helm) | ~> 2.0 | | [http](#provider\_http) | >= 3 | -| [jinja](#provider\_jinja) | ~> 1.15 | +| [jinja](#provider\_jinja) | ~> 2.0 | | [kubectl](#provider\_kubectl) | ~> 2.0 | | [kubernetes](#provider\_kubernetes) | ~> 2.0, != 2.12 | | [random](#provider\_random) | n/a | @@ -48,15 +48,15 @@ Provides various Kubernetes addons that are often used on Kubernetes with GCP | Name | Source | Version | |------|--------|---------| -| [cert\_manager\_workload\_identity](#module\_cert\_manager\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0.0 | -| [external\_dns\_workload\_identity](#module\_external\_dns\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0.0 | -| [iam\_assumable\_sa\_kube-prometheus-stack\_grafana](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_grafana) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_kube-prometheus-stack\_thanos](#module\_iam\_assumable\_sa\_kube-prometheus-stack\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_loki-stack](#module\_iam\_assumable\_sa\_loki-stack) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_thanos](#module\_iam\_assumable\_sa\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_thanos-compactor](#module\_iam\_assumable\_sa\_thanos-compactor) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_thanos-sg](#module\_iam\_assumable\_sa\_thanos-sg) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | -| [iam\_assumable\_sa\_thanos-storegateway](#module\_iam\_assumable\_sa\_thanos-storegateway) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 29.0 | +| [cert\_manager\_workload\_identity](#module\_cert\_manager\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.1.0 | +| [external\_dns\_workload\_identity](#module\_external\_dns\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.1.0 | +| [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 | +| [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 | +| [iam\_assumable\_sa\_loki-stack](#module\_iam\_assumable\_sa\_loki-stack) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 | +| [iam\_assumable\_sa\_thanos](#module\_iam\_assumable\_sa\_thanos) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 | +| [iam\_assumable\_sa\_thanos-compactor](#module\_iam\_assumable\_sa\_thanos-compactor) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 | +| [iam\_assumable\_sa\_thanos-sg](#module\_iam\_assumable\_sa\_thanos-sg) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 | +| [iam\_assumable\_sa\_thanos-storegateway](#module\_iam\_assumable\_sa\_thanos-storegateway) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 30.0 | | [kube-prometheus-stack\_grafana-iam-member](#module\_kube-prometheus-stack\_grafana-iam-member) | terraform-google-modules/iam/google//modules/member_iam | ~> 7.6 | | [kube-prometheus-stack\_kube-prometheus-stack\_bucket](#module\_kube-prometheus-stack\_kube-prometheus-stack\_bucket) | terraform-google-modules/cloud-storage/google//modules/simple_bucket | ~> 5.0 | | [kube-prometheus-stack\_thanos\_kms\_bucket](#module\_kube-prometheus-stack\_thanos\_kms\_bucket) | terraform-google-modules/kms/google | ~> 2.2 | diff --git a/modules/google/cert-manager.tf b/modules/google/cert-manager.tf index 07cc4b24e..51db59895 100644 --- a/modules/google/cert-manager.tf +++ b/modules/google/cert-manager.tf @@ -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 = "~> 29.0.0" + version = "~> 30.1.0" name = local.cert-manager.service_account_name namespace = local.cert-manager.namespace project_id = local.cert-manager.project_id diff --git a/modules/google/external-dns.tf b/modules/google/external-dns.tf index dc41dd450..52663f5e3 100644 --- a/modules/google/external-dns.tf +++ b/modules/google/external-dns.tf @@ -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 = "~> 29.0.0" + version = "~> 30.1.0" for_each = { for k, v in local.external-dns : k => v if v.enabled && v.create_iam_resources } diff --git a/modules/google/kube-prometheus.tf b/modules/google/kube-prometheus.tf index b93854cb2..cadb9fc89 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.33.0" + thanos_version = "v0.34.1" thanos_service_account = "" enabled = false allowed_cidrs = ["0.0.0.0/0"] @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = local.kube-prometheus-stack["namespace"] project_id = var.project_id name = local.kube-prometheus-stack["grafana_service_account_name"] @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = local.kube-prometheus-stack["namespace"] project_id = var.project_id name = "${local.kube-prometheus-stack["name_prefix"]}-thanos" diff --git a/modules/google/loki-stack.tf b/modules/google/loki-stack.tf index 21fb3ba35..96b2c4e2c 100644 --- a/modules/google/loki-stack.tf +++ b/modules/google/loki-stack.tf @@ -73,7 +73,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 = "~> 29.0" + version = "~> 30.0" namespace = local.loki-stack["namespace"] project_id = var.project_id name = local.loki-stack["name"] diff --git a/modules/google/thanos-storegateway.tf b/modules/google/thanos-storegateway.tf index 4e727471f..1c69074e8 100644 --- a/modules/google/thanos-storegateway.tf +++ b/modules/google/thanos-storegateway.tf @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = each.value["namespace"] project_id = data.google_project.current.id name = "${each.value["name_prefix"]}-${each.key}" diff --git a/modules/google/thanos.tf b/modules/google/thanos.tf index aee279cdd..39203f3e8 100644 --- a/modules/google/thanos.tf +++ b/modules/google/thanos.tf @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = local.thanos["namespace"] project_id = var.project_id name = local.thanos["name"] @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = local.thanos["namespace"] project_id = var.project_id name = "${local.thanos["name"]}-compactor" @@ -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 = "~> 29.0" + version = "~> 30.0" namespace = local.thanos["namespace"] project_id = var.project_id name = "${local.thanos["name"]}-sg" diff --git a/modules/google/versions.tf b/modules/google/versions.tf index 825504b07..5ce9b4b5e 100644 --- a/modules/google/versions.tf +++ b/modules/google/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.0" + required_version = ">= 1.3" required_providers { google = ">= 4.69" google-beta = ">= 4.69" @@ -11,7 +11,7 @@ terraform { } jinja = { source = "NikolaLohinski/jinja" - version = "~> 1.15" + version = "~> 2.0" } flux = { source = "fluxcd/flux" @@ -19,7 +19,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 5.0" + version = "~> 6.0" } tls = { source = "hashicorp/tls" diff --git a/modules/scaleway/README.md b/modules/scaleway/README.md index 336e88a75..ca995a7fd 100644 --- a/modules/scaleway/README.md +++ b/modules/scaleway/README.md @@ -19,9 +19,9 @@ User guides, feature documentation and examples are available [here](https://git | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [flux](#requirement\_flux) | ~> 1.0 | -| [github](#requirement\_github) | ~> 5.0 | +| [github](#requirement\_github) | ~> 6.0 | | [helm](#requirement\_helm) | ~> 2.0 | | [http](#requirement\_http) | >= 3 | | [kubectl](#requirement\_kubectl) | ~> 2.0 | @@ -34,7 +34,7 @@ User guides, feature documentation and examples are available [here](https://git | Name | Version | |------|---------| | [flux](#provider\_flux) | ~> 1.0 | -| [github](#provider\_github) | ~> 5.0 | +| [github](#provider\_github) | ~> 6.0 | | [helm](#provider\_helm) | ~> 2.0 | | [http](#provider\_http) | >= 3 | | [kubectl](#provider\_kubectl) | ~> 2.0 | diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf index b3e594eb3..639c80e69 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.33.0" + thanos_version = "v0.34.1" enabled = false allowed_cidrs = ["0.0.0.0/0"] default_network_policy = true diff --git a/modules/scaleway/versions.tf b/modules/scaleway/versions.tf index 1948ff0ce..bc633a3b5 100644 --- a/modules/scaleway/versions.tf +++ b/modules/scaleway/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.0" + required_version = ">= 1.3" required_providers { helm = "~> 2.0" kubernetes = "~> 2.0, != 2.12" @@ -13,7 +13,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 5.0" + version = "~> 6.0" } scaleway = { source = "scaleway/scaleway" diff --git a/versions.tf b/versions.tf index bfb4c6cd8..a36d802a7 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.0" + required_version = ">= 1.3" required_providers { helm = "~> 2.0" kubernetes = "~> 2.0, != 2.12" @@ -13,7 +13,7 @@ terraform { } github = { source = "integrations/github" - version = "~> 5.0" + version = "~> 6.0" } tls = { source = "hashicorp/tls"