Merge branch 'release-3.4' of https://github.com/argoproj/argo-workflows

 into release-3.4

Signed-off-by: Saravanan Balasubramanian <[email protected]>

.devcontainer/devcontainer.json

@@ -1,30 +1,23 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/debian
 {
-	"name": "Debian",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": { 
-			"VARIANT": "bullseye",
-			"NEW_USERNAME": "${localEnv:USER}",
-			"HOME": "${localEnv:HOME}",
-			"VSCODE_SCRIPT_VERSION": "v0.234.0"
-		}
-	},
-
-	"settings": {},
-
-	"extensions": [],
-
-	"mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
-
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-
-	"remoteUser": "${localEnv:USER}",
-	"features": {},
-
-	"workspaceMount": "source=${localWorkspaceFolder},target=${localEnv:HOME}/go/src/github.com/argoproj/argo-workflows,type=bind",
-	"workspaceFolder": "${localEnv:HOME}/go/src/github.com/argoproj/argo-workflows",
-
-	"postStartCommand": "bash -i .devcontainer/startup.sh"
+  "image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/devcontainers/features/go:1": {
+      "version": "1.19"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/python:1": {}
+  },
+  "hostRequirements": {
+    "cpus": 4
+  },
+  "onCreateCommand": ".devcontainer/pre-build.sh",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/vscode/go/src/github.com/argoproj/argo-workflows,type=bind",
+  "workspaceFolder": "/home/vscode/go/src/github.com/argoproj/argo-workflows"
+  "remoteEnv": {
+	"PATH": "${containerEnv:PATH}:/home/vscode/go/bin",
+    "GOPATH": "/home/vscode/go"
+  }
 }

.devcontainer/pre-build.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+set -eux
+
+# Add hosts
+sudo bash -c 'echo "127.0.0.1 dex" >> /etc/hosts'
+sudo bash -c 'echo "127.0.0.1 minio" >> /etc/hosts'
+sudo bash -c 'echo "127.0.0.1 postgres" >> /etc/hosts'
+sudo bash -c 'echo "127.0.0.1 mysql" >> /etc/hosts'
+sudo bash -c 'echo "127.0.0.1 azurite" >> /etc/hosts'
+
+# install kubernetes
+wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
+k3d cluster get k3s-default || k3d cluster create --image rancher/k3s:v1.27.3-k3s1 --wait
+k3d kubeconfig merge --kubeconfig-merge-default
+
+# install kubectl
+curl -LO https://dl.k8s.io/release/v1.27.3/bin/linux/$(go env GOARCH)/kubectl
+chmod +x ./kubectl
+sudo mv ./kubectl /usr/local/bin/kubectl
+kubectl cluster-info
+
+# install kit
+curl -q https://raw.githubusercontent.com/kitproj/kit/main/install.sh | sh
+
+# install protocol buffer compiler (protoc)
+sudo apt update
+sudo apt install -y protobuf-compiler
+
+# Make sure go path is owned by vscode
+sudo chown -R vscode:vscode /home/vscode/go
+
+# download dependencies and do first-pass compile
+CI=1 kit pre-up

.dockerignore

@@ -3,6 +3,9 @@
 *.iml
 *.md
 *.yaml
+.devcontainer
+# The .git folder gets modified every time git runs preventing caching of builds. Once removed, we must pass GIT_COMMIT as Docker build-args.
+.git
 .github
 .idea
 .run
@@ -12,9 +15,12 @@ coverage.out
 dist
 docs
 examples
+logs
 manifests
 plugins
 sdks
+site
+tasks.yaml
 test/e2e
 ui/dist
 ui/node_modules

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 
 contact_links:
   - name: Have you read the docs?
-    url: https://argoproj.github.io/argo-workflows/
+    url: https://argo-workflows.readthedoc.io/en/latest
     about: Much help can be found in the docs
   - name: Ask a question
     url: https://github.com/argoproj/argo-workflows/discussions/new

.github/dependabot.yml

@@ -25,4 +25,6 @@ updates:
     ignore:
       - dependency-name: raw-loader
       - dependency-name: style-loader
+      - dependency-name: react-router-dom
+      - dependency-name: @types/react-router-dom
     open-pull-requests-limit: 10

.github/pull_request_template.md

@@ -1,14 +1,25 @@
+TODO: Say why you made your changes.
+TODO: Say what changes you made.
+TODO: Say how you tested your changes.
+TODO: Attach screenshots if you changed the UI.
+
 Fixes #TODO
 
