Merge branch 'main' into release

particuleio · Nov 10, 2022 · 64fd0a1 · 64fd0a1
2 parents 9c2aca1 + b3e6c34
commit 64fd0a1
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 52 deletions.
diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       # Please look up the latest version from
       # https://github.com/amannn/action-semantic-pull-request/releases
-      - uses: amannn/[email protected].0
+      - uses: amannn/[email protected].2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get root directories
         id: dirs
-        uses: clowdhaus/terraform-composite-actions/directories@v1.6.0
+        uses: clowdhaus/terraform-composite-actions/directories@v1.8.0
 
   preCommitMinVersions:
     name: Min TF pre-commit
@@ -37,22 +37,22 @@ jobs:
 
       - name: Terraform min/max versions
         id: minMax
-        uses: clowdhaus/terraform-min-max@v1.1.1
+        uses: clowdhaus/terraform-min-max@v1.2.0
         with:
           directory: ${{ matrix.directory }}
 
       - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
         # Run only validate pre-commit check on min version supported
         if: ${{ matrix.directory !=  '.' }}
-        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.6.0
+        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
         with:
           terraform-version: ${{ steps.minMax.outputs.minVersion }}
           args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
 
       - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
         # Run only validate pre-commit check on min version supported
         if: ${{ matrix.directory ==  '.' }}
-        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.6.0
+        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
         with:
           terraform-version: ${{ steps.minMax.outputs.minVersion }}
           args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
@@ -70,10 +70,10 @@ jobs:
 
       - name: Terraform min/max versions
         id: minMax
-        uses: clowdhaus/terraform-min-max@v1.1.1
+        uses: clowdhaus/terraform-min-max@v1.2.0
 
       - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
-        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.6.0
+        uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0
         with:
           terraform-version: ${{ steps.minMax.outputs.maxVersion }}
           terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
diff --git a/README.md b/README.md
@@ -86,8 +86,8 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.20 |
 | <a name="requirement_github"></a> [github](#requirement\_github) | ~> 5.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
 | <a name="requirement_http"></a> [http](#requirement\_http) | >= 3 |
@@ -99,7 +99,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi
 
 | Name | Version |
 |------|---------|
-| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.20 |
 | <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
 | <a name="provider_http"></a> [http](#provider\_http) | >= 3 |

diff --git a/flux2.tf b/flux2.tf
@@ -11,7 +11,7 @@ locals {
       namespace                = "flux-system"
       target_path              = "production"
       default_network_policy   = true
-      version                  = "v0.35.0"
+      version                  = "v0.36.0"
       github_url               = "ssh://git@<host>/<org>/<repository>"
       create_github_repository = false
       github_token             = ""

diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -9,10 +9,10 @@ dependencies:
     version: 1.2.4
     repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts
   - name: aws-ebs-csi-driver
-    version: 2.12.1
+    version: 2.13.0
     repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   - name: aws-efs-csi-driver
-    version: 2.2.9
+    version: 2.3.1
     repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
   - name: aws-for-fluent-bit
     version: 0.1.21
@@ -27,7 +27,7 @@ dependencies:
     version: 0.3.11
     repository: https://aws.github.io/eks-charts
   - name: cert-manager
-    version: v1.9.1
+    version: v1.10.0
     repository: https://charts.jetstack.io
   - name: cert-manager-csi-driver
     version: v0.4.2
@@ -42,13 +42,13 @@ dependencies:
     version: 1.13.3
     repository: https://charts.fluxcd.io
   - name: ingress-nginx
-    version: 4.3.0
+    version: 4.4.0
     repository: https://kubernetes.github.io/ingress-nginx
   - name: istio-operator
     version: 1.7.0
     repository: https://clusterfrak-dynamics.github.io/istio/
   - name: k8gb
-    version: v0.9.0
+    version: v0.10.0
     repository: https://www.k8gb.io
   - name: karma
     version: 1.7.2
@@ -63,10 +63,10 @@ dependencies:
     version: 2.13.1
     repository: https://charts.konghq.com
   - name: kube-prometheus-stack
-    version: 41.3.2
+    version: 41.7.3
     repository: https://prometheus-community.github.io/helm-charts
   - name: kyverno
-    version: 2.6.0
+    version: 2.6.1
     repository: https://kyverno.github.io/kyverno/
   - name: kyverno-crds
     version: v2.0.3
@@ -81,59 +81,59 @@ dependencies:
     repository: https://helm.linkerd.io/edge
     version: 21.12.4
   - name: loki-stack
-    version: 2.8.3
+    version: 2.8.4
     repository: https://grafana.github.io/helm-charts
   - name: loki
-    version: 3.2.1
+    version: 3.3.3
     repository: https://grafana.github.io/helm-charts
   - name: promtail
-    version: 6.5.0
+    version: 6.6.1
     repository: https://grafana.github.io/helm-charts
   - name: metrics-server
     version: 3.8.2
     repository: https://kubernetes-sigs.github.io/metrics-server/
   - name: node-problem-detector
-    version: 2.2.6
+    version: 2.3.0
     repository: https://charts.deliveryhero.io/
   - name: prometheus-adapter
-    version: 3.4.0
+    version: 3.4.2
     repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-cloudwatch-exporter
-    version: 0.21.0
+    version: 0.22.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-blackbox-exporter
-    version: 7.1.0
+    version: 7.1.3
     repository: https://prometheus-community.github.io/helm-charts
   - name: rabbitmq-cluster-operator
-    version: 3.1.0
+    version: 3.1.2
     repository: https://charts.bitnami.com/bitnami
   - name: scaleway-webhook
     version: v0.0.1
     repository: https://particuleio.github.io/charts
   - name: sealed-secrets
-    version: 2.6.9
+    version: 2.7.0
     repository: https://bitnami-labs.github.io/sealed-secrets
   - name: strimzi-kafka-operator
-    version: 0.31.1
+    version: 0.32.0
     repository: https://strimzi.io/charts/
   - name: thanos
-    version: 11.5.5
+    version: 11.5.9
     repository: https://charts.bitnami.com/bitnami
   - name: tigera-operator
-    version: v3.24.1
+    version: v3.24.5
     repository: https://docs.projectcalico.org/charts
   - name: traefik
-    version: 14.0.1
+    version: 19.0.4
     repository: https://helm.traefik.io/traefik
   - name: memcached
-    version: 6.2.7
+    version: 6.3.0
     repository: https://charts.bitnami.com/bitnami
   - name: vault
-    version: 0.22.0
+    version: 0.22.1
     repository: https://helm.releases.hashicorp.com
   - name: velero
-    version: 2.32.0
+    version: 2.32.1
     repository: https://vmware-tanzu.github.io/helm-charts
   - name: victoria-metrics-k8s-stack
-    version: 0.12.5
+    version: 0.12.9
     repository: https://victoriametrics.github.io/helm-charts/
diff --git a/modules/aws/README.md b/modules/aws/README.md
@@ -20,9 +20,9 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.20 |
 | <a name="requirement_github"></a> [github](#requirement\_github) | ~> 5.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
 | <a name="requirement_http"></a> [http](#requirement\_http) | >= 3 |
@@ -35,7 +35,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.72 |
-| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.20 |
 | <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
 | <a name="provider_http"></a> [http](#provider\_http) | >= 3 |

diff --git a/modules/aws/aws-for-fluent-bit.tf b/modules/aws/aws-for-fluent-bit.tf
@@ -14,6 +14,7 @@ locals {
       iam_policy_override              = null
       default_network_policy           = true
       containers_log_retention_in_days = 180
+      kms_key_id                       = null
       name_prefix                      = "${var.cluster-name}-aws-for-fluent-bit"
     },
     var.aws-for-fluent-bit
@@ -80,6 +81,7 @@ resource "aws_cloudwatch_log_group" "aws-for-fluent-bit" {
   count             = local.aws-for-fluent-bit["enabled"] ? 1 : 0
   name              = "/aws/eks/${var.cluster-name}/containers"
   retention_in_days = local.aws-for-fluent-bit["containers_log_retention_in_days"]
+  kms_key_id        = local.aws-for-fluent-bit["kms_key_id"]
 }
 
 resource "kubernetes_namespace" "aws-for-fluent-bit" {

diff --git a/modules/aws/versions.tf b/modules/aws/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0"
   required_providers {
     aws        = ">= 3.72"
     helm       = "~> 2.0"
@@ -10,7 +10,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.19"
+      version = "~> 0.20"
     }
     github = {
       source  = "integrations/github"

diff --git a/modules/azure/README.md b/modules/azure/README.md
@@ -7,9 +7,9 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
 | <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.0 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.20 |
 | <a name="requirement_github"></a> [github](#requirement\_github) | ~> 5.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
 | <a name="requirement_http"></a> [http](#requirement\_http) | >= 3 |
@@ -21,7 +21,7 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure
 
 | Name | Version |
 |------|---------|
-| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.20 |
 | <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
 | <a name="provider_http"></a> [http](#provider\_http) | >= 3 |

diff --git a/modules/azure/version.tf b/modules/azure/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0"
   required_providers {
     azurerm    = "~> 3.0"
     helm       = "~> 2.0"
@@ -10,7 +10,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.19"
+      version = "~> 0.20"
     }
     github = {
       source  = "integrations/github"

diff --git a/modules/scaleway/README.md b/modules/scaleway/README.md
@@ -19,8 +19,8 @@ User guides, feature documentation and examples are available [here](https://git
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.20 |
 | <a name="requirement_github"></a> [github](#requirement\_github) | ~> 5.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
 | <a name="requirement_http"></a> [http](#requirement\_http) | >= 3 |
@@ -33,7 +33,7 @@ User guides, feature documentation and examples are available [here](https://git
 
 | Name | Version |
 |------|---------|
-| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.20 |
 | <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
 | <a name="provider_http"></a> [http](#provider\_http) | >= 3 |

diff --git a/modules/scaleway/loki-stack.tf b/modules/scaleway/loki-stack.tf
@@ -22,6 +22,8 @@ locals {
   )
 
   values_loki-stack = <<-VALUES
+    global
+      dnsService: coredns
     monitoring:
       selfMonitoring:
         enabled: false

diff --git a/modules/scaleway/versions.tf b/modules/scaleway/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0"
   required_providers {
     helm       = "~> 2.0"
     kubernetes = "~> 2.0, != 2.12"
@@ -9,7 +9,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.19"
+      version = "~> 0.20"
     }
     github = {
       source  = "integrations/github"

diff --git a/versions.tf b/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0"
   required_providers {
     helm       = "~> 2.0"
     kubernetes = "~> 2.0, != 2.12"
@@ -9,7 +9,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.19"
+      version = "~> 0.20"
     }
     github = {
       source  = "integrations/github"