From 6b0f90a5e6efeaaa18853722af0e56d7e39740d9 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Sat, 30 May 2020 00:05:14 +0200
Subject: [PATCH] [meta] add support for k8s 1.16 (#635)

* add CI tests for GKE 1.16
* add jq to Docker image
---
 helpers/matrix.yml           | 1 +
 helpers/terraform/Dockerfile | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/helpers/matrix.yml b/helpers/matrix.yml
index dd2c34bd5..416a4f8d6 100644
--- a/helpers/matrix.yml
+++ b/helpers/matrix.yml
@@ -33,3 +33,4 @@ APM_SERVER_SUITE:
 KUBERNETES_VERSION:
   - '1.14'
   - '1.15'
+  - '1.16'
diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile
index 3c0294060..09057aca0 100644
--- a/helpers/terraform/Dockerfile
+++ b/helpers/terraform/Dockerfile
@@ -2,9 +2,10 @@ FROM centos:7
 
 ENV VAULT_VERSION 0.9.3
 ENV TERRAFORM_VERSION=0.11.7
-ENV KUBECTL_VERSION=1.15.4
+ENV KUBECTL_VERSION=1.16.10
 ENV HELM_VERSION=2.16.7
 ENV DOCKER_VERSION=18.09.7
+ENV JQ_VERSION=1.6
 
 RUN yum -y install \
     make \
@@ -44,3 +45,8 @@ RUN curl -O https://download.docker.com/linux/static/stable/x86_64/docker-${DOCK
     mv docker/docker /usr/local/bin && \
     rm -rf docker/ && \
     docker
+
+RUN curl -O -L https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
+    mv jq-linux64 /usr/local/bin/jq && \
+    chmod a+x /usr/local/bin/jq && \
+    jq --version