-Please do not open a pull request until you have checked ALL of these:
+<!--
+
+Do not open a PR until you have:
+
+* Run `make pre-commit -B` to fix codegen and lint problems (build will fail).
+* [Signed-off your commits](https://github.com/apps/dco/) (otherwise the DCO check will fail).
+* Used [a conventional commit message](https://www.conventionalcommits.org/en/v1.0.0/).
+
+
+When you open your PR
+
+* "Fixes #" is in both the PR title (for release notes) and this description (to automatically link and close the issue).
+* Create the PR as draft.
+* Once builds are green, mark your PR "Ready for review".
 
-* [ ] Create the PR as draft .
-* [ ] Run `make pre-commit -B` to fix codegen and lint problems.
-* [ ] Sign-off your commits (otherwise the DCO check will fail).
-* [ ] Use [a conventional commit message](https://www.conventionalcommits.org/en/v1.0.0/) (otherwise the commit message check will fail).
-* [ ] "Fixes #" is in both the PR title (for release notes) and this description (to automatically link and close the issue).
-* [ ] Add unit or e2e tests. Say how you tested your changes. If you changed the UI, attach screenshots.
-* [ ] Github checks are green.
-* [ ] Once required tests have passed, mark your PR "Ready for review".
+When changes are requested, please address them and then dismiss the review to get it reviewed again.
 
-If changes were requested, and you've made them, dismiss the review to get it reviewed again.
+-->

.github/workflows/changelog.yaml

@@ -25,7 +25,7 @@ jobs:
       - run: git tag -l 'v*'
       # avoid invoking `make` to reduce the risk of a Makefile bug failing this workflow
       - run: ./hack/changelog.sh > CHANGELOG.md
-      - uses: peter-evans/create-pull-request@v4
+      - uses: peter-evans/create-pull-request@v5
         with:
           title: 'docs: updated CHANGELOG.md'
           commit-message: 'docs: updated CHANGELOG.md'

.github/workflows/ci-build.yaml

@@ -20,12 +20,12 @@ jobs:
   tests:
     name: Unit Tests
     runs-on: ubuntu-latest
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.18"
+          go-version: "1.20"
           cache: true
       - run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
       # engineers just ignore this in PRs, so lets not even run it
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: docker/setup-buildx-action@v2
       - name: Build and export
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           tags: quay.io/argoproj/argoexec:latest
@@ -58,7 +58,7 @@ jobs:
   e2e-tests:
     name: E2E Tests
     runs-on: ubuntu-latest
-    timeout-minutes: 25
+    timeout-minutes: 30
     needs: [ argoexec-image ]
     env:
       KUBECONFIG: /home/runner/.kubeconfig
@@ -100,9 +100,9 @@ jobs:
         # needed by Kubernetes v1.25
         run: sudo apt-get -y install socat
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.18"
+          go-version: "1.20"
           cache: true
       - uses: actions/setup-java@v3
         if: ${{matrix.test == 'test-java-sdk'}}
@@ -117,7 +117,12 @@ jobs:
           cache: pip
       - name: Install and start K3S
         run: |
-          curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=${{matrix.install_k3s_version}} INSTALL_K3S_CHANNEL=stable INSTALL_K3S_EXEC=--docker K3S_KUBECONFIG_MODE=644 sh -
+          if ! echo "${{ matrix.install_k3s_version }}" | egrep '^v[0-9]+\.[0-9]+\.[0-9]+\+k3s1$'; then
+            export INSTALL_K3S_VERSION=v1.26.3+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 -
           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
@@ -140,25 +145,18 @@ jobs:
           echo '127.0.0.1 azurite'  | sudo tee -a /etc/hosts
       - run: make install PROFILE=${{matrix.profile}} STATIC_FILES=false
         name: Install manifests
-      - run: make controller $(go env GOPATH)/bin/goreman STATIC_FILES=false
+      - run: make controller kit STATIC_FILES=false
         name: Build controller
       - run: make cli STATIC_FILES=false
         if: ${{matrix.test == 'test-api' || matrix.test == 'test-cli' || matrix.test == 'test-java-sdk' || matrix.test == 'test-python-sdk'}}
         name: Build CLI
-      - run:  ./hack/port-forward.sh
-        name: Start port forward
-      - run: make start PROFILE=${{matrix.profile}} AUTH_MODE=client STATIC_FILES=false LOG_LEVEL=info API=${{matrix.test == 'test-api' || matrix.test == 'test-cli' || matrix.test == 'test-java-sdk' || matrix.test == 'test-python-sdk'}} UI=false LOGS=false > /tmp/argo.log 2>&1 &
+      - run: make start PROFILE=${{matrix.profile}} AUTH_MODE=client STATIC_FILES=false LOG_LEVEL=info API=${{matrix.test == 'test-api' || matrix.test == 'test-cli' || matrix.test == 'test-java-sdk' || matrix.test == 'test-python-sdk'}} UI=false > /tmp/argo.log 2>&1 &
         name: Start controller/API
-      - run: make wait
+      - run: make wait API=${{matrix.test == 'test-api' || matrix.test == 'test-cli' || matrix.test == 'test-java-sdk' || matrix.test == 'test-python-sdk'}}
         timeout-minutes: 4
         name: Wait for controller to be up
       - name: Run tests ${{matrix.test}}
-        # https://github.com/marketplace/actions/retry-step
-        uses: nick-fields/[email protected]
-        with:
-          timeout_minutes: 20
-          max_attempts: 2
-          command: make ${{matrix.test}} E2E_SUITE_TIMEOUT=20m STATIC_FILES=false
+        run: make ${{matrix.test}} E2E_SUITE_TIMEOUT=20m STATIC_FILES=false
       - if: ${{ failure() }}
         name: MinIO/MySQL deployment
         run: |
@@ -202,9 +200,9 @@ jobs:
       GOPATH: /home/runner/go
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.20"
           cache: true
       - name: Install protoc
         run: |
@@ -235,9 +233,9 @@ jobs:
       GOPATH: /home/runner/go
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.18"
+          go-version: "1.20"
           cache: true
       - run: make lint STATIC_FILES=false
       - run: git diff --exit-code
@@ -252,7 +250,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "20" # change in all GH Workflows
           cache: yarn
           cache-dependency-path: ui/yarn.lock
       - run: yarn --cwd ui install

.github/workflows/dependabot-reviewer.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
+        uses: dependabot/fetch-metadata@v1.5.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve PR

.github/workflows/gh-pages.yaml

@@ -23,12 +23,12 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "19"
       # Use the same make target both locally and on CI to make it easier to debug failures.
       - run: make docs
       # If markdownlint fixes issues, files will be changed. If so, fail the build.