Skip to content

Commit

Permalink
Merge branch 'master' of github.com:argoproj/argo-workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
yangxue.chen committed Sep 23, 2022
2 parents 55b8283 + e6eb02f commit 588f7f7
Show file tree
Hide file tree
Showing 1,026 changed files with 99,884 additions and 54,705 deletions.
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Allow unlimited column length, rather than 80. This prevents word-wrapping comments, which end up in Swagger.
ColumnLimit: 0
41 changes: 41 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/debian/.devcontainer/base.Dockerfile

ARG VARIANT="bullseye"
FROM --platform=linux/amd64 mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}

ARG NEW_USERNAME=""
ARG HOME=""
ARG OLD_USERNAME="vscode"
ARG VSCODE_SCRIPT_VERSION=""

ARG PROTOC_ZIP="protoc-3.14.0-linux-x86_64.zip"
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get install -y apt-transport-https ca-certificates git sudo \
# use new user instead of vscode user
&& usermod -l $NEW_USERNAME -d /home/$NEW_USERNAME -m $OLD_USERNAME \
&& groupmod -n $NEW_USERNAME $OLD_USERNAME \
&& echo $NEW_USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$NEW_USERNAME \
&& chmod 0440 /etc/sudoers.d/$NEW_USERNAME \
# kubectl
&& curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list \
&& apt-get update \
&& apt-get install -y kubectl \
# protobuf
&& curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/${PROTOC_ZIP} \
&& unzip -o ${PROTOC_ZIP} -d /usr/local bin/protoc \
&& unzip -o ${PROTOC_ZIP} -d /usr/local 'include/*' \
&& rm -f ${PROTOC_ZIP} \
&& chmod 755 /usr/local/bin/protoc \
&& chmod -R 755 /usr/local/include/ \
# k3d
&& wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash \
# go
&& bash -ec "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/$VSCODE_SCRIPT_VERSION/script-library/go-debian.sh")" -- "1.18" "/usr/local/go" "$HOME/go" "automatic" "true" "false" \
# dind
&& bash -ec "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/$VSCODE_SCRIPT_VERSION/script-library/docker-in-docker-debian.sh")" -- "true" "automatic" "true" "20.10" "v1" \
# node
&& bash -ec "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/$VSCODE_SCRIPT_VERSION/script-library/node-debian.sh")" -- "/usr/local/share/nvm" "16" "automatic" "true" "true" \
# python
&& bash -ec "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/$VSCODE_SCRIPT_VERSION/script-library/python-debian.sh")" -- "3.9" \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
30 changes: 30 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// 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",

"postCreateCommand": "bash -i .devcontainer/startup.sh"
}
18 changes: 18 additions & 0 deletions .devcontainer/startup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
set -e

sudo apt update
sudo chown $USER:docker /var/run/docker.sock
sudo chown -fR $USER:golang $GOPATH

echo $'127.0.0.1 dex\n127.0.0.1 minio\n127.0.0.1 postgres\n127.0.0.1 mysql\n127.0.0.1 azurite' | sudo tee -a /etc/hosts

if k3d cluster list | grep k3s-default;
then
echo "skip k3s creation, k3s-default cluster already exist"
else
k3d cluster create
fi

until k3d cluster start --wait ; do sleep 5 ; done
k3d kubeconfig merge k3s-default --kubeconfig-merge-default --kubeconfig-switch-context
48 changes: 0 additions & 48 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Reproducible bug report
description: Create a reproducible bug report. Not for support requests.
labels: [ bug ]
body:
- type: checkboxes
id: terms
attributes:
label: Pre-requisites
options:
- label: I have double-checked my configuration
required: true
- label: I can confirm the issues exists when I tested with `:latest`
required: true
- label: I'd like to contribute the fix myself (see [contributing guide](https://github.com/argoproj/argo-workflows/blob/master/docs/CONTRIBUTING.md))
- type: textarea
id: description
attributes:
label: What happened/what you expected to happen?
validations:
required: true
- type: input
id: version
attributes:
label: Version
placeholder: e.g. v3.3.8 or latest
validations:
required: true
- type: textarea
id: failing-workflow
attributes:
label: Paste a small workflow that reproduces the issue. We must be able to run the workflow; don't enter a workflows that uses private images.
render: YAML
validations:
required: true
- type: textarea
id: controller-logs
attributes:
label: Logs from the workflow controller
value: kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
validations:
required: true
- type: textarea
id: wait-logs
attributes:
label: Logs from in your workflow's wait container
value: kubectl logs -c wait -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
validations:
required: true
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ contact_links:
- name: Chat on Slack
url: https://argoproj.github.io/community/join-slack
about: Maybe chatting with the community can help
- name: 30m to talk anything Argo
url: https://bit.ly/book-30m-with-argo-team
about: Sign-up for 30m with the core Argo engineers
46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/regression.md

This file was deleted.

49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/regression.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Regression report
description: Create a regression report. Not for support requests.
labels: [ bug, regression ]

body:
- type: checkboxes
id: terms
attributes:
label: Pre-requisites
options:
- label: I have double-checked my configuration
required: true
- label: I can confirm the issues exists when I tested with `:latest`
required: true
- label: I'd like to contribute the fix myself (see [contributing guide](https://github.com/argoproj/argo-workflows/blob/master/docs/CONTRIBUTING.md))
- type: textarea
id: description
attributes:
label: What happened/what you expected to happen?
validations:
required: true
- type: input
id: version
attributes:
label: Version
placeholder: e.g. v3.3.8 or latest
validations:
required: true
- type: textarea
id: failing-workflow
attributes:
label: Paste a small workflow that reproduces the issue. We must be able to run the workflow; don't enter a workflows that uses private images.
render: YAML
validations:
required: true
- type: textarea
id: controller-logs
attributes:
label: Logs from the workflow controller
value: kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
validations:
required: true
- type: textarea
id: wait-logs
attributes:
label: Logs from in your workflow's wait container
value: kubectl logs -c wait -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
validations:
required: true
18 changes: 15 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,26 @@ updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "saturday"
ignore:
- dependency-name: k8s.io/*
- dependency-name: github.com/grpc-ecosystem/*
- dependency-name: google.golang.org/grpc
open-pull-requests-limit: 2
open-pull-requests-limit: 10

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "saturday"

- package-ecosystem: "npm"
directory: "/ui"
schedule:
interval: "weekly"
day: "saturday"
ignore:
- dependency-name: raw-loader
- dependency-name: style-loader
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you did not do this, reset all your commit and replace them with a single com
```
git reset HEAD~1 ;# change 1 to how many commits you made
git commit --sign-off -m 'feat: my feat. Fixes #1234'
git commit --signoff -m 'feat: my feat. Fixes #1234'
```
When creating your PR:
Expand Down
13 changes: 7 additions & 6 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# https://probot.github.io/apps/stale/
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 7
daysUntilStale: 14
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 3
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- enhancement
- mentoring
- pinned
- security
- tech-debt
Expand All @@ -15,7 +14,9 @@ staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
recent activity. It will be closed if no further activity occurs. If this is a mentoring request,
please provide an update here. Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
closeComment: >
This issue has been closed due to inactivity. Feel free to re-open if you
still encounter this issue.
6 changes: 6 additions & 0 deletions .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ on:
tags:
- v*
- "!v0.0.0"
permissions:
contents: read

jobs:
generate_changelog:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
if: github.repository == 'argoproj/argo-workflows'
runs-on: ubuntu-latest
name: Generate changelog
Expand Down
Loading

0 comments on commit 588f7f7

Please sign in to comment.