Skip to content

Commit

Permalink
Revert "fix: failed to install without image_registry (#2446)" (#2447)
Browse files Browse the repository at this point in the history
This reverts commit f884035.
  • Loading branch information
redscholar authored Nov 4, 2024
1 parent f884035 commit a9cd66e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/sync-vendor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,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.sha }}"
branch: "add-vendor-${{ github.event.number }}"
title: "[ci-bot] Add vendor directory"
body: |
This [PR](https://github.com/kubesphere/kubekey/pull/${{ github.sha }}) adds the vendor directory generated by go mod vendor.
This [PR](https://github.com/kubesphere/kubekey/pull/${{ github.event.number }}) adds the vendor directory generated by go mod vendor.
2 changes: 1 addition & 1 deletion builtin/roles/install/cri/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ image_registry:
registry: |
{{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }}
{{ .image_registry.ha_vip }}
{{- else if .groups.image_registry | default list | len | lt 0 }}
{{- else }}
{{ index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" }}
{{- end }}
username: admin
Expand Down
2 changes: 1 addition & 1 deletion builtin/roles/install/image-registry/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ image_registry:
registry: |
{{- if and .image_registry.ha_vip (ne .image_registry.ha_vip "") }}
{{ .image_registry.ha_vip }}
{{- else if .groups.image_registry | default list | len | lt 0 }}
{{- else }}
{{ index .inventory_hosts (.groups.image_registry | default list | first) "internal_ipv4" }}
{{- end }}
username: admin
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubesphere/kubekey/v4

go 1.23.0
go 1.22.0

require (
github.com/Masterminds/sprig/v3 v3.2.3
Expand Down

0 comments on commit a9cd66e

Please sign in to comment.