Merge branch 'main' into release

particuleio · Oct 10, 2022 · 02202af · 02202af
2 parents e326c02 + ac737cb
commit 02202af
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 62 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/action-semantic-pull-request@v4.5.0
+      - uses: amannn/action-semantic-pull-request@v4.6.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/stale-actions.yaml b/.github/workflows/stale-actions.yaml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # Staling issues and PR's

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ 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.18 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
 | <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.18 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
 | <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/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -9,16 +9,16 @@ dependencies:
     version: 1.2.4
     repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts
   - name: aws-ebs-csi-driver
-    version: 2.11.1
+    version: 2.12.0
     repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   - name: aws-efs-csi-driver
-    version: 2.2.7
+    version: 2.2.8
     repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
   - name: aws-for-fluent-bit
     version: 0.1.21
     repository: https://aws.github.io/eks-charts
   - name: aws-load-balancer-controller
-    version: 1.4.4
+    version: 1.4.5
     repository: https://aws.github.io/eks-charts
   - name: aws-node-termination-handler
     version: 0.19.3
@@ -42,7 +42,7 @@ dependencies:
     version: 1.13.3
     repository: https://charts.fluxcd.io
   - name: ingress-nginx
-    version: 4.2.5
+    version: 4.3.0
     repository: https://kubernetes.github.io/ingress-nginx
   - name: istio-operator
     version: 1.7.0
@@ -60,13 +60,13 @@ dependencies:
     version: 18.3.0
     repository: https://codecentric.github.io/helm-charts
   - name: kong
-    version: 2.13.0
+    version: 2.13.1
     repository: https://charts.konghq.com
   - name: kube-prometheus-stack
-    version: 40.1.0
+    version: 40.5.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: kyverno
-    version: v2.5.3
+    version: 2.6.0
     repository: https://kyverno.github.io/kyverno/
   - name: kyverno-crds
     version: v2.0.3
@@ -81,13 +81,13 @@ dependencies:
     repository: https://helm.linkerd.io/edge
     version: 21.12.4
   - name: loki-stack
-    version: 2.8.2
+    version: 2.8.3
     repository: https://grafana.github.io/helm-charts
   - name: loki
-    version: 3.0.7
+    version: 3.2.1
     repository: https://grafana.github.io/helm-charts
   - name: promtail
-    version: 6.4.0
+    version: 6.5.0
     repository: https://grafana.github.io/helm-charts
   - name: metrics-server
     version: 3.8.2
@@ -99,41 +99,41 @@ dependencies:
     version: 3.4.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-cloudwatch-exporter
-    version: 0.20.0
+    version: 0.21.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: prometheus-blackbox-exporter
-    version: 7.0.1
+    version: 7.1.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: rabbitmq-cluster-operator
-    version: 2.7.3
+    version: 3.1.0
     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.5
+    version: 2.6.9
     repository: https://bitnami-labs.github.io/sealed-secrets
   - name: strimzi-kafka-operator
-    version: 0.31.0
+    version: 0.31.1
     repository: https://strimzi.io/charts/
   - name: thanos
-    version: 11.5.1
+    version: 11.5.5
     repository: https://charts.bitnami.com/bitnami
   - name: tigera-operator
     version: v3.24.1
     repository: https://docs.projectcalico.org/charts
   - name: traefik
-    version: 10.24.3
+    version: 12.0.4
     repository: https://helm.traefik.io/traefik
   - name: memcached
-    version: 6.2.4
+    version: 6.2.6
     repository: https://charts.bitnami.com/bitnami
   - name: vault
     version: 0.22.0
     repository: https://helm.releases.hashicorp.com
   - name: velero
-    version: 2.31.6
+    version: 2.31.8
     repository: https://vmware-tanzu.github.io/helm-charts
   - name: victoria-metrics-k8s-stack
-    version: 0.12.4
+    version: 0.12.5
     repository: https://victoriametrics.github.io/helm-charts/
diff --git a/loki-stack.tf b/loki-stack.tf
@@ -57,7 +57,7 @@ resource "kubernetes_config_map" "loki-stack_grafana_ds" {
         name: Loki
         orgId: 1
         type: loki
-        url: http://${local.loki-stack["name"]}:3100
+        url: http://${local.loki-stack["name"]}-gateway
         version: 1
       VALUES
   }

diff --git a/modules/aws/README.md b/modules/aws/README.md
@@ -22,7 +22,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.18 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
 | <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.18 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
 | <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/loki-stack.tf b/modules/aws/loki-stack.tf
@@ -26,6 +26,11 @@ locals {
   )
 
   values_loki-stack = <<-VALUES
+    monitoring:
+      selfMonitoring:
+        enabled: false
+        grafanaAgent:
+          installOperator: false
     serviceMonitor:
       enabled: ${local.kube-prometheus-stack["enabled"] || local.victoria-metrics-k8s-stack["enabled"]}
     priorityClassName: ${local.priority-class["create"] ? kubernetes_priority_class.kubernetes_addons[0].metadata[0].name : ""}
