Skip to content

Commit

Permalink
Merge branch 'main' into feature/apis/add-flush-api
Browse files Browse the repository at this point in the history
  • Loading branch information
kpango authored Dec 17, 2022
2 parents 3bdfaca + 07c198d commit 7da7962
Show file tree
Hide file tree
Showing 81 changed files with 15,842 additions and 4,310 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Vald",
"image": "vdaas/vald-dev-container:nightly",
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],

"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
Expand Down
6 changes: 6 additions & 0 deletions .github/actions/docker-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ runs:
pr_num=`cat $GITHUB_EVENT_PATH | jq -r ".number"`
echo "PR-${pr_num}" > versions/VALD_VERSION
primary_tag="pr-${pr_num}"
elif [ "${{ github.event_name }}" = "pull_request_target" ]; then
pr_num=`cat $GITHUB_EVENT_PATH | jq -r ".number"`
echo "PR-${pr_num}" > versions/VALD_VERSION
primary_tag="pr-${pr_num}"
else
primary_tag="unknown"
fi
Expand All @@ -86,6 +90,8 @@ runs:
if [ "${TARGET_PLATFORMS}" = "" ]; then
if [ "${{ github.event_name }}" = "pull_request" ]; then
platforms="linux/amd64"
elif [ "${{ github.event_name }}" = "pull_request_target" ]; then
platforms="linux/amd64"
else
platforms=`make docker/platforms`
fi
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-agent-ngt-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ on:
- "versions/GO_VERSION"
- "versions/NGT_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-agent-sidecar-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ on:
- "dockers/agent/sidecar/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-ci-container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ on:
- "versions/GO_VERSION"
- "versions/NGT_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-dev-container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ on:
schedule:
- cron: "0 1 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-discoverer-k8s-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ on:
- "dockers/discoverer/k8s/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-gateway-filter-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ on:
- "dockers/gateway/filter/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-gateway-lb-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ on:
- "dockers/gateway/lb/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-helm-operator-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ on:
- "charts/vald-helm-operator/templates/**"
- "versions/OPERATOR_SDK_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-image-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
schedule:
- cron: "0 1 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
agent-ngt:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-loadtest-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ on:
- "dockers/tools/cli/loadtest/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dockers-manager-index-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ on:
- "dockers/manager/index/Dockerfile"
- "versions/GO_VERSION"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
name: "Pull Request Labeler"
on:
- pull_request
- pull_request_target

jobs:
triage:
name: Triage
runs-on: ubuntu-latest
if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) || (github.event.pull_request.head.repo.fork == true && github.event_name == 'pull_request_target') }}
if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) }}
steps:
- uses: actions/labeler@v4
with:
Expand Down
24 changes: 21 additions & 3 deletions .github/workflows/reviewdog-markdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ on:
- "CHANGELOG.md"

jobs:
languagetool:
name: runner / LanguageTool
languagetool_apis_charts:
name: runner / LanguageTool / apis & charts
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -35,7 +35,25 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-review
patterns: "**/*.md **/*.md.gotmpl !**/CHANGELOG.md"
patterns: "apis/**/*.md apis/**/*.md.gotmpl charts/**/*.md !charts/vald/README.md"
level: warning
language: en-US
disabled_rules: "DOUBLE_PUNCTUATION,WORD_CONTAINS_UNDERSCORE,ARROWS,CURRENCY,DASH_RULE,EN_QUOTES"
disabled_categories: "TYPOS,TYPOGRAPHY,STYLE,CASING"
languagetool_docs:
name: runner / LanguageTool / Docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: set git config
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: LanguageTool
uses: reviewdog/action-languagetool@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-review
patterns: "**/*.md **/*.md.gotmpl !**/CHANGELOG.md !apis/** !charts/**"
level: warning
language: en-US
disabled_rules: "DOUBLE_PUNCTUATION,WORD_CONTAINS_UNDERSCORE,ARROWS,CURRENCY,DASH_RULE,EN_QUOTES"
Expand Down
Loading

0 comments on commit 7da7962

Please sign in to comment.