15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update: bump harbor version to v2.10.2 (#2895) 

Signed-off-by: redscholar <blacktiledhouse@gmail.com>
This commit is contained in:
liujian 2025-12-12 16:32:55 +08:00 committed by GitHub
parent b98538fc53
commit 6033b8c540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/gen-repository-iso.yaml vendored
View File

@ -94,7 +94,8 @@ jobs:
for d in $(ls config/harbor); do for d in $(ls config/harbor); do
if [ -d "config/harbor/$d" ]; then if [ -d "config/harbor/$d" ]; then
cd "config/harbor/$d" && make build cd "config/harbor/$d" && make build
qsctl -c /usr/local/bin/qsctl-config.yaml cp harbor-offline-installer-"$d"-linux-arm64.tgz qs://kubekey/github.com/goharbor/harbor/releases/download/"$d"/harbor-offline-installer-"$d"-linux-arm64.tgz mv harbor-offline-installer-"$d"-linux-arm64.tgz harbor-offline-installer-"$d".tgz
qsctl -c /usr/local/bin/qsctl-config.yaml cp harbor-offline-installer-"$d".tgz qs://kubekey/github.com/kubesphere/kubekey/releases/download/iso-latest/harbor-offline-installer-"$d".tgz
fi fi
done done
@ -103,6 +104,6 @@ jobs:
with: with:
tag_name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }}
name: ${{ github.ref_name }} name: ${{ github.ref_name }}
artifacts: config/harbor/*/*harbor-offline-installer*-linux-arm64.tgz artifacts: config/harbor/*/*harbor-offline-installer*.tgz
allowUpdates: true allowUpdates: true
replaceArtifacts: true replaceArtifacts: true

2
builtin/core/defaults/config/v1.27.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.28.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.29.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.30.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.31.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.32.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/defaults/config/v1.33.yaml
View File

@ -17,7 +17,7 @@ spec:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/defaults/main/02-image_registry.yaml
View File

@ -73,7 +73,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========
# docker-registry image tag # docker-registry image tag
docker_registry_version: 2.8.3 docker_registry_version: 2.8.3

16
builtin/core/roles/defaults/vars/10-download.yaml
View File

@ -167,9 +167,9 @@ download:
{{- end -}} {{- end -}}
docker_registry: docker_registry:
amd64: >- amd64: >-
https://kubekey.pek3b.qingstor.com/docker.io/registry/{{ .image_registry.docker_registry_version }}/docker-registry-{{ .image_registry.docker_registry_version }}-linux-amd64.tgz https://{{ .download.cn_host }}/docker.io/registry/{{ .image_registry.docker_registry_version }}/docker-registry-{{ .image_registry.docker_registry_version }}-linux-amd64.tgz
arm64: >- arm64: >-
https://kubekey.pek3b.qingstor.com/docker.io/registry/{{ .image_registry.docker_registry_version }}/docker-registry-{{ .image_registry.docker_registry_version }}-linux-arm64.tgz https://{{ .download.cn_host }}/docker.io/registry/{{ .image_registry.docker_registry_version }}/docker-registry-{{ .image_registry.docker_registry_version }}-linux-arm64.tgz
harbor: harbor:
amd64: >- amd64: >-
{{- if .download.zone | eq "cn" -}} {{- if .download.zone | eq "cn" -}}
@ -177,12 +177,12 @@ download:
{{- else -}} {{- else -}}
https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz
{{- end -}} {{- end -}}
# arm64: >- arm64: >-
# {{- if .download.zone | eq "cn" -}} {{- if .download.zone | eq "cn" -}}
# https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-{{ .image_registry.harbor_version }}-linux-arm64.tgz https://{{ .download.cn_host }}/github.com/kubesphere/kubekey/releases/download/iso-latest/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz
# {{- else -}} {{- else -}}
# https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-{{ .image_registry.harbor_version }}-linux-arm64.tgz https://github.com/kubesphere/kubekey/releases/download/iso-latest/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz
# {{- end -}} {{- end -}}
# keepalived: # keepalived:
# amd64: >- # amd64: >-
# {{- if .download.zone | eq "cn" -}} # {{- if .download.zone | eq "cn" -}}

2
builtin/core/roles/defaults/vars/v1.27.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.28.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.29.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.30.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.31.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.32.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

2
builtin/core/roles/defaults/vars/v1.33.yaml
View File

