Merge remote-tracking branch 'origin/main' into release

particuleio · Nov 16, 2021 · 29cdf1a · 29cdf1a
2 parents cc2be71 + 5117647
commit 29cdf1a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/flux2.tf b/flux2.tf
@@ -28,8 +28,8 @@ locals {
       ignore_fields_sync       = []
 
       known_hosts = [
-        "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==",
-        "gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9"
+        "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=",
+        "gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY="
       ]
     },
     var.flux2

diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -39,13 +39,13 @@ dependencies:
     version: 1.11.3
     repository: https://charts.fluxcd.io
   - name: ingress-nginx
-    version: 4.0.6
+    version: 4.0.8
     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.8.3
+    version: v0.8.4
     repository: https://www.k8gb.io
   - name: karma
     version: 1.7.2
@@ -57,10 +57,10 @@ dependencies:
     version: 15.1.0
     repository: https://codecentric.github.io/helm-charts
   - name: kong
-    version: 2.6.0
+    version: 2.6.1
     repository: https://charts.konghq.com
   - name: kube-prometheus-stack
-    version: 19.2.3
+    version: 19.3.0
     repository: https://prometheus-community.github.io/helm-charts
   - name: kyverno
     version: v2.1.3
@@ -105,13 +105,13 @@ dependencies:
     version: 0.26.0
     repository: https://strimzi.io/charts/
   - name: thanos
-    version: 8.0.0
+    version: 8.0.3
     repository: https://charts.bitnami.com/bitnami
   - name: tigera-operator
     version: v3.21.0
     repository: https://docs.projectcalico.org/charts
   - name: traefik
-    version: 10.6.1
+    version: 10.6.2
     repository: https://helm.traefik.io/traefik
   - name: memcached
     version: 5.15.8
@@ -120,8 +120,8 @@ dependencies:
     version: 0.17.1
     repository: https://helm.releases.hashicorp.com
   - name: velero
-    version: 2.26.2
+    version: 2.26.4
     repository: https://vmware-tanzu.github.io/helm-charts
   - name: victoria-metrics-k8s-stack
-    version: 0.5.8
+    version: 0.5.9
     repository: https://victoriametrics.github.io/helm-charts/
diff --git a/modules/aws/thanos-tls-querier.tf b/modules/aws/thanos-tls-querier.tf
@@ -36,14 +36,15 @@ locals {
           pdb:
             create: true
             minAvailable: 1
-          grpcTLS:
+          grpc:
             client:
-              secure: true
-              key: |
-                ${indent(8, v["generate_cert"] ? tls_private_key.thanos-tls-querier-cert-key[k].private_key_pem : "")}
-              cert: |
-                ${indent(8, v["generate_cert"] ? tls_locally_signed_cert.thanos-tls-querier-cert[k].cert_pem : "")}
               servername: ${v["client_server_name"]}
+              tls:
+                enabled: true
+                key: |
+                  ${indent(10, v["generate_cert"] ? tls_private_key.thanos-tls-querier-cert-key[k].private_key_pem : "")}
+                cert: |
+                  ${indent(10, v["generate_cert"] ? tls_locally_signed_cert.thanos-tls-querier-cert[k].cert_pem : "")}
           stores: ${jsonencode(v["stores"])}
         queryFrontend:
           enabled: false