Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
rguichard committed Jan 6, 2025
2 parents 8407d05 + dc7e43e commit 9b4c9a8
Show file tree
Hide file tree
Showing 19 changed files with 165 additions and 152 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.96.2
rev: v1.96.3
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand All @@ -14,6 +14,6 @@ repos:
- id: check-merge-conflict
- id: end-of-file-fixer
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 38.142.6
rev: 39.91.2
hooks:
- id: renovate-config-validator
2 changes: 1 addition & 1 deletion flux2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ locals {
create_ns = true
namespace = "flux-system"
path = "gitops/clusters/${var.cluster-name}"
version = "v2.2.3"
version = "v2.4.0"
create_github_repository = false
repository = "gitops"
repository_visibility = "public"
Expand Down
40 changes: 20 additions & 20 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ dependencies:
version: 0.13.2
repository: https://charts.admiralty.io
- name: secrets-store-csi-driver
version: 1.4.6
version: 1.4.7
repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts
- name: aws-ebs-csi-driver
version: 2.37.0
version: 2.38.1
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
- name: aws-efs-csi-driver
version: 3.1.1
version: 3.1.4
repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
- name: aws-for-fluent-bit
version: 0.1.34
repository: https://aws.github.io/eks-charts
- name: aws-load-balancer-controller
version: 1.10.1
version: 1.11.0
repository: https://aws.github.io/eks-charts
- name: aws-node-termination-handler
version: 0.21.0
Expand All @@ -30,7 +30,7 @@ dependencies:
version: v0.10.1
repository: https://charts.jetstack.io
- name: cluster-autoscaler
version: 9.43.2
version: 9.45.0
repository: https://kubernetes.github.io/autoscaler
- name: external-dns
version: 1.15.0
Expand All @@ -39,7 +39,7 @@ dependencies:
version: 1.13.3
repository: https://charts.fluxcd.io
- name: ingress-nginx
version: 4.11.3
version: 4.12.0
repository: https://kubernetes.github.io/ingress-nginx
- name: k8gb
version: v0.14.0
Expand All @@ -48,16 +48,16 @@ dependencies:
version: 1.7.2
repository: https://charts.helm.sh/stable
- name: karpenter
version: 1.1.0
version: 1.1.1
repository: oci://public.ecr.aws/karpenter
- name: keda
version: 2.16.0
version: 2.16.1
repository: https://kedacore.github.io/charts
- name: kong
version: 2.43.0
version: 2.46.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 65.8.1
version: 67.8.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.22.0
version: 6.24.0
repository: https://grafana.github.io/helm-charts
- name: promtail
version: 6.16.6
Expand All @@ -96,25 +96,25 @@ dependencies:
version: v0.0.1
repository: https://particuleio.github.io/charts
- name: sealed-secrets
version: 2.16.2
version: 2.17.0
repository: https://bitnami-labs.github.io/sealed-secrets
- name: thanos
version: 15.8.2
repository: https://charts.bitnami.com/bitnami
- name: oci://registry-1.docker.io/bitnamicharts/thanos
version: 15.9.2
repository: ""
- name: tigera-operator
version: v3.29.1
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 33.1.0
version: 33.2.1
repository: https://helm.traefik.io/traefik
- name: memcached
- name: oci://registry-1.docker.io/bitnamicharts/memcached
version: 7.5.3
repository: https://charts.bitnami.com/bitnami
repository: ""
- name: velero
version: 8.1.0
version: 8.2.0
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.30.0
version: 0.33.2
repository: https://victoriametrics.github.io/helm-charts/
- name: yet-another-cloudwatch-exporter
version: 0.14.0
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
thanos_bucket = "thanos-store-${var.cluster-name}"
thanos_bucket_force_destroy = false
thanos_store_config = null
thanos_version = "v0.36.1"
thanos_version = "v0.37.2"
enabled = false
allowed_cidrs = ["0.0.0.0/0"]
default_network_policy = true
Expand Down
6 changes: 3 additions & 3 deletions modules/aws/thanos-memcached.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ locals {
thanos-memcached = merge(
local.helm_defaults,
{
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
name = "thanos-memcached"
namespace = local.thanos["namespace"]
enabled = false
Expand Down
8 changes: 4 additions & 4 deletions modules/aws/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ locals {
thanos = merge(
local.helm_defaults,
{
name = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
name = "thanos"
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
namespace = "monitoring"
create_iam_resources_irsa = true
iam_policy_override = null
Expand Down
Loading

0 comments on commit 9b4c9a8

Please # to comment.