Match Argo CD v2.1 tool versions

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [v0.7.0] - 2021-08-26
+### Changed
+- Replace `argocd-util` by `argocd`
+- Upgrade Helm to v3.6.0
+- Upgrade Kustomize to v4.2.0
+- Upgrade Argo CD to v2.1.1
+
 ## [v0.6.0] - 2021-07-12
 ### Added
 - Add `argocd-util`
@@ -54,7 +61,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial commit
 
-[Unreleased]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.7.0...HEAD
+[v0.7.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.5.0...v0.7.0
 [v0.6.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.5.0...v0.6.0
 [v0.5.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.4.0...v0.5.0
 [v0.4.0]: https://github.com/PaytmLabs/docker-kubernetes-ci/compare/v0.3.2...v0.4.0

Dockerfile

@@ -13,13 +13,13 @@ RUN apk add --no-cache git \
 
 FROM alpine:3
 
-ARG ARGOCD_VERSION=2.0.4
+ARG ARGOCD_VERSION=2.1.1
 ARG HELM2_VERSION=2.17.0
-ARG HELM_VERSION=3.5.1
+ARG HELM_VERSION=3.6.0
 ARG JB_VERSION=0.4.0
 ARG JSONNET_VERSION=0.17.0
 ARG KUBEVAL_VERSION=0.16.1
-ARG KUSTOMIZE_VERSION=3.9.4
+ARG KUSTOMIZE_VERSION=4.2.0
 ARG PROMETHEUS_VERSION=2.28.0
 
 SHELL ["/bin/ash", "-euo", "pipefail", "-c"]
@@ -31,8 +31,8 @@ RUN apk add --no-cache --virtual .builddeps \
        bash \
        git \
        jq \
-    && curl -sSfL "https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-util-linux-amd64" -o /usr/local/bin/argocd-util \
-    && chmod +x /usr/local/bin/argocd-util \
+    && curl -sSfL "https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-amd64" -o /usr/local/bin/argocd \
+    && chmod +x /usr/local/bin/argocd \
     && curl -sSfL "https://github.com/google/go-jsonnet/releases/download/v${JSONNET_VERSION}/go-jsonnet_${JSONNET_VERSION}_Linux_x86_64.tar.gz" \
         | tar -zxvf - -C /usr/local/bin jsonnet jsonnetfmt \
     && curl -sSfL "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" \

test.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-readonly ARGOCD_VERSION=2.0.4
+readonly ARGOCD_VERSION=2.1.1
 readonly HELM2_VERSION=2.17.0
-readonly HELM_VERSION=3.5.1
+readonly HELM_VERSION=3.6.0
 readonly JB_VERSION=0.4.0
 readonly JSONNET_VERSION=0.17.0
-readonly KUSTOMIZE_VERSION=3.9.4
+readonly KUSTOMIZE_VERSION=4.2.0
 readonly KUBEVAL_VERSION=0.16.1
 readonly PROMETHEUS_VERSION=2.28.0
 
@@ -22,8 +22,8 @@ if ! jq --help >/dev/null; then
   exit 1
 fi
 
-printf ">>> Checking argocd-util version is %s...\n" "${ARGOCD_VERSION}"
-[[ "$(argocd-util version --short)" == "argocd-util: v${ARGOCD_VERSION}+"* ]]
+printf ">>> Checking argocd version is %s...\n" "${ARGOCD_VERSION}"
+[[ "$(argocd version --client --short)" == "argocd: v${ARGOCD_VERSION}+"* ]]
 
 printf ">>> Checking helm version is %s...\n" "${HELM_VERSION}"
 [[ "$(helm version --template '{{.Version}}')" == "v${HELM_VERSION}" ]]