Skip to content

Commit 90bcde9

Browse files
committed
Merge remote-tracking branch 'kruise-up/master' into feat/cloneset-progressDeadlineSeconds-proposal
2 parents 1a655ea + 2d3e0be commit 90bcde9

File tree

7,455 files changed

+15597
-2060690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,455 files changed

+15597
-2060690
lines changed

.github/dependabot.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This YAML configuration file is used to enable Dependabot for automated dependency management.
2+
# Dependabot helps keep the project's dependencies up-to-date by automatically creating pull requests
3+
# for outdated dependencies based on the version constraints defined in your project.
4+
# For more information and customization options, please refer to the Dependabot documentation:
5+
# Documentation: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically
6+
# Configuration options: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
7+
version: 2
8+
updates:
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
# Allow up to 10 open pull requests for update github-actions
12+
# 5 by default
13+
# see https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit
14+
open-pull-requests-limit: 10
15+
schedule:
16+
# Check for updates to GitHub Actions every week
17+
interval: "weekly"

.github/workflows/ci.yaml

+32-26
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ on:
88
pull_request: {}
99
workflow_dispatch: {}
1010

11+
# Declare default permissions as read only.
12+
permissions: read-all
13+
1114
env:
1215
# Common versions
13-
GO_VERSION: '1.19'
16+
GO_VERSION: '1.20'
1417
GOLANGCI_VERSION: 'v1.55.2'
1518
DOCKER_BUILDX_VERSION: 'v0.4.2'
1619

@@ -26,25 +29,27 @@ jobs:
2629
runs-on: ubuntu-20.04
2730
steps:
2831
- name: Checkout Actions Repository
29-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3033
- name: Check spelling with custom config file
31-
uses: crate-ci/typos@v1.13.10
34+
uses: crate-ci/typos@v1.23.1
3235
with:
3336
config: ./typos.toml
3437

3538
golangci-lint:
3639
runs-on: ubuntu-20.04
40+
permissions:
41+
security-events: write
3742
steps:
3843
- name: Checkout Code
39-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
4045
with:
4146
submodules: true
4247
- name: Setup Go
43-
uses: actions/setup-go@v3
48+
uses: actions/setup-go@v5
4449
with:
4550
go-version: ${{ env.GO_VERSION }}
4651
- name: Cache Go Dependencies
47-
uses: actions/cache@v2
52+
uses: actions/cache@v4
4853
with:
4954
path: ~/go/pkg/mod
5055
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -53,7 +58,7 @@ jobs:
5358
run: |
5459
make generate
5560
- name: Lint golang code
56-
uses: golangci/golangci-lint-action@v4.0.0
61+
uses: golangci/golangci-lint-action@v6.0.1
5762
with:
5863
version: ${{ env.GOLANGCI_VERSION }}
5964
args: --verbose
@@ -68,24 +73,25 @@ jobs:
6873
output: 'trivy-results.sarif'
6974
severity: 'CRITICAL'
7075
- name: Upload Trivy scan results to GitHub Security tab
71-
uses: github/codeql-action/upload-sarif@v2
76+
uses: github/codeql-action/upload-sarif@v3
7277
with:
7378
sarif_file: 'trivy-results.sarif'
7479

75-
markdownlint-misspell-shellcheck:
76-
runs-on: ubuntu-20.04
77-
# this image is build from Dockerfile
78-
# https://github.com/pouchcontainer/pouchlinter/blob/master/Dockerfile
79-
container: pouchcontainer/pouchlinter:v0.1.2
80-
steps:
81-
- name: Checkout
82-
uses: actions/checkout@v3
83-
- name: Run misspell
84-
run: find ./* -name "*" | grep -v vendor | xargs misspell -error
85-
- name: Run shellcheck
86-
run: find ./ -name "*.sh" | grep -v vendor | xargs shellcheck
87-
- name: Lint markdown files
88-
run: find ./ -name "*.md" | grep -v vendor | grep -v commandline | grep -v .github | grep -v swagger | grep -v api | xargs mdl -r ~MD010,~MD013,~MD014,~MD022,~MD024,~MD029,~MD031,~MD032,~MD033,~MD036
80+
# markdownlint-misspell-shellcheck:
81+
# runs-on: ubuntu-20.04
82+
# # this image is build from Dockerfile
83+
# # https://github.com/pouchcontainer/pouchlinter/blob/master/Dockerfile
84+
# container: pouchcontainer/pouchlinter:v0.1.2
85+
# steps:
86+
# - name: Checkout
87+
# uses: actions/checkout@v3
88+
# - name: Run misspell
89+
# run: find ./* -name "*" | grep -v vendor | xargs misspell -error
90+
# - name: Run shellcheck
91+
# run: find ./ -name "*.sh" | grep -v vendor | xargs shellcheck
92+
# - name: Lint markdown files
93+
# run: find ./ -name "*.md" | grep -v vendor | grep -v commandline | grep -v .github | grep -v swagger | grep -v api | xargs mdl -r ~MD010,~MD013,~MD014,~MD022,~MD024,~MD029,~MD031,~MD032,~MD033,~MD036
94+
8995
# - name: Check markdown links
9096
# run: |
9197
# set +e
@@ -102,17 +108,17 @@ jobs:
102108
unit-tests:
103109
runs-on: ubuntu-20.04
104110
steps:
105-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
106112
with:
107113
submodules: true
108114
- name: Fetch History
109115
run: git fetch --prune --unshallow
110116
- name: Setup Go
111-
uses: actions/setup-go@v3
117+
uses: actions/setup-go@v5
112118
with:
113119
go-version: ${{ env.GO_VERSION }}
114120
- name: Cache Go Dependencies
115-
uses: actions/cache@v2
121+
uses: actions/cache@v4
116122
with:
117123
path: ~/go/pkg/mod
118124
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -122,7 +128,7 @@ jobs:
122128
make test
123129
git status
124130
- name: Publish Unit Test Coverage
125-
uses: codecov/codecov-action@v3
131+
uses: codecov/codecov-action@v4
126132
with:
127133
flags: unittests
128134
file: cover.out

.github/workflows/codeql.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "master", "release-*" ]
16+
branches: [ "master", "release-*"]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
1919
branches: [ "master" ]
@@ -45,11 +45,11 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL
52-
uses: github/codeql-action/init@v2
52+
uses: github/codeql-action/init@v3
5353
with:
5454
languages: ${{ matrix.language }}
5555
config-file: ./.github/codeql/codeql-config.yml
@@ -64,7 +64,7 @@ jobs:
6464
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6565
# If this step fails, then you should remove it and run the build manually (see below)
6666
- name: Autobuild
67-
uses: github/codeql-action/autobuild@v2
67+
uses: github/codeql-action/autobuild@v3
6868

6969
# ℹ️ Command-line programs to run using the OS shell.
7070
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,6 +77,6 @@ jobs:
7777
# ./location_of_script_within_repo/buildscript.sh
7878

7979
- name: Perform CodeQL Analysis
80-
uses: github/codeql-action/analyze@v2
80+
uses: github/codeql-action/analyze@v3
8181
with:
8282
category: "/language:${{matrix.language}}"

.github/workflows/docker-image.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ name: Docker Image CI
33
on:
44
workflow_dispatch:
55

6+
# Declare default permissions as read only.
7+
permissions: read-all
8+
69
jobs:
710

811
build:
912

1013
runs-on: ubuntu-latest
1114

1215
steps:
13-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1417
- name: Build the Docker image
1518
run: IMG=openkruise/kruise-manager:${{ github.ref_name }} & make docker-multiarch

0 commit comments

Comments
 (0)