Merge branch 'main' into feat-10398

Signed-off-by: Mason Malone <[email protected]>

.devcontainer/devcontainer.json

@@ -3,15 +3,15 @@
   "appPort": 8080,
   "features": {
     "ghcr.io/devcontainers/features/go:1": {
-      "version": "1.22"
+      "version": "1.23"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "20"
     },
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
     "ghcr.io/devcontainers/features/python:1": {}
   },
-  "forwardPorts": [9000, 9001, 9090, 2746, 8080, 5556, 6060, 9091, 3306, 5432, 10000],
+  "forwardPorts": [9000, 9001, 9090, 2746, 8080, 5556, 6060, 9091, 3306, 5432, 10000, 8000],
   "hostRequirements": {
     "cpus": 4
   },
@@ -29,5 +29,29 @@
   "remoteEnv": {
     "PATH": "${containerEnv:PATH}:/home/vscode/go/bin",
     "GOPATH": "/home/vscode/go"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "launch": {
+          "configurations": [
+              {
+                  "name": "Attach to argo server",
+                  "type": "go",
+                  "request": "attach",
+                  "mode": "local",
+                  "processId": "argo"
+              },
+              {
+                  "name": "Attach to workflow controller",
+                  "type": "go",
+                  "request": "attach",
+                  "mode": "local",
+                  "processId": "workflow-controller"
+              }
+          ]
+        }
+      }
+    }
   }
 }

.github/workflows/ci-build.yaml

