diff --git a/.github/workflows/sync-vendor.yml b/.github/workflows/sync-vendor.yml index 1a53f390..3aa071cd 100644 --- a/.github/workflows/sync-vendor.yml +++ b/.github/workflows/sync-vendor.yml @@ -1,5 +1,4 @@ -name: sync-vendor - +name: SyncVendor on: push: @@ -7,8 +6,6 @@ on: - go.mod workflow_dispatch: -# Remove all permissions from GITHUB_TOKEN except metadata. -permissions: {} jobs: vendor: @@ -22,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.22' + go-version: '1.22.0' - name: Run go mod vendor run: go mod vendor @@ -37,9 +34,9 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - token: "${{ secrets.GITHUB_TOKEN }}" commit-message: "Add vendor directory" - branch: "add-vendor-${{ github.event.number }}" + branch: "add-vendor-${{ github.sha }}" + delete-branch: true title: "[ci-bot] Add vendor directory" body: | - This [PR](https://github.com/kubesphere/kubekey/pull/${{ github.event.number }}) adds the vendor directory generated by go mod vendor. + This [PR](https://github.com/kubesphere/kubekey/pull/${{ github.sha }}) adds the vendor directory generated by go mod vendor. diff --git a/builtin/roles/install/cri/defaults/main.yaml b/builtin/roles/install/cri/defaults/main.yaml index c116584e..208f0105 100644 --- a/builtin/roles/install/cri/defaults/main.yaml +++ b/builtin/roles/install/cri/defaults/main.yaml @@ -25,7 +25,7 @@ image_registry: registry: | {{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }} {{ .image_registry.ha_vip }} - {{- else }} + {{- else if .groups.image_registry | default list | len | lt 0 }} {{ index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" }} {{- end }} username: admin diff --git a/builtin/roles/install/image-registry/defaults/main.yaml b/builtin/roles/install/image-registry/defaults/main.yaml index 1b5c0e82..a40c2af1 100644 --- a/builtin/roles/install/image-registry/defaults/main.yaml +++ b/builtin/roles/install/image-registry/defaults/main.yaml @@ -5,7 +5,7 @@ image_registry: registry: | {{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }} {{ .image_registry.ha_vip }} - {{- else }} + {{- else if .groups.image_registry | default list | len | lt 0 }} {{ index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" }} {{- end }} username: admin diff --git a/go.mod b/go.mod index 84dab987..e1484eb1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kubesphere/kubekey/v4 -go 1.22.0 +go 1.23.0 require ( github.com/Masterminds/sprig/v3 v3.2.3