From 0b13fa006c893dd27047f98f988eccce2afc9e28 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 7 Jul 2021 19:07:26 -0400
Subject: [PATCH] Update Skaffold dependencies (#6155)

* update deps

* update deploy/skaffold/Dockerfile
---
 deploy/skaffold/Dockerfile      |  2 +-
 deploy/skaffold/Dockerfile.deps | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/deploy/skaffold/Dockerfile b/deploy/skaffold/Dockerfile
index 36ff5712768..c5280781de9 100644
--- a/deploy/skaffold/Dockerfile
+++ b/deploy/skaffold/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This base image has to be updated manually after running `make build_deps`
-FROM gcr.io/k8s-skaffold/build_deps:45b0b2b2c59e1b381f5386d6c960dd87c3a3c9d8 as build
+FROM gcr.io/k8s-skaffold/build_deps:6477c2b624b633dee1d4c66bdd02821d25ce3f86 as build
 WORKDIR /skaffold
 
 FROM build as builder
diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps
index b3970551d1b..0a36fd65458 100644
--- a/deploy/skaffold/Dockerfile.deps
+++ b/deploy/skaffold/Dockerfile.deps
@@ -14,29 +14,30 @@
 
 # Download kubectl
 FROM alpine:3.10 as download-kubectl
-# Track default version installed by Google Cloud SDK: 335.0.0 moved to 1.17(.17)
-ENV KUBECTL_VERSION v1.17.17
+# Track default version installed by Google Cloud SDK: 341.0.0 moved to 1.18(.18)
+# https://cloud.google.com/sdk/docs/release-notes
+ENV KUBECTL_VERSION v1.18.18
 ENV KUBECTL_URL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
 RUN wget -O kubectl "${KUBECTL_URL}"
 RUN chmod +x kubectl
 
 # Download helm (see https://github.com/helm/helm/releases/latest)
 FROM alpine:3.10 as download-helm
-ENV HELM_VERSION v3.5.4
+ENV HELM_VERSION v3.6.2
 ENV HELM_URL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz
 RUN wget -O helm.tar.gz "${HELM_URL}"
 RUN tar -xvf helm.tar.gz --strip-components 1
 
 # Download kustomize
 FROM alpine:3.10 as download-kustomize
-ENV KUSTOMIZE_VERSION 4.1.2
+ENV KUSTOMIZE_VERSION 4.2.0
 ENV KUSTOMIZE_URL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
 RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}"
 RUN tar -xvf kustomize.tar.gz
 
 # Download kpt
 FROM alpine:3.10 as download-kpt
-ENV KPT_VERSION 1.0.0-alpha.2
+ENV KPT_VERSION 1.0.0-beta.1
 ENV KPT_URL https://github.com/GoogleContainerTools/kpt/releases/download/v${KPT_VERSION}/kpt_linux_amd64
 RUN wget -O kpt "${KPT_URL}"
 RUN chmod +x kpt
@@ -57,28 +58,28 @@ RUN chmod +x container-structure-test
 
 # Download kind
 FROM alpine:3.10 as download-kind
-ENV KIND_VERSION v0.10.0
+ENV KIND_VERSION v0.11.1
 ENV KIND_URL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64
 RUN wget -O kind "${KIND_URL}"
 RUN chmod +x kind
 
 # Download k3d
 FROM alpine:3.10 as download-k3d
-ENV K3D_VERSION v4.4.2
+ENV K3D_VERSION v4.4.6
 ENV K3D_URL https://github.com/rancher/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64
 RUN wget -O k3d "${K3D_URL}"
 RUN chmod +x k3d
 
 # Download gcloud
 FROM alpine:3.10 as download-gcloud
-ENV GCLOUD_VERSION 335.0.0
+ENV GCLOUD_VERSION 347.0.0
 ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
 RUN wget -O gcloud.tar.gz "${GCLOUD_URL}"
 RUN tar -zxf gcloud.tar.gz
 
 # Download bazel
 FROM alpine:3.10 as download-bazel
-ENV BAZEL_VERSION 4.0.0
+ENV BAZEL_VERSION 4.1.0
 ENV BAZEL_URL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64
 RUN wget -O bazel "${BAZEL_URL}"
 RUN chmod +x bazel