@@ -35,23 +40,31 @@ locals {
         eks.amazonaws.com/role-arn: "${local.loki-stack["enabled"] && local.loki-stack["create_iam_resources_irsa"] ? module.iam_assumable_role_loki-stack.iam_role_arn : ""}"
     persistence:
       enabled: true
-    config:
-      schema_config:
+    loki:
+      auth_enabled: false
+      compactor:
+        shared_store: aws
+      storage:
+        bucketNames:
+          chunks: "${local.loki-stack["bucket"]}"
+          ruler: "${local.loki-stack["bucket"]}"
+          admin: "${local.loki-stack["bucket"]}"
+        s3:
+          region: eu-west-1
+      schemaConfig:
         configs:
-          - from: 2020-10-24
-            store: boltdb-shipper
-            object_store: s3
-            schema: v11
-            index:
-              prefix: loki_index_
-              period: 24h
+        - from: 2020-10-24
+          store: boltdb-shipper
+          object_store: aws
+          schema: v12
+          index:
+            prefix: loki_index_
+            period: 24h
       storage_config:
         aws:
           s3: "s3://${data.aws_region.current.name}/${local.loki-stack["bucket"]}"
         boltdb_shipper:
-          shared_store: s3
-      compactor:
-        shared_store: s3
+          shared_store: aws
     VALUES
 }
 
@@ -127,7 +140,7 @@ resource "kubernetes_config_map" "loki-stack_grafana_ds" {
         name: Loki
         orgId: 1
         type: loki
-        url: http://${local.loki-stack["name"]}:3100
+        url: http://${local.loki-stack["name"]}-gateway
         version: 1
       VALUES
   }

diff --git a/modules/aws/versions.tf b/modules/aws/versions.tf
@@ -10,7 +10,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.18"
+      version = "~> 0.19"
     }
     github = {
       source  = "integrations/github"

diff --git a/modules/azure/README.md b/modules/azure/README.md
@@ -9,7 +9,7 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
 | <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.0 |
-| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.18 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
 | <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.18 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
 | <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
@@ -10,7 +10,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.18"
+      version = "~> 0.19"
     }
     github = {
       source  = "integrations/github"

diff --git a/modules/scaleway/README.md b/modules/scaleway/README.md
@@ -20,7 +20,7 @@ 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.18 |
+| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.19 |
 | <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.18 |
+| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.19 |
 | <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,21 +22,36 @@ locals {
   )
 
   values_loki-stack = <<-VALUES
+    monitoring:
+      selfMonitoring:
+        enabled: false
+        grafanaAgent:
+          installOperator: false
     serviceMonitor:
       enabled: ${local.kube-prometheus-stack["enabled"] || local.victoria-metrics-k8s-stack["enabled"]}
     priorityClassName: ${local.priority-class["create"] ? kubernetes_priority_class.kubernetes_addons[0].metadata[0].name : ""}
     persistence:
       enabled: true
-    config:
-      schema_config:
+    loki:
+      auth_enabled: false
+      compactor:
+        shared_store: aws
+      storage:
+        bucketNames:
+          chunks: "${local.loki-stack["bucket"]}"
+          ruler: "${local.loki-stack["bucket"]}"
+          admin: "${local.loki-stack["bucket"]}"
+        s3:
+          region: eu-west-1
+      schemaConfig:
         configs:
-          - from: 2020-10-24
-            store: boltdb-shipper
-            object_store: s3
-            schema: v11
-            index:
-              prefix: loki_index_
-              period: 24h
+        - from: 2020-10-24
+          store: boltdb-shipper
+          object_store: aws
+          schema: v12
+          index:
+            prefix: loki_index_
+            period: 24h
       storage_config:
         aws:
           bucketnames: ${local.loki-stack["bucket"]}
@@ -45,9 +60,7 @@ locals {
           access_key_id: ${local.scaleway["scw_access_key"]}
           secret_access_key: ${local.scaleway["scw_secret_key"]}
         boltdb_shipper:
-          shared_store: s3
-      compactor:
-        shared_store: s3
+          shared_store: aws
     VALUES
 }
 
@@ -83,7 +96,7 @@ resource "kubernetes_config_map" "loki-stack_grafana_ds" {
         name: Loki
         orgId: 1
         type: loki
-        url: http://${local.loki-stack["name"]}:3100
+        url: http://${local.loki-stack["name"]}-gateway
         version: 1
       VALUES
   }

diff --git a/modules/scaleway/versions.tf b/modules/scaleway/versions.tf
@@ -9,7 +9,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.18"
+      version = "~> 0.19"
     }
     github = {
       source  = "integrations/github"

diff --git a/promtail.tf b/promtail.tf
@@ -10,7 +10,7 @@ locals {
       namespace              = "monitoring"
       create_ns              = false
       enabled                = false
-      loki_address           = "http://${local.loki-stack["name"]}:3100/loki/api/v1/push"
+      loki_address           = "http://${local.loki-stack["name"]}-write:3100/loki/api/v1/push"
       use_tls                = false
       tls_crt                = null
       tls_key                = null

diff --git a/versions.tf b/versions.tf
@@ -9,7 +9,7 @@ terraform {
     }
     flux = {
       source  = "fluxcd/flux"
-      version = "~> 0.18"
+      version = "~> 0.19"
     }
     github = {
       source  = "integrations/github"