Merge branch 'master' of https://github.com/karmada-io/karmada into mcs

.github/ISSUE_TEMPLATE/cherry-pick.md

@@ -0,0 +1,42 @@
+---
+name: CherryPick Track
+about: Track tasks when release branches need cherry-pick.
+labels: help wanted
+---
+
+**Which PR needs cherry-picks:**
+<!--
+For example: "PR #1234"
+-->
+PR #
+
+**Which release branches need this patch:**
+<!--
+Karmada now maintains 3 latest releases.
+If a branch doesn't need this cherry-pick, please explain the reason.
+-->
+- [ ] release-1.x 
+- [ ] release-1.y
+- [ ] release-1.z
+
+**How to cherry-pick PRs:**
+
+The `hack/cherry_pick_pull.sh` script can help you initiate a cherry-pick
+automatically, please follow the instructions at [this guideline](https://karmada.io/docs/contributor/cherry-picks). 
+
+The script will send the PR for you, please remember `copy the release notes` from
+the original PR by to the new PR description part.
+
+**How to join or take the task**:
+
+Just reply on the issue with the message `/assign` in a **separate line**.
+
+Then, the issue will be assigned to you.
+
+**Useful References:**
+
+- Release timeline: https://karmada.io/docs/releases
+- How to cherry-pick PRs: https://karmada.io/docs/contributor/cherry-picks
+
+**Anything else we need to know:**
+

.github/workflows/ci-schedule-compatibility.yaml

@@ -12,19 +12,19 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        kubeapiserver-version: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2, v1.25.0, v1.26.0 ]
-        karmada-version: [ release-1.3, release-1.4, release-1.5 ]
+        kubeapiserver-version: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3 ]
+        karmada-version: [ release-1.4, release-1.5, release-1.6 ]
 
         include:
-        - karmada-version: release-1.3
-          go-version: 1.18.3
-
         - karmada-version: release-1.4
           go-version: 1.19.5
 
         - karmada-version: release-1.5
           go-version: 1.19.5
 
+        - karmada-version: release-1.6
+          go-version: 1.20.5
+
     steps:
       - name: checkout code
         uses: actions/checkout@v3

.github/workflows/ci-schedule.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        k8s: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2, v1.25.0, v1.26.0 ]
+        k8s: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3 ]
     steps:
       - name: checkout code
         uses: actions/checkout@v3

.github/workflows/ci.yml

@@ -112,7 +112,7 @@ jobs:
         # Here support the latest three minor releases of Kubernetes, this can be considered to be roughly
         # the same as the End of Life of the Kubernetes release: https://kubernetes.io/releases/
         # Please remember to update the CI Schedule Workflow when we add a new version.
-        k8s: [ v1.24.2, v1.25.0, v1.26.0 ]
+        k8s: [ v1.25.0, v1.26.0, v1.27.3 ]
     steps:
       - name: checkout code
         uses: actions/checkout@v3

.github/workflows/lint-chart.yaml

@@ -2,10 +2,10 @@
 name: Chart Lint
 
 env:
-  HELM_VERSION: v3.8.1
+  HELM_VERSION: v3.11.2
   KIND_VERSION: v0.14.0
   KIND_NODE_IMAGE: kindest/node:v1.26.0
-  K8S_VERSION: v1.23.4
+  K8S_VERSION: v1.26.4
 
 on:
   push:
@@ -32,13 +32,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
-          architecture: x64
+          python-version: 3.9
+          check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.1
-        with:
-          version: v3.6.0
+        uses: helm/chart-testing-action@v2.4.0
 
       - name: Add dependency chart repos
         run: |
@@ -49,14 +47,15 @@ jobs:
         run: |
           changed=$( ct list-changed )
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
+            echo "changed=true" >> $GITHUB_OUTPUT
           fi
 
       - name: Run chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --debug --check-version-increment=false
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.7.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           wait: 120s
@@ -65,4 +64,5 @@ jobs:
           kubectl_version: ${{ env.K8S_VERSION }}
 
       - name: Run chart-testing (install)
+        if: steps.list-changed.outputs.changed == 'true'
         run: ct install --debug --helm-extra-args "--timeout 800s"

MAINTAINERS.md

@@ -6,12 +6,12 @@
 
 ## Maintainers
 
-| Maintainer | GitHub ID | Affiliation | Email |
-| --------------- | --------- | ----------- | ----------- |
-| Hanbo Li | @mrlihanbo | Huawei | <lihanbo2@huawei.com> |
-| Hongcai Ren | @RainbowMango | Huawei | <renhongcai@huawei.com> |
-| Kevin Wang | @kevin-wangzefeng | Huawei | <wangzefeng@huawei.com> |
-| Lei Xue | @carmark | Tencent | <vfs@live.com> |
-| Shiyi Xie | @GitHubxsy | Huawei | <xieshiyi1@huawei.com> |
-| Yifan Shen | @zoroyouxi | ICBC | <shenyf@sdc.icbc.com.cn> |
-| Yiheng Ci | @lfbear | VIPKID | <ciyiheng@vipkid.com.cn> |
+| Maintainer  | GitHub ID         | Affiliation   | Email                    |
+|-------------|-------------------|---------------|--------------------------|
+| Hanbo Li    | @mrlihanbo        | ByteDance     | <mrlihanbo@gmail.com>    |
+| Hongcai Ren | @RainbowMango     | Huawei        | <renhongcai@huawei.com>  |
+| Kevin Wang  | @kevin-wangzefeng | Huawei        | <wangzefeng@huawei.com>  |
+| Lei Xue     | @carmark          | Moore Threads | <vfs@live.com>           |
+| Shiyi Xie   | @GitHubxsy        | Huawei        | <xieshiyi1@huawei.com>   |
+| Yifan Shen  | @zoroyouxi        | ICBC          | <shenyf@sdc.icbc.com.cn> |
+| Yiheng Ci   | @lfbear           | VIPKID        | <ciyiheng@vipkid.com.cn> |

Makefile

@@ -100,6 +100,7 @@ package-chart:
 .PHONY: push-chart
 push-chart:
 	helm push _output/charts/karmada-chart-${VERSION}.tgz oci://docker.io/karmada
+	helm push _output/charts/karmada-operator-chart-${VERSION}.tgz oci://docker.io/karmada
 
 .PHONY: test
 test:

OWNERS

@@ -1,7 +1,11 @@
 reviewers:
+- chaunceyjiang
 - Garrybest
+- jwcesign
+- Poor12
 - RainbowMango
 - XiShanYongYe-Chang
 approvers:
+- Garrybest
 - kevin-wangzefeng
 - RainbowMango

README.md

@@ -119,7 +119,7 @@ cd karmada
 run the following script:
 
 ```
-# hack/local-up-karmada.sh
+hack/local-up-karmada.sh
 ```
 This script will do following tasks for you:
 - Start a Kubernetes cluster to run the Karmada control plane, aka. the `host cluster`.
@@ -186,6 +186,7 @@ nginx   2/2     2            2           20s
 | Karmada v1.3           | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |
 | Karmada v1.4           | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |
 | Karmada v1.5           | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |
+| Karmada v1.6           | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |
 | Karmada HEAD (master)  | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |
 
 Key: