From f4860d878f59868222a0bb37c249e1578d86b9dd Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 3 Nov 2020 11:35:35 +0100
Subject: [PATCH] [meta] add support for helm 2.17.0 and k8s 1.17 (#880)

- Bump Helm version used in tests from 2.16.2 to 2.17.0
- Add CI tests on GKE 1.17
---
 README.md                      | 2 +-
 helpers/helm-tester/Dockerfile | 2 +-
 helpers/matrix.yml             | 1 +
 helpers/terraform/Dockerfile   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 660a6fbe9..d1e245f91 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,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 2.16.12).
+Helm version mentioned in [helm-tester Dockerfile][] (currently 2.17.0).
 
 #### Helm 3 beta
 
diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile
index 08706c4eb..b0cefa7b1 100644
--- a/helpers/helm-tester/Dockerfile
+++ b/helpers/helm-tester/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.7
 
-ENV HELM_VERSION=2.16.12
+ENV HELM_VERSION=2.17.0
 
 RUN wget --no-verbose https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
diff --git a/helpers/matrix.yml b/helpers/matrix.yml
index 45a53c353..7dc71f9d3 100644
--- a/helpers/matrix.yml
+++ b/helpers/matrix.yml
@@ -35,3 +35,4 @@ APM_SERVER_SUITE:
 KUBERNETES_VERSION:
   - '1.15'
   - '1.16'
+  - '1.17'
diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile
index c8e07a69e..5f49abccd 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.16.10
-ENV HELM_VERSION=2.16.12
+ENV HELM_VERSION=2.17.0
 ENV DOCKER_VERSION=18.09.7
 ENV JQ_VERSION=1.6