From ae98294b88d8d67c2d9bad84fc358d08f414ee4d Mon Sep 17 00:00:00 2001
From: jmlrt <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:38:06 +0100
Subject: [PATCH] [meta] add support for k8s 1.22

This commit add CI tests on GKE 1.22.
Also update default K8S version to 1.21.6.
---
 helpers/matrix.yml           | 1 +
 helpers/terraform/Dockerfile | 2 +-
 helpers/terraform/Makefile   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helpers/matrix.yml b/helpers/matrix.yml
index 733422028..e60f1007e 100644
--- a/helpers/matrix.yml
+++ b/helpers/matrix.yml
@@ -40,3 +40,4 @@ KUBERNETES_VERSION:
   - "1.19"
   - "1.20"
   - "1.21"
+  - "1.22"
diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile
index 163f265fb..3f7a0b95c 100644
--- a/helpers/terraform/Dockerfile
+++ b/helpers/terraform/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:7
 
 ENV VAULT_VERSION 0.9.3
 ENV TERRAFORM_VERSION=0.11.7
-ENV KUBECTL_VERSION=1.19.9
+ENV KUBECTL_VERSION=1.21.6
 ENV HELM_VERSION=3.8.0
 ENV DOCKER_VERSION=18.09.7
 ENV JQ_VERSION=1.6
diff --git a/helpers/terraform/Makefile b/helpers/terraform/Makefile
index 766099cd3..322d1cd74 100644
--- a/helpers/terraform/Makefile
+++ b/helpers/terraform/Makefile
@@ -1,6 +1,6 @@
 GOOGLE_PROJECT := elastic-ci-prod
 CLUSTER_NAME := helm-elasticsearch-test
-KUBERNETES_VERSION := 1.19
+KUBERNETES_VERSION := 1.21
 CHART := elasticsearch
 SUITE := default
 NAMESPACE := helm-charts-testing