Merge pull request #435 from jmlrt/k8s-115

[meta] add k8s 1.15 and drop k8s 1.12
elastic · Jan 8, 2020 · d458ad6 · d458ad6
2 parents d77b2ad + 57e4912
commit d458ad6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/helpers/matrix.yml b/helpers/matrix.yml
@@ -33,6 +33,6 @@ LOGSTASH_SUITE:
   - elasticsearch
   - 6.x
 KUBERNETES_VERSION:
-  - '1.12'
   - '1.13'
   - '1.14'
+  - '1.15'
diff --git 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.14.1
+ENV KUBECTL_VERSION=1.15.4
 ENV HELM_VERSION=2.16.1
 ENV DOCKER_VERSION=18.09.7
 

diff --git 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.14
+KUBERNETES_VERSION := 1.15
 CHART := elasticsearch
 SUITE := default
 NAMESPACE := helm-charts-testing
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,6 @@ LOGSTASH_SUITE: @@
       - elasticsearch
       - 6.x
     KUBERNETES_VERSION:
-      - '1.12'
       - '1.13'
       - '1.14'
+      - '1.15'