Skip to content

Commit

Permalink
Merge branch 'kubesphere:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Leioy authored Dec 26, 2024
2 parents 989c4a1 + bc7d578 commit 449d69c
Show file tree
Hide file tree
Showing 114 changed files with 831 additions and 841 deletions.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Create a report to help us improve
labels: kind/bug
---


**General remarks**

> This form is to report bugs. For general usage questions refer to our Slack channel
Expand All @@ -19,18 +18,18 @@ For UI issues please also add a screenshot that shows the issue.
KubeSphere:
Kubernetes: (If KubeSphere installer used, you can skip this)


**Environment**
How many nodes and their hardware configuration:
How many nodes and their hardware configuration:

For example:
3 masters: 8cpu/8g
3 masters: 8cpu/8g
3 nodes: 8cpu/16g

(and other info are welcomed to help us debugging)

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Enhancement Request
about: Suggest an enhancement to the Kubernetes project
labels: kind/feature
---

<!-- Please only use this template for submitting enhancement requests -->

**What would you like to be added**:
Expand Down
20 changes: 14 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
-->

### What type of PR is this?
<!--

<!--
Add one of the following kinds:
/kind bug
/kind cleanup
Expand All @@ -22,33 +23,39 @@ Optionally add one or more of the following kinds if applicable:
/kind regression
-->

### What this PR does / why we need it

### What this PR does / why we need it:
### Which issue(s) this PR fixes

### Which issue(s) this PR fixes:
<!--
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
-->
Fixes #

### Special notes for reviewers:
Links #

### Special notes for reviewers

```
```

### Does this PR introduced a user-facing change?

<!--
If no, just write "None" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
For more information on release notes see: https://github.com/kubernetes/community/blob/master/contributors/guide/release-notes.md
-->

```release-note
```

### Additional documentation, usage docs, etc.:
### Additional documentation, usage docs, etc

<!--
This section can be blank if this pull request does not require a release note.
Please use the following format for linking documentation or pass the
Expand All @@ -57,6 +64,7 @@ section below:
- [Usage]: <link>
- [Other doc]: <link>
-->

```docs
```
78 changes: 41 additions & 37 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL"
name: 'CodeQL'

on:
push:
Expand All @@ -24,39 +24,43 @@ jobs:
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
config: |
paths-ignore:
- .husky/
- packages/bootstrap/assets/v3dist/
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/issue_comment_webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: "20.x"
node-version: '20.x'
- run: npm install axios
- name: Send issue/comment to WeCom webhook
uses: actions/github-script@v7
Expand Down
98 changes: 49 additions & 49 deletions .github/workflows/manually.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,52 +12,52 @@ jobs:
node-version: [12.18.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: npm i -g yarn && yarn

- name: Build
run: yarn build

- name: Test
run: yarn test

- name: Set up QEMU
if: github.event_name == 'push'
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
if: github.event_name == 'push'
id: buildx
uses: docker/setup-buildx-action@v1
with:
version: v0.7.1
install: true

- name: Docker login
if: github.event_name == 'push'
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Push image
if: github.event_name == 'push'
run: |
TAG=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') REPO=docker.io/kubespheredev make container-cross-push
- name: slack
uses: 8398a7/action-slack@v3
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
with:
status: ${{ job.status }}
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
if: failure()
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: npm i -g yarn && yarn

- name: Build
run: yarn build

- name: Test
run: yarn test

- name: Set up QEMU
if: github.event_name == 'push'
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
if: github.event_name == 'push'
id: buildx
uses: docker/setup-buildx-action@v1
with:
version: v0.7.1
install: true

- name: Docker login
if: github.event_name == 'push'
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Push image
if: github.event_name == 'push'
run: |
TAG=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') REPO=docker.io/kubespheredev make container-cross-push
- name: slack
uses: 8398a7/action-slack@v3
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
with:
status: ${{ job.status }}
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
if: failure()
56 changes: 28 additions & 28 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: NightlyBuild
on:
schedule:
# This is a UTC time
- cron: "0 16 * * *"
- cron: '0 16 * * *'
# Keep it only for test purpose, comment it once everything is ok
workflow_dispatch:

Expand All @@ -13,44 +13,44 @@ jobs:

strategy:
matrix:
node-version: [ '16.x' ]
node-version: ['16.x']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: |
git branch
npm i -g yarn && yarn
- name: Install Dependencies
run: |
git branch
npm i -g yarn && yarn
- name: Build
run: yarn build
- name: Build
run: yarn build

# - name: Test
# - name: Test
# run: yarn test

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1

- name: Docker login
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Docker login
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Push image
run: |
TAG=nightly-$(date '+%Y%m%d') REPO=docker.io/kubespheredev make container-cross-push
- name: Push image
run: |
TAG=nightly-$(date '+%Y%m%d') REPO=docker.io/kubespheredev make container-cross-push
# - name: slack
# uses: 8398a7/action-slack@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
steps:
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit 449d69c

Please sign in to comment.