Commit a31654f8 authored by Jason Plum's avatar Jason Plum
Browse files

Merge branch 'kubectl-1-16' into 'master'

Update our kubectl version to 1.16

See merge request gitlab-org/build/CNG!688
parents d873199e 3e395a72
Pipeline #5551 failed with stages
in 46 seconds
......@@ -10,7 +10,7 @@ variables:
GITLAB_PAGES_VERSION: "master"
GIT_VERSION: "2.29.0"
GO_VERSION: "1.16.3"
KUBECTL_VERSION: "1.14.10"
KUBECTL_VERSION: "1.16.15"
PG_VERSION: "13.2"
MAILROOM_VERSION: "0.0.12"
ALPINE_VERSION: "3.10"
......
# ARGS for entire build
ARG KUBECTL_VERSION="1.14.10"
ARG KUBECTL_VERSION="1.16.15"
ARG FROM_IMAGE="debian"
FROM ${FROM_IMAGE}:buster-slim
......
......@@ -2,7 +2,7 @@ ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.4
FROM ${UBI_IMAGE}
ARG KUBECTL_VERSION=1.14.10
ARG KUBECTL_VERSION=1.16.15
ARG YQ_VERSION=2.4.1
ADD https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl /assets/usr/local/bin/kubectl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment