Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Permalink
[meta] add support for k8s 1.16 (elastic#635)
Browse files Browse the repository at this point in the history
* add CI tests for GKE 1.16
* add jq to Docker image
  • Loading branch information
jmlrt committed May 29, 2020
1 parent 6ab1454 commit 6b0f90a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions helpers/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ APM_SERVER_SUITE:
KUBERNETES_VERSION:
- '1.14'
- '1.15'
- '1.16'
8 changes: 7 additions & 1 deletion helpers/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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

0 comments on commit 6b0f90a

Please sign in to comment.