From 2626aa2bfd5aea5b840f721e18a1c92386d99b9a Mon Sep 17 00:00:00 2001
From: jmlrt <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 2 Feb 2022 16:46:37 +0100
Subject: [PATCH 1/2] [meta] bump Helm version to 3.8.0

https://github.com/helm/helm/releases/tag/v3.8.0
---
 README.md                      | 2 +-
 helpers/helm-tester/Dockerfile | 2 +-
 helpers/terraform/Dockerfile   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 22a4f7551..92a809c8e 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ exact versions are defined under `KUBERNETES_VERSIONS` in
 ### Helm Versions
 
 While we are checking backward compatibility, the charts are only tested with
-Helm version mentioned in [helm-tester Dockerfile][] (currently 3.6.2).
+Helm version mentioned in [helm-tester Dockerfile][] (currently 3.8.0).
 
 
 ## ECK
diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile
index 747565754..42bc31453 100644
--- a/helpers/helm-tester/Dockerfile
+++ b/helpers/helm-tester/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.7
 
-ENV HELM_VERSION=3.6.2
+ENV HELM_VERSION=3.8.0
 
 RUN wget --no-verbose https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile
index 43ed630b1..163f265fb 100644
--- a/helpers/terraform/Dockerfile
+++ b/helpers/terraform/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:7
 ENV VAULT_VERSION 0.9.3
 ENV TERRAFORM_VERSION=0.11.7
 ENV KUBECTL_VERSION=1.19.9
-ENV HELM_VERSION=3.6.2
+ENV HELM_VERSION=3.8.0
 ENV DOCKER_VERSION=18.09.7
 ENV JQ_VERSION=1.6
 

From 983ea5a585a640c58304431d66f5486efc17954d Mon Sep 17 00:00:00 2001
From: jmlrt <8582351+jmlrt@users.noreply.github.com>
Date: Mon, 28 Feb 2022 10:40:36 +0100
Subject: [PATCH 2/2] [logstash] fix helm lint error

---
 logstash/templates/poddisruptionbudget.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/logstash/templates/poddisruptionbudget.yaml b/logstash/templates/poddisruptionbudget.yaml
index a9ac86b3f..a08982321 100644
--- a/logstash/templates/poddisruptionbudget.yaml
+++ b/logstash/templates/poddisruptionbudget.yaml
@@ -1,4 +1,3 @@
----
 {{- if .Values.maxUnavailable }}
 {{- if .Capabilities.APIVersions.Has "policy/v1" -}}
 apiVersion: policy/v1