@@ -59,6 +59,9 @@ jobs:
               - Dockerfile
               - manifests/**
               - sdks/**
+              # example test suite
+              - examples/**
+              - hack/test-examples.sh
             codegen:
               - *common
               # generated files
@@ -114,7 +117,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
       - name: Upload coverage report
@@ -136,7 +139,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       # windows run does not use makefile target because it does a lot more than just testing and is not cross-platform compatible
       - run: go test -p 20 -covermode=atomic -coverprofile='coverage.out' $(go list ./... | select-string -Pattern 'github.com/argoproj/argo-workflows/v3/workflow/controller' , 'github.com/argoproj/argo-workflows/v3/server' -NotMatch)
@@ -186,7 +189,9 @@ jobs:
     needs: [ changed-files, argo-images ]
     if: ${{ needs.changed-files.outputs.e2e-tests == 'true' }}
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    # These tests usually finish in ~25m, but occasionally they take much longer due to resource
+    # contention on the runner, which we have no control over.
+    timeout-minutes: 60
     env:
       KUBECONFIG: /home/runner/.kubeconfig
       E2E_ENV_FACTOR: 2
@@ -196,53 +201,61 @@ jobs:
         include:
           - test: test-executor
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-corefunctional
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-functional
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-api
             profile: mysql
-            useApi: true
+            use-api: true
           - test: test-cli
             profile: mysql
-            useApi: true
+            use-api: true
           - test: test-cron
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-examples
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-plugins
             profile: plugins
-            useApi: false
+            use-api: false
           - test: test-java-sdk
             profile: minimal
-            useApi: true
+            use-api: true
           - test: test-python-sdk
             profile: minimal
-            useApi: true
+            use-api: true
           - test: test-executor
-            install_k3s_version: v1.28.11+k3s1
+            install_k3s_version: v1.28.13+k3s1
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-corefunctional
-            install_k3s_version: v1.28.11+k3s1
+            install_k3s_version: v1.28.13+k3s1
             profile: minimal
-            useApi: false
+            use-api: false
           - test: test-functional
-            install_k3s_version: v1.28.11+k3s1
+            install_k3s_version: v1.28.13+k3s1
             profile: minimal
-            useApi: false
+            use-api: false
     steps:
+      - name: Free up unused disk space
+        run: |
+          printf "==> Available space before cleanup\n"
+          df -h
+          # these directories are not used by E2E tests
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/local/.ghcup /opt/hostedtoolcache/CodeQL
+          printf "==> Available space after cleanup\n"
+          df -h
       - name: Install socat (needed by Kubernetes)
         run: sudo apt-get -y install socat
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - name: Install Java for the SDK
         if: ${{matrix.test == 'test-java-sdk'}}
@@ -260,11 +273,15 @@ jobs:
       - name: Install and start K3S
         run: |
           if ! echo "${{ matrix.install_k3s_version }}" | egrep '^v[0-9]+\.[0-9]+\.[0-9]+\+k3s1$'; then
-            export INSTALL_K3S_VERSION=v1.30.2+k3s1
+            export INSTALL_K3S_VERSION=v1.31.0+k3s1
           else
             export INSTALL_K3S_VERSION=${{ matrix.install_k3s_version }}
           fi
-          curl -sfL https://get.k3s.io | INSTALL_K3S_CHANNEL=stable INSTALL_K3S_EXEC=--docker K3S_KUBECONFIG_MODE=644 sh -
+
+          curl -sfL https://get.k3s.io | INSTALL_K3S_CHANNEL=stable \
+            INSTALL_K3S_EXEC="--docker --kubelet-arg=config=${GITHUB_WORKSPACE}/test/e2e/manifests/kubelet-configuration.yaml" \
+            K3S_KUBECONFIG_MODE=644 \
+            sh -
           until kubectl --kubeconfig=/etc/rancher/k3s/k3s.yaml cluster-info ; do sleep 10s ; done
           cp /etc/rancher/k3s/k3s.yaml /home/runner/.kubeconfig
           echo "- name: fake_token_user" >> $KUBECONFIG
@@ -294,22 +311,25 @@ jobs:
         run: make controller kit STATIC_FILES=false
       - name: Build CLI
         run: make cli STATIC_FILES=false
-        if: ${{matrix.useApi}}
+        if: ${{matrix.use-api}}
       - name: Start controller/API
         run: |
           make start PROFILE=${{matrix.profile}} \
             AUTH_MODE=client STATIC_FILES=false \
             LOG_LEVEL=info \
-            API=${{matrix.useApi}} \
+            API=${{matrix.use-api}} \
             UI=false \
             POD_STATUS_CAPTURE_FINALIZER=true > /tmp/argo.log 2>&1 &
       - name: Wait for controller to be up
-        run: make wait API=${{matrix.useApi}}
+        run: make wait PROFILE=${{matrix.profile}} API=${{matrix.use-api}}
         timeout-minutes: 5
       - name: Run tests ${{matrix.test}}
         run: make ${{matrix.test}} E2E_SUITE_TIMEOUT=20m STATIC_FILES=false
 
       # failure debugging below
+      - name: Failure debug - k3s logs
+        if: ${{ failure() }}
+        run: journalctl -u k3s
       - name: Failure debug - describe MinIO/MySQL deployment
         if: ${{ failure() }}
         run: |
@@ -375,7 +395,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - name: Install protoc
         run: |
@@ -412,7 +432,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - run: make lint STATIC_FILES=false
       # if lint makes changes that are not in the PR, fail the build

.github/workflows/docs.yaml

@@ -25,7 +25,7 @@ jobs:
           python-version: 3.9
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version: "19"

.github/workflows/release.yaml

@@ -291,7 +291,7 @@ jobs:
           node-version: "20" # change in all GH Workflows
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Restore node packages cache
         uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:

.gitignore

@@ -40,6 +40,7 @@ git-ask-pass.sh
 sdks/python/client/dist/*
 /v3/
 /cmd/argoexec/commands/test.txt
+/db-dumps/
 
 # Do not commit rendered installation manifests since they are misleading to users.
 manifests/install.yaml

.golangci.yml

@@ -15,8 +15,8 @@ linters:
     - asasalint
     - bidichk
     - bodyclose
+    - copyloopvar
     - errcheck
-    - exportloopref
     - goimports
     # only minor issues
     # - errorlint

.spelling

@@ -72,6 +72,7 @@ JetBrains
 KNative
 Kaniko
 Katacoda
+Katib
 Kerberos
 Killercoda
 KubectlExec
@@ -82,6 +83,7 @@ Lifecycle-Hook
 LitmusChaos
 MLOps
 Makefile
+Metaflow
 MinIO
 Minikube
 MySQL
@@ -100,7 +102,9 @@ PVCs
 Peixuan
 Ploomber
 Postgres
+PriorityClass
 RCs
+Risc-V
 Roadmap
 RoleBinding
 SDKs
@@ -208,6 +212,7 @@ stateful
 stderr
 symlinks
 temporality
+tolerations
 triaged
 un-reconciled
 v1