From 297aedb2e2b04881b157bd3828afac57e1ebf865 Mon Sep 17 00:00:00 2001 From: Dan Stough Date: Thu, 28 Oct 2021 23:30:04 +0000 Subject: [PATCH 1/2] fix: roll back kustomize to prevent dup key err --- deploy/Dockerfile | 5 +++-- hack/dev/Dockerfile.skaffold | 7 ++++--- pkg/cluster/init.go | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index bdc3f12dba..e10e6e0deb 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -83,13 +83,14 @@ RUN curl -fsSLO "${KUBECTL_1_21_URL}" \ # KOTS can be configured to use a specific version of kustomize by setting kustomizeVersion in the # kots.io/v1beta1.Application spec. The github.com/replicatedhq/kots/pkg/binaries package will # discover all kustomize binaries in the KOTS_KUSTOMIZE_BIN_DIR directory for use by KOTS. +# CURRENNTLY ONLY ONE VERSION IS SHIPPED BELOW ENV KOTS_KUSTOMIZE_BIN_DIR=/usr/local/bin # Install kustomize 3 -ENV KUSTOMIZE3_VERSION=3.10.0 +ENV KUSTOMIZE3_VERSION=3.8.10 ENV KUSTOMIZE3_URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE3_VERSION}/kustomize_v${KUSTOMIZE3_VERSION}_linux_amd64.tar.gz -ENV KUSTOMIZE3_SHA256SUM=bab4ab8881718c29ba174bdf677fd89986ad25c40eb363fec9e78c1aff2ff0ea +ENV KUSTOMIZE3_SHA256SUM=10281b6cd16a50fcbb4a762652bf5ab333633d37035fc7f76ee7b941b50b511d RUN curl -fsSL -o kustomize.tar.gz "${KUSTOMIZE3_URL}" \ && echo "${KUSTOMIZE3_SHA256SUM} kustomize.tar.gz" | sha256sum -c - \ && tar -xzvf kustomize.tar.gz \ diff --git a/hack/dev/Dockerfile.skaffold b/hack/dev/Dockerfile.skaffold index 2f388ba172..827bd668b0 100644 --- a/hack/dev/Dockerfile.skaffold +++ b/hack/dev/Dockerfile.skaffold @@ -112,11 +112,12 @@ ENV KOTS_KUSTOMIZE_BIN_DIR=/usr/local/bin # KOTS can be configured to use a specific version of kustomize by setting kustomizeVersion in the # kots.io/v1beta1.Application spec. The github.com/replicatedhq/kots/pkg/binaries package will # discover all kustomize binaries in the KOTS_KUSTOMIZE_BIN_DIR directory for use by KOTS. +# CURRENNTLY ONLY ONE VERSION IS SHIPPED BELOW # Install kustomize 3 -ENV KUSTOMIZE3_VERSION=3.10.0 -ENV KUSTOMIZE3_URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE3_VERSION}/kustomize_v${KUSTOMIZE3_VERSION}_linux_amd64.tar.gz -ENV KUSTOMIZE3_SHA256SUM=bab4ab8881718c29ba174bdf677fd89986ad25c40eb363fec9e78c1aff2ff0ea +ENV KUSTOMIZE3_VERSION=3.8.10 +ENV KUSTOMIZE3_URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE3_VERSION}/kustomize_v${KUSTOMIZE3_VERSION}_linux_amd64.tar.gz +ENV KUSTOMIZE3_SHA256SUM=10281b6cd16a50fcbb4a762652bf5ab333633d37035fc7f76ee7b941b50b511d RUN curl -fsSL -o kustomize.tar.gz "${KUSTOMIZE3_URL}" \ && echo "${KUSTOMIZE3_SHA256SUM} kustomize.tar.gz" | sha256sum -c - \ && tar -xzvf kustomize.tar.gz \ diff --git a/pkg/cluster/init.go b/pkg/cluster/init.go index d80c04de1f..eff5f3a078 100644 --- a/pkg/cluster/init.go +++ b/pkg/cluster/init.go @@ -28,7 +28,7 @@ import ( const ( KotsKubeVersion = "1.22.1" - KotsKustomizeVersion = "3.10.0" + KotsKustomizeVersion = "3.8.10" ) var ( From d28d67ce14d6df23a4f422a52eee88f8ce32e2e8 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Fri, 29 Oct 2021 09:20:04 -0400 Subject: [PATCH 2/2] spellcheck --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index e10e6e0deb..4a711ad119 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -83,7 +83,7 @@ RUN curl -fsSLO "${KUBECTL_1_21_URL}" \ # KOTS can be configured to use a specific version of kustomize by setting kustomizeVersion in the # kots.io/v1beta1.Application spec. The github.com/replicatedhq/kots/pkg/binaries package will # discover all kustomize binaries in the KOTS_KUSTOMIZE_BIN_DIR directory for use by KOTS. -# CURRENNTLY ONLY ONE VERSION IS SHIPPED BELOW +# CURRENTLY ONLY ONE VERSION IS SHIPPED BELOW ENV KOTS_KUSTOMIZE_BIN_DIR=/usr/local/bin