From d19284f21daa820ce502840a1544f0302539f645 Mon Sep 17 00:00:00 2001 From: joyceliu Date: Mon, 4 Nov 2024 10:19:58 +0800 Subject: [PATCH] fix: failed to install without image_registry Signed-off-by: joyceliu --- .github/workflows/sync-vendor.yml | 1 - builtin/roles/install/cri/defaults/main.yaml | 2 +- builtin/roles/install/image-registry/defaults/main.yaml | 2 +- go.mod | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-vendor.yml b/.github/workflows/sync-vendor.yml index 1a53f390a..21bbe4ac2 100644 --- a/.github/workflows/sync-vendor.yml +++ b/.github/workflows/sync-vendor.yml @@ -37,7 +37,6 @@ 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 }}" title: "[ci-bot] Add vendor directory" diff --git a/builtin/roles/install/cri/defaults/main.yaml b/builtin/roles/install/cri/defaults/main.yaml index c116584eb..208f01050 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 1b5c0e82b..a40c2af1c 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 84dab9874..e1484eb13 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