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