Merge remote-tracking branch 'origin/master' into release-3.1

# Conflicts:
#	.github/workflows/sync-feature-code.yaml
#	docs/kubernetes-versions.md
#	hack/sync-components.sh
#	version/components.json

Author: pixiake

.all-contributorsrc

@@ -805,6 +805,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Hiiirad",
+      "name": "Hirad Rasoolinejad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26739670?v=4",
+      "profile": "https://github.com/Hiiirad",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/gen-repository-iso.yaml

@@ -14,8 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: centos7-rpms
-            dockerfile: dockerfile.centos7
           - name: almalinux-9.0-rpms
             dockerfile: dockerfile.almalinux90
           - name: debian10-debs

.github/workflows/kubernetes-auto-support.yaml

@@ -2,6 +2,7 @@
 name: Kubernetes-Auto-Support
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
 

.github/workflows/sync-feature-code.yaml

@@ -8,7 +8,6 @@ on:
 jobs:
   sync-feature:
     runs-on: ubuntu-latest
-
     steps:
       - name: Check if PR has merged
         id: check_pr
@@ -31,29 +30,28 @@ jobs:
         if: ${{ steps.check_pr.outputs.pr_merged == 'true' }}
         uses: actions/checkout@v3
         with:
-          ref: feature
+          ref: feature-gitops
           path: feature-branch
 
-      - name: Remove old feature directory
-        if: ${{ steps.check_pr.outputs.pr_merged == 'true' }}
-        run: rm -rf feature
-
       - name: Sync feature branch to master/feature directory
         if: ${{ steps.check_pr.outputs.pr_merged == 'true' }}
         run: |
