chore: Add compat for Argo CD 2.13 (#579)

Signed-off-by: Marco Maurer <[email protected]>

Author: mkilchhofer

.devcontainer.json

@@ -18,7 +18,7 @@
     },
     // https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube
     "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
-      "version": "1.27.11"
+      "version": "1.29.15"
     },
     // https://github.com/rio/features/tree/main/src/kustomize
     "ghcr.io/rio/features/kustomize:1": {},
@@ -34,4 +34,4 @@
   ],
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "scripts/testacc_prepare_env.sh" // pre-create the kind cluster with argocd installed
-}
+}

.github/workflows/tests.yml

@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.10.18", "v2.11.12", "v2.12.8"]
+        argocd_version: ["v2.11.13", "v2.12.10", "v2.13.5"]
         terraform_version: ["1.4.*"]
     steps:
       - name: Check out code

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.12.8
+ARGOCD_VERSION?=v2.13.5
 
 export
 

argocd/resource_argocd_cluster_test.go

@@ -38,10 +38,9 @@ func TestAccArgoCDCluster(t *testing.T) {
 						"shard",
 						"1",
 					),
-					resource.TestCheckResourceAttr(
+					resource.TestCheckResourceAttrSet(
 						"argocd_cluster.simple",
 						"info.0.server_version",
-						"1.27",
 					),
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.simple",
@@ -69,10 +68,9 @@ func TestAccArgoCDCluster(t *testing.T) {
 						"info.0.connection_state.0.status",
 						"Successful",
 					),
-					resource.TestCheckResourceAttr(
+					resource.TestCheckResourceAttrSet(
 						"argocd_cluster.tls",
 						"info.0.server_version",
-						"1.27",
 					),
 					resource.TestCheckResourceAttr(
 						"argocd_cluster.tls",

go.mod

@@ -27,9 +27,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"google.golang.org/protobuf/types/known/emptypb"
+	"k8s.io/apimachinery/pkg/util/runtime"
 )
 
-var runtimeErrorHandlers []func(error)
+var runtimeErrorHandlers []runtime.ErrorHandler
 
 type ServerInterface struct {
 	AccountClient        account.AccountServiceClient

go.sum

@@ -4,7 +4,8 @@ kind: Cluster
 name: argocd
 nodes:
   - role: control-plane
-    image: kindest/node:v1.27.11
+    # It seems that the latest .15 patch release is not available, use latest available one instead
+    image: kindest/node:v1.29.14
     extraPortMappings:
       - containerPort: 30123
         hostPort: 8080