feat: upgrade kustomize version to 3.5.4 (argoproj#3472)

superztc · Apr 23, 2020 · 4ae7013 · 4ae7013
1 parent 7660e40
commit 4ae7013
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -95,7 +95,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: argoproj/argocd-test-tools:v0.2.0
+      - image: argoproj/argocd-test-tools:v0.3.0
     working_directory: /go/src/github.com/argoproj/argo-cd
     steps:
       - prepare_environment
@@ -115,7 +115,7 @@ jobs:
 
   codegen:
     docker:
-      - image: argoproj/argocd-test-tools:v0.2.0
+      - image: argoproj/argocd-test-tools:v0.3.0
     working_directory: /go/src/github.com/argoproj/argo-cd
     steps:
       - prepare_environment
@@ -138,7 +138,7 @@ jobs:
   test:
     working_directory: /go/src/github.com/argoproj/argo-cd
     docker:
-      - image: argoproj/argocd-test-tools:v0.2.0
+      - image: argoproj/argocd-test-tools:v0.3.0
     steps:
       - prepare_environment
       - checkout
@@ -165,7 +165,7 @@ jobs:
   lint:
     working_directory: /go/src/github.com/argoproj/argo-cd
     docker:
-      - image: argoproj/argocd-test-tools:v0.2.0
+      - image: argoproj/argocd-test-tools:v0.3.0
     steps:
       - prepare_environment
       - checkout
@@ -194,7 +194,7 @@ jobs:
   sonarcloud:
     working_directory: /go/src/github.com/argoproj/argo-cd
     docker:
-      - image: argoproj/argocd-test-tools:v0.2.0
+      - image: argoproj/argocd-test-tools:v0.3.0
     environment:
       NODE_MODULES: /go/src/github.com/argoproj/argo-cd/ui/node_modules
     steps:

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ ARGOCD_PROCFILE?=Procfile
 # Configuration for building argocd-test-tools image
 TEST_TOOLS_NAMESPACE?=argoproj
 TEST_TOOLS_IMAGE=argocd-test-tools
-TEST_TOOLS_TAG?=v0.2.0
+TEST_TOOLS_TAG?=v0.3.0
 ifdef TEST_TOOLS_NAMESPACE
 TEST_TOOLS_PREFIX=${TEST_TOOLS_NAMESPACE}/
 endif

diff --git a/hack/installers/install-kustomize-linux.sh b/hack/installers/install-kustomize-linux.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
 
-KUSTOMIZE_VERSION=${KUSTOMIZE_VERSION:-3.2.1}
-DL=$DOWNLOADS/kustomize-${KUSTOMIZE_VERSION}
+KUSTOMIZE_VERSION=${KUSTOMIZE_VERSION:-3.5.4}
 
 # Note that kustomize release URIs have changed for v3.2.1. Then again for
 # v3.3.0. When upgrading to versions >= v3.3.0 please change the URI format. And
@@ -12,16 +11,23 @@ DL=$DOWNLOADS/kustomize-${KUSTOMIZE_VERSION}
 # v3.3.0 = https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.3.0/kustomize_v3.3.0_linux_amd64.tar.gz
 case $KUSTOMIZE_VERSION in
   2.*)
+    DL=$DOWNLOADS/kustomize-${KUSTOMIZE_VERSION}
     URL=https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64
     BINNAME=kustomize2
+    [ -e $DL ] || curl -sLf --retry 3 -o $DL $URL
+    mv $DL $BIN/$BINNAME
     ;;
   *)
-    URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_kustomize.v${KUSTOMIZE_VERSION}_linux_amd64
+    DL=$DOWNLOADS/kustomize-${KUSTOMIZE_VERSION}.tar.gz
+    URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
     BINNAME=kustomize
+
+    [ -e $DL ] || curl -sLf --retry 3 -o $DL $URL
+    tar -C /tmp -xf $DL
+    mv /tmp/kustomize $BIN/$BINNAME
     ;;
 esac
 
-[ -e $DL ] || curl -sLf --retry 3 -o $DL $URL
-cp $DL $BIN/$BINNAME
+
 chmod +x $BIN/$BINNAME
 $BINNAME version