@ -10,7 +10,7 @@ image_registry:
keepalived_version: 2.0.20 keepalived_version: 2.0.20
# ========== image registry: harbor ========== # ========== image registry: harbor ==========
# harbor image tag # harbor image tag
harbor_version: v2.10.1 harbor_version: v2.10.2
# docker-compose binary # docker-compose binary
dockercompose_version: v2.20.3 dockercompose_version: v2.20.3
# ========== image registry: docker-registry ========== # ========== image registry: docker-registry ==========

8
docs/en/core/image_registry.md
View File

@ -60,20 +60,20 @@ Harbor is the default image registry.
1. Precheck before installation 1. Precheck before installation
```shell ```shell
kk precheck image_registry -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 kk precheck image_registry -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3
``` ```
2. Installation 2. Installation
- Standalone installation - Standalone installation
`image_registry` can be installed independently of the cluster. `image_registry` can be installed independently of the cluster.
```shell ```shell
kk init registry -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 kk init registry -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3
``` ```
- Automatic installation during cluster creation - Automatic installation during cluster creation
When creating a cluster, KubeKey will detect if `harbor` is installed on `image_registry` nodes; if not, it will install `harbor` based on configuration. When creating a cluster, KubeKey will detect if `harbor` is installed on `image_registry` nodes; if not, it will install `harbor` based on configuration.
```shell ```shell
kk create cluster -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 kk create cluster -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3
``` ```
### Harbor High Availability ### Harbor High Availability
@ -93,7 +93,7 @@ KubeKey method, suitable for server deployment.
Installation example: Installation example:
```shell ```shell
./kk init registry -i inventory.yaml --set image_registry.ha_vip=xx.xx.xx.xx --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 --set keepalived_version=2.0.20,artifact.artifact_url.keepalived.amd64=keepalived-2.0.20-linux-amd64.tgz ./kk init registry -i inventory.yaml --set image_registry.ha_vip=xx.xx.xx.xx --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3 --set keepalived_version=2.0.20,artifact.artifact_url.keepalived.amd64=keepalived-2.0.20-linux-amd64.tgz
``` ```
Steps: Steps:

8
docs/zh/core/image_registry.md
View File

@ -60,19 +60,19 @@ spec:
harbor是默认安装的镜像仓库 harbor是默认安装的镜像仓库
1. 安装前检查 1. 安装前检查
```shell ```shell
kk precheck image_registry -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 kk precheck image_registry -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3
``` ```
2. 安装 2. 安装
- 单独安装 - 单独安装
`image_registry` 可以脱离集群单独进行安装。 `image_registry` 可以脱离集群单独进行安装。
```shell ```shell
kk init registry -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 kk init registry -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3
``` ```
- 在创建集群时，自动安装 - 在创建集群时，自动安装
在创建集群时，会检测 `image_registry` 节点是否安装了`harbor`, 没有安装时会自动根据配置安装`harbor`。 在创建集群时，会检测 `image_registry` 节点是否安装了`harbor`, 没有安装时会自动根据配置安装`harbor`。
```shell ```shell
kk create cluster -i inventory.yaml --set harbor_version=v2.10.1,docker_version=24.0.7, dockercompose_version=v2.20.3 kk create cluster -i inventory.yaml --set harbor_version=v2.10.2,docker_version=24.0.7, dockercompose_version=v2.20.3
``` ```
### harbor高可用 ### harbor高可用
@ -92,7 +92,7 @@ kubekey的做法，适用于在服务器上安装。
安装示例: 安装示例:
```shell ```shell
./kk init registry -i inventory.yaml --set image_registry.ha_vip=xx.xx.xx.xx --set harbor_version=v2.10.1,docker_version=24.0.7,dockercompose_version=v2.20.3 --set keepalived_version=2.0.20,artifact.artifact_url.keepalived.amd64=keepalived-2.0.20-linux-amd64.tgz ./kk init registry -i inventory.yaml --set image_registry.ha_vip=xx.xx.xx.xx --set harbor_version=v2.10.2,docker_version=24.0.7,dockercompose_version=v2.20.3 --set keepalived_version=2.0.20,artifact.artifact_url.keepalived.amd64=keepalived-2.0.20-linux-amd64.tgz
``` ```
1. 在inventory中的image_registry 组中设置多个节点 1. 在inventory中的image_registry 组中设置多个节点