From a1ebf67a5f23b8a0fff7f51cdaf190000ef4f739 Mon Sep 17 00:00:00 2001 From: maxim Date: Thu, 21 Apr 2022 12:25:48 +0600 Subject: [PATCH] enh: update used helm-charts to the latest versions --- terraform/layer1-aws/.terraform.lock.hcl | 26 +++++++-------- terraform/layer2-k8s/.terraform.lock.hcl | 26 +++++++-------- .../eks-ingress-nginx-controller.tf | 4 --- .../eks-victoria-metrics-k8s-stack.tf | 3 +- terraform/layer2-k8s/helm-releases.yaml | 32 +++++++++---------- 5 files changed, 44 insertions(+), 47 deletions(-) diff --git a/terraform/layer1-aws/.terraform.lock.hcl b/terraform/layer1-aws/.terraform.lock.hcl index da77e7a0..d077ac66 100644 --- a/terraform/layer1-aws/.terraform.lock.hcl +++ b/terraform/layer1-aws/.terraform.lock.hcl @@ -155,22 +155,22 @@ provider "registry.terraform.io/hashicorp/template" { } provider "registry.terraform.io/hashicorp/tls" { - version = "3.2.1" + version = "3.3.0" constraints = ">= 2.2.0" hashes = [ - "h1:p0vyCZjZqr6qf+CfUVvPSYghrn0/oMDJS4kp3pV26YY=", - "zh:0209adc722f1f2e319018bd2d38a3ef389fa7eaabf40ab3f82e791428712dc64", - "zh:2dbf76857b022ec44eaddb386d976a08b4a053bcc8e815fd601505f33b29b92e", - "zh:301f98065a3b45b1c6d671955d5f92d246e577be0a98e7f7e0553b11b1cd8b92", - "zh:4ee8effc669f9856d137249244b67fdcdc35262ebeab3dad262f42d6ddd39c5c", - "zh:66cdbf20523972e1e5e682b8776b78ad3ab296ad04784da8fe945d183766ac22", - "zh:71798604d4ff22f3c79ec9a8ab61802e969f57456e26ba30bef7d276b88815f7", + "h1:A4xOtHhD4jCmn4nO1xCTk2Nl5IP5JpjicjF+Fuu2ZFQ=", + "zh:16140e8cc880f95b642b6bf6564f4e98760e9991864aacc8e21273423571e561", + "zh:16338b8457759c97fdd73153965d6063b037f2954fd512e569fcdc42b7fef743", + "zh:348bd44b7cd0c6d663bba36cecb474c17635a8f22b02187d034b8e57a8729c5a", + "zh:3832ac73c2335c0fac26138bacbd18160efaa3f06c562869acc129e814e27f86", + "zh:756d1e60690d0164eee9c93b498b4c8beabbfc1d8b7346cb6d2fa719055089d6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9289d10fc5241bfd7a2e5de6ca229840eaa06066a129f483133e0a4517a91600", - "zh:a075e6bd64a452242e712c59d890cc0d5972158c9d71edbe1ac32d10ad051670", - "zh:deb5665f08b271bebe7d18c76cdcdf514ab49f1a85d96e73435728493ae54579", - "zh:e0b0a3c3427ee315582b4d17a6b9d2c09f07f2b86fb09821a7d713b68d4e1200", - "zh:f7519d1c7b1f108c0728036832a58dc06531203e878104f158ebb625b3c9438c", + "zh:93b911bcddba8dadc5339edb004c8019c230ea67477c73c4f741c236dd9511b1", + "zh:c0c4e5742e8ac004c507540423db52af3f44b8ec04443aa8e14669340819344f", + "zh:c78296a1dff8ccd5d50203aac353422fc18d425072ba947c88cf5b46de7d32d2", + "zh:d7143f444e0f7e6cd67fcaf080398b4f1487cf05de3e0e79af6c14e22812e38b", + "zh:e600ac76b118816ad72132eee4c22ab5fc044f67c3babc54537e1fc1ad53d295", + "zh:fca07af5f591e12d2dc178a550da69a4847bdb34f8180a5b8e04fde6b528cf99", ] } diff --git a/terraform/layer2-k8s/.terraform.lock.hcl b/terraform/layer2-k8s/.terraform.lock.hcl index 3ea2ba18..6da89a5e 100644 --- a/terraform/layer2-k8s/.terraform.lock.hcl +++ b/terraform/layer2-k8s/.terraform.lock.hcl @@ -188,20 +188,20 @@ provider "registry.terraform.io/hashicorp/time" { } provider "registry.terraform.io/hashicorp/tls" { - version = "3.2.1" + version = "3.3.0" hashes = [ - "h1:p0vyCZjZqr6qf+CfUVvPSYghrn0/oMDJS4kp3pV26YY=", - "zh:0209adc722f1f2e319018bd2d38a3ef389fa7eaabf40ab3f82e791428712dc64", - "zh:2dbf76857b022ec44eaddb386d976a08b4a053bcc8e815fd601505f33b29b92e", - "zh:301f98065a3b45b1c6d671955d5f92d246e577be0a98e7f7e0553b11b1cd8b92", - "zh:4ee8effc669f9856d137249244b67fdcdc35262ebeab3dad262f42d6ddd39c5c", - "zh:66cdbf20523972e1e5e682b8776b78ad3ab296ad04784da8fe945d183766ac22", - "zh:71798604d4ff22f3c79ec9a8ab61802e969f57456e26ba30bef7d276b88815f7", + "h1:A4xOtHhD4jCmn4nO1xCTk2Nl5IP5JpjicjF+Fuu2ZFQ=", + "zh:16140e8cc880f95b642b6bf6564f4e98760e9991864aacc8e21273423571e561", + "zh:16338b8457759c97fdd73153965d6063b037f2954fd512e569fcdc42b7fef743", + "zh:348bd44b7cd0c6d663bba36cecb474c17635a8f22b02187d034b8e57a8729c5a", + "zh:3832ac73c2335c0fac26138bacbd18160efaa3f06c562869acc129e814e27f86", + "zh:756d1e60690d0164eee9c93b498b4c8beabbfc1d8b7346cb6d2fa719055089d6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9289d10fc5241bfd7a2e5de6ca229840eaa06066a129f483133e0a4517a91600", - "zh:a075e6bd64a452242e712c59d890cc0d5972158c9d71edbe1ac32d10ad051670", - "zh:deb5665f08b271bebe7d18c76cdcdf514ab49f1a85d96e73435728493ae54579", - "zh:e0b0a3c3427ee315582b4d17a6b9d2c09f07f2b86fb09821a7d713b68d4e1200", - "zh:f7519d1c7b1f108c0728036832a58dc06531203e878104f158ebb625b3c9438c", + "zh:93b911bcddba8dadc5339edb004c8019c230ea67477c73c4f741c236dd9511b1", + "zh:c0c4e5742e8ac004c507540423db52af3f44b8ec04443aa8e14669340819344f", + "zh:c78296a1dff8ccd5d50203aac353422fc18d425072ba947c88cf5b46de7d32d2", + "zh:d7143f444e0f7e6cd67fcaf080398b4f1487cf05de3e0e79af6c14e22812e38b", + "zh:e600ac76b118816ad72132eee4c22ab5fc044f67c3babc54537e1fc1ad53d295", + "zh:fca07af5f591e12d2dc178a550da69a4847bdb34f8180a5b8e04fde6b528cf99", ] } diff --git a/terraform/layer2-k8s/eks-ingress-nginx-controller.tf b/terraform/layer2-k8s/eks-ingress-nginx-controller.tf index 4bfb8935..4d8b056a 100644 --- a/terraform/layer2-k8s/eks-ingress-nginx-controller.tf +++ b/terraform/layer2-k8s/eks-ingress-nginx-controller.tf @@ -16,10 +16,6 @@ controller: enabled: true serviceMonitor: enabled: true - podAnnotations: - co.elastic.logs/module: nginx - co.elastic.logs/fileset.stdout: ingress_controller - co.elastic.logs/fileset.stderr: error affinity: nodeAffinity: diff --git a/terraform/layer2-k8s/eks-victoria-metrics-k8s-stack.tf b/terraform/layer2-k8s/eks-victoria-metrics-k8s-stack.tf index 4c0ac9d9..0763abc9 100644 --- a/terraform/layer2-k8s/eks-victoria-metrics-k8s-stack.tf +++ b/terraform/layer2-k8s/eks-victoria-metrics-k8s-stack.tf @@ -532,7 +532,8 @@ resource "helm_release" "victoria_metrics_k8s_stack" { depends_on = [ kubectl_manifest.kube_prometheus_stack_operator_crds, - helm_release.calico_daemonset + helm_release.calico_daemonset, + helm_release.ingress_nginx ] } diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml index 0ac9d291..bee7a975 100644 --- a/terraform/layer2-k8s/helm-releases.yaml +++ b/terraform/layer2-k8s/helm-releases.yaml @@ -3,25 +3,25 @@ releases: enabled: false chart: aws-load-balancer-controller repository: https://aws.github.io/eks-charts - chart_version: 1.2.6 + chart_version: 1.4.1 namespace: aws-load-balancer-controller - id: aws-node-termination-handler enabled: true chart: aws-node-termination-handler repository: https://aws.github.io/eks-charts - chart_version: 0.13.3 + chart_version: 0.18.1 namespace: aws-node-termination-handler - id: aws-calico enabled: true chart: aws-calico repository: https://aws.github.io/eks-charts - chart_version: 0.3.4 + chart_version: 0.3.11 namespace: kube-system - id: cert-manager enabled: false chart: cert-manager repository: https://charts.jetstack.io - chart_version: 1.1.0 + chart_version: 1.8.0 namespace: certmanager - id: cert-mananger-certificate enabled: false @@ -39,7 +39,7 @@ releases: enabled: true chart: cluster-autoscaler repository: https://kubernetes.github.io/autoscaler - chart_version: 9.10.5 + chart_version: 9.13.1 namespace: cluster-autoscaler - id: elk enabled: false @@ -51,65 +51,65 @@ releases: enabled: true chart: external-dns repository: https://kubernetes-sigs.github.io/external-dns - chart_version: 1.5.0 + chart_version: 1.9.0 namespace: external-dns - id: external-secrets enabled: true chart: kubernetes-external-secrets repository: https://external-secrets.github.io/kubernetes-external-secrets - chart_version: 6.3.0 + chart_version: 8.5.5 namespace: external-secrets - id: gitlab-runner enabled: false chart: gitlab-runner repository: https://charts.gitlab.io - chart_version: 0.39.0 + chart_version: 0.40.0 namespace: gitlab-runner - id: ingress-nginx enabled: true chart: ingress-nginx repository: https://kubernetes.github.io/ingress-nginx - chart_version: 3.23.0 + chart_version: 4.0.19 namespace: ingress-nginx - id: istio enabled: false chart: repository: https://istio-release.storage.googleapis.com/charts - chart_version: 1.12.1 + chart_version: 1.13.3 namespace: istio-system - id: keda enabled: false chart: keda repository: https://kedacore.github.io/charts - chart_version: 2.4.0 + chart_version: 2.6.2 namespace: keda - id: kiali enabled: false chart: kiali-server repository: https://kiali.org/helm-charts - chart_version: 1.44 + chart_version: 1.49.0 namespace: kiali - id: kube-prometheus-stack enabled: false chart: kube-prometheus-stack repository: https://prometheus-community.github.io/helm-charts - chart_version: 30.1.0 + chart_version: 34.10.0 namespace: monitoring - id: loki-stack enabled: true chart: loki-stack repository: https://grafana.github.io/helm-charts - chart_version: 2.3.1 + chart_version: 2.6.4 namespace: loki - id: reloader enabled: true chart: reloader repository: https://stakater.github.io/stakater-charts - chart_version: 0.0.81 + chart_version: 0.0.110 namespace: reloader - id: victoria-metrics-k8s-stack enabled: true chart: victoria-metrics-k8s-stack repository: https://victoriametrics.github.io/helm-charts - chart_version: 0.5.9 + chart_version: 0.8.1 namespace: monitoring