-          mkdir -p feature
+          rm -rf feature && mkdir -p feature
+          rm -rf feature-branch/vendor
           cp -r feature-branch/* feature/
-          git config --global user.name 'ks-ci-bot'
-          git config --global user.email '[email protected]'
-          git add feature/
-          git commit -m "Sync feature branch to master/feature directory"
+          rm -rf feature-branch
 
       - name: Push changes and create PR
         if: ${{ steps.check_pr.outputs.pr_merged == 'true' }}
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Sync feature branch to master/feature directory
+          commit-message: 'Sync feature branch to master/feature directory'
+          delete-branch: true
           branch: sync-feature-to-main
-          title: [ci-bot] Sync feature branch to master/feature directory
-          body: This PR syncs the feature branch to the master/feature directory.
+          sign-commits: true
+          title: '[ci-bot] Sync feature branch to master/feature directory'
+          body: |
+            This PR syncs the feature branch to the master/feature directory.
+            ```release-note
+            none
+            ```

CONTRIBUTORS.md

@@ -119,6 +119,7 @@ Contributions of any kind are welcome! Thanks goes to these wonderful contributo
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xrwang8"><img src="https://avatars.githubusercontent.com/u/68765051?v=4?s=100" width="100px;" alt="Ronald Fletcher"/><br /><sub><b>Ronald Fletcher</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=xrwang8" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/baikjy0215"><img src="https://avatars.githubusercontent.com/u/110450904?v=4?s=100" width="100px;" alt="baikjy0215"/><br /><sub><b>baikjy0215</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=baikjy0215" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/knowmost"><img src="https://avatars.githubusercontent.com/u/167442703?v=4?s=100" width="100px;" alt="knowmost"/><br /><sub><b>knowmost</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=knowmost" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hiiirad"><img src="https://avatars.githubusercontent.com/u/26739670?v=4?s=100" width="100px;" alt="Hirad Rasoolinejad"/><br /><sub><b>Hirad Rasoolinejad</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=Hiiirad" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.md

@@ -403,6 +403,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xrwang8"><img src="https://avatars.githubusercontent.com/u/68765051?v=4?s=100" width="100px;" alt="Ronald Fletcher"/><br /><sub><b>Ronald Fletcher</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=xrwang8" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/baikjy0215"><img src="https://avatars.githubusercontent.com/u/110450904?v=4?s=100" width="100px;" alt="baikjy0215"/><br /><sub><b>baikjy0215</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=baikjy0215" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/knowmost"><img src="https://avatars.githubusercontent.com/u/167442703?v=4?s=100" width="100px;" alt="knowmost"/><br /><sub><b>knowmost</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=knowmost" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hiiirad"><img src="https://avatars.githubusercontent.com/u/26739670?v=4?s=100" width="100px;" alt="Hirad Rasoolinejad"/><br /><sub><b>Hirad Rasoolinejad</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=Hiiirad" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_zh-CN.md

@@ -420,6 +420,7 @@ kubectl completion bash >/etc/bash_completion.d/kubectl
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xrwang8"><img src="https://avatars.githubusercontent.com/u/68765051?v=4?s=100" width="100px;" alt="Ronald Fletcher"/><br /><sub><b>Ronald Fletcher</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=xrwang8" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/baikjy0215"><img src="https://avatars.githubusercontent.com/u/110450904?v=4?s=100" width="100px;" alt="baikjy0215"/><br /><sub><b>baikjy0215</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=baikjy0215" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/knowmost"><img src="https://avatars.githubusercontent.com/u/167442703?v=4?s=100" width="100px;" alt="knowmost"/><br /><sub><b>knowmost</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=knowmost" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hiiirad"><img src="https://avatars.githubusercontent.com/u/26739670?v=4?s=100" width="100px;" alt="Hirad Rasoolinejad"/><br /><sub><b>Hirad Rasoolinejad</b></sub></a><br /><a href="https://github.com/kubesphere/kubekey/commits?author=Hiiirad" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

cmd/kk/cmd/completion/completion.go

@@ -50,8 +50,8 @@ Normally you don't need to do more extra work to have this feature if you've ins
 		Example: `# Installing bash completion on Linux
 ## If bash-completion is not installed on Linux, please install the 'bash-completion' package
 ## via your distribution's package manager.
-## Load the ks completion code for bash into the current shell
-source <(ks completion bash)
+## Load the kk completion code for bash into the current shell
+source <(kk completion bash)
 ## Write bash completion code to a file and source if from .bash_profile
 mkdir -p ~/.config/kk/ && kk completion --type bash > ~/.config/kk/completion.bash.inc
 printf "

cmd/kk/pkg/artifact/manifest.go

@@ -20,13 +20,14 @@ import (
 	"bufio"
 	"context"
 	"fmt"
-	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector"
-	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files"
-	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images"
 	"os"
 	"sort"
 	"strings"
 
+	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector"
+	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/files"
+	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/images"
+
 	mapset "github.com/deckarep/golang-set"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -276,7 +277,7 @@ func CreateManifestSpecifyVersion(arg common.Argument, name, version string, reg
 			}, &common.KubeConf{
 				Cluster: &kubekeyv1alpha2.ClusterSpec{
 					Kubernetes: kubekeyv1alpha2.Kubernetes{Version: v},
-					Registry:   kubekeyv1alpha2.RegistryConfig{PrivateRegistry: "docker.io"},
+					Registry:   kubekeyv1alpha2.RegistryConfig{PrivateRegistry: images.DefaultRegistry()},
 				},
 			}, imageName).ImageName()
 			if !imageIsExist(repo, imageArr) {
@@ -287,15 +288,9 @@ func CreateManifestSpecifyVersion(arg common.Argument, name, version string, reg
 	}
 
 	options := &templates.Options{
-		Name:   name,
-		Arches: arch,
-		OperatingSystems: []kubekeyv1alpha2.OperatingSystem{{
-			Arch:    "amd64",
-			Type:    "linux",
-			Id:      "ubuntu",
-			Version: "20.04",
-			OsImage: "Ubuntu 20.04.6 LTS",
-		}},
+		Name:                    name,
+		Arches:                  arch,
+		OperatingSystems:        []kubekeyv1alpha2.OperatingSystem{},
 		KubernetesDistributions: kubernetesDistribution,
 		Components: kubekeyv1alpha2.Components{
 			Helm:      kubekeyv1alpha2.Helm{Version: kubekeyv1alpha2.DefaultHelmVersion},

cmd/kk/pkg/artifact/templates/manifest.go

@@ -37,6 +37,9 @@ spec:
   {{- range .Options.Arches }}
   - {{ . }}
   {{- end }}
+  {{- if not .Options.OperatingSystems }}
+  operatingSystems: []
+  {{- else }}
   operatingSystems:
   {{- range $i, $v := .Options.OperatingSystems }}
   - arch: {{ $v.Arch }}
@@ -49,6 +52,7 @@ spec:
         localPath: 
         url: 
   {{- end }}
+  {{- end }}
   kubernetesDistributions:
   {{- range $i, $v := .Options.KubernetesDistributions }}
   - type: {{ $v.Type }}