Skip to content

Commit

Permalink
Merge pull request #2279 from replicatedhq/danstough/sc-38819/kustomi…
Browse files Browse the repository at this point in the history
…ze-update-causing-deployments-with

fix: roll back kustomize to prevent dup key err
  • Loading branch information
Dan Stough committed Oct 29, 2021
2 parents 6354645 + d28d67c commit 42e6ef4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions deploy/Dockerfile
Expand Up @@ -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.
# CURRENTLY 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 \
Expand Down
7 changes: 4 additions & 3 deletions hack/dev/Dockerfile.skaffold
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/init.go
Expand Up @@ -28,7 +28,7 @@ import (

const (
KotsKubeVersion = "1.22.1"
KotsKustomizeVersion = "3.10.0"
KotsKustomizeVersion = "3.8.10"
)

var (
Expand Down

0 comments on commit 42e6ef4

Please sign in to comment.