From 49f811a3bf64bdf643b8efd74cd92ba065b34177 Mon Sep 17 00:00:00 2001 From: Nathanael Liechti Date: Sat, 19 Oct 2024 18:53:14 +0000 Subject: [PATCH] deps(ci): update Argo CD to 2.12 in CI Signed-off-by: Nathanael Liechti --- .github/workflows/tests.yml | 4 ++-- GNUmakefile | 2 +- argocd/resource_argocd_repository_test.go | 2 +- go.mod | 2 -- scripts/testacc_prepare_env.sh | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b9b8d6e2..bede28f5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - argocd_version: ["v2.9.22", "v2.10.17", "v2.11.9"] + argocd_version: ["v2.10.18", "v2.11.12", "v2.12.7"] steps: - name: Check out code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -64,7 +64,7 @@ jobs: curl -sL "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash chmod +x ./kustomize - - name: Install Kind 0.20.0 + - name: Install Kind 0.24.0 run: | curl -sLo ./kind https://kind.sigs.k8s.io/dl/v0.20.0/kind-$(uname)-amd64 chmod +x ./kind diff --git a/GNUmakefile b/GNUmakefile index 6f6e4f12..fa94e39e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,7 @@ ARGOCD_INSECURE?=true ARGOCD_SERVER?=127.0.0.1:8080 ARGOCD_AUTH_USERNAME?=admin ARGOCD_AUTH_PASSWORD?=acceptancetesting -ARGOCD_VERSION?=v2.9.3 +ARGOCD_VERSION?=v2.12.7 export diff --git a/argocd/resource_argocd_repository_test.go b/argocd/resource_argocd_repository_test.go index e468c7c3..39c5d771 100644 --- a/argocd/resource_argocd_repository_test.go +++ b/argocd/resource_argocd_repository_test.go @@ -193,7 +193,7 @@ resource "argocd_project" "simple" { } resource "argocd_repository" "helm" { - repo = "https://helm.nginx.com/stable" + repo = "https://helm.nginx.com/stable/" name = "nginx-stable-scoped" type = "helm" project = "%[1]s" diff --git a/go.mod b/go.mod index e648e87e..67c643d3 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/argoproj-labs/terraform-provider-argocd go 1.22.7 -toolchain go1.22.8 - require ( github.com/Masterminds/semver/v3 v3.3.0 github.com/ProtonMail/gopenpgp/v2 v2.8.0 diff --git a/scripts/testacc_prepare_env.sh b/scripts/testacc_prepare_env.sh index 1d152266..c33b6164 100755 --- a/scripts/testacc_prepare_env.sh +++ b/scripts/testacc_prepare_env.sh @@ -4,7 +4,7 @@ set -e export PATH=$PATH:. -argocd_version=${ARGOCD_VERSION:-v2.11.9} +argocd_version=${ARGOCD_VERSION:-v2.12.7} k8s_version=${ARGOCD_KUBERNETES_VERSION:-v1.27.11} echo "\n--- Clearing current kube context\n"