Merge 2e16ce9787 into 77118ed413

Signed-off-by: Tao Li <tao.li@enterprisedb.com>

Taskfile.yml

@@ -177,7 +177,7 @@ tasks:
       - internal:wordlist-ordered
     env:
       # renovate: datasource=git-refs depName=spellcheck lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_SPELLCHECK_SHA: 7174b66d283da487638a98b431b7707b311a9a32
+      DAGGER_SPELLCHECK_SHA: 26cd57fb6ad66e88c036b675b0478d38df93962d
     internal: true
     cmds:
       - >
@@ -192,7 +192,7 @@ tasks:
     desc: Check for conventional commits
     env:
       # renovate: datasource=git-refs depName=commitlint lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_COMMITLINT_SHA: 7174b66d283da487638a98b431b7707b311a9a32
+      DAGGER_COMMITLINT_SHA: 26cd57fb6ad66e88c036b675b0478d38df93962d
     internal: true
     cmds:
       - >
@@ -211,7 +211,7 @@ tasks:
       - internal:wordlist-ordered
     env:
       # renovate: datasource=git-refs depName=uncommitted lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_UNCOMMITTED_SHA: 7174b66d283da487638a98b431b7707b311a9a32
+      DAGGER_UNCOMMITTED_SHA: 26cd57fb6ad66e88c036b675b0478d38df93962d
     internal: true
     cmds:
       - GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/uncommitted@${DAGGER_UNCOMMITTED_SHA} check-uncommitted --source . stdout
@@ -366,7 +366,7 @@ tasks:
     run: once
     env:
       # renovate: datasource=git-refs depName=controller-gen lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
-      DAGGER_CONTROLLER_GEN_SHA: 7174b66d283da487638a98b431b7707b311a9a32
+      DAGGER_CONTROLLER_GEN_SHA: 26cd57fb6ad66e88c036b675b0478d38df93962d
     internal: true
     cmds:
       - >
@@ -538,8 +538,11 @@ tasks:
         .
       - rm -f {{ .KUBECONFIG_PATH }}
 
+  # Run e2e tests on the kind cluster specified by KIND_CLUSTER_NAME
   integration:e2e:
     desc: Run the e2e tests
+    summary: |
+        Run e2e against the Kind cluster specified by KIND_CLUSTER_NAME
     deps:
       - integration:deploy-to-kind
     run: once
@@ -555,14 +558,8 @@ tasks:
         sh: docker inspect --format '{{"{{"}} (index (index .HostConfig.PortBindings "6443/tcp") 0).HostPort {{"}}"}}' {{ .KIND_CLUSTER_NAME }}-control-plane
     cmds:
       - kind get kubeconfig --name {{ .KIND_CLUSTER_NAME }} > {{ .KUBECONFIG_PATH }}
-      # kind writes the external server address as https://127.0.0.1:<port>, which is only valid on
+      - defer: rm -f {{ .KUBECONFIG_PATH }}
-      # the host. Rewrite it to the "kubernetes" alias that --svc below binds inside the dagger container.
       - >
-        sed -i.bak "s#server: https://[^:]*:[0-9]*#server: https://kubernetes:{{ .KIND_HOSTPORT }}#" {{ .KUBECONFIG_PATH }}
+        kubectl --kubeconfig={{.KUBECONFIG_PATH}} config set-cluster kind-{{.KIND_CLUSTER_NAME}}
-      - >
+        --server=https://127.0.0.1:{{.KIND_HOSTPORT}} --insecure-skip-tls-verify=true
-        GITHUB_REF= dagger call -m dagger/e2e/ run
+      - KUBECONFIG={{.KUBECONFIG_PATH}} go test ./test/e2e/... -v -ginkgo.v -timeout 45m
-        --source .
-        --kubeconfig {{.KUBECONFIG_PATH}}
-        --svc tcp://127.0.0.1:{{.KIND_HOSTPORT}}
-        --go-version {{.GO_VERSION}}
-      - rm -f {{ .KUBECONFIG_PATH }} {{ .KUBECONFIG_PATH }}.bak