diff --git a/.github/workflows/gen-repository-iso.yaml b/.github/workflows/gen-repository-iso.yaml index ff5a943d..3fc6c3a5 100644 --- a/.github/workflows/gen-repository-iso.yaml +++ b/.github/workflows/gen-repository-iso.yaml @@ -94,7 +94,8 @@ jobs: for d in $(ls config/harbor); do if [ -d "config/harbor/$d" ]; then 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 done @@ -103,6 +104,6 @@ jobs: with: tag_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 replaceArtifacts: true \ No newline at end of file diff --git a/builtin/core/defaults/config/v1.27.yaml b/builtin/core/defaults/config/v1.27.yaml index d6f3dc59..f8b426f5 100644 --- a/builtin/core/defaults/config/v1.27.yaml +++ b/builtin/core/defaults/config/v1.27.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.28.yaml b/builtin/core/defaults/config/v1.28.yaml index daff4155..5a92d3a5 100644 --- a/builtin/core/defaults/config/v1.28.yaml +++ b/builtin/core/defaults/config/v1.28.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.29.yaml b/builtin/core/defaults/config/v1.29.yaml index 0530e0d1..b34eb797 100644 --- a/builtin/core/defaults/config/v1.29.yaml +++ b/builtin/core/defaults/config/v1.29.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.30.yaml b/builtin/core/defaults/config/v1.30.yaml index d40340ad..dfc676a2 100644 --- a/builtin/core/defaults/config/v1.30.yaml +++ b/builtin/core/defaults/config/v1.30.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.31.yaml b/builtin/core/defaults/config/v1.31.yaml index ef70d86e..0103789c 100644 --- a/builtin/core/defaults/config/v1.31.yaml +++ b/builtin/core/defaults/config/v1.31.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.32.yaml b/builtin/core/defaults/config/v1.32.yaml index 918bf7a1..ddb94118 100644 --- a/builtin/core/defaults/config/v1.32.yaml +++ b/builtin/core/defaults/config/v1.32.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/defaults/config/v1.33.yaml b/builtin/core/defaults/config/v1.33.yaml index b19617d0..e812ae78 100644 --- a/builtin/core/defaults/config/v1.33.yaml +++ b/builtin/core/defaults/config/v1.33.yaml @@ -17,7 +17,7 @@ spec: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/defaults/main/02-image_registry.yaml b/builtin/core/roles/defaults/defaults/main/02-image_registry.yaml index 636b8381..dbf47625 100644 --- a/builtin/core/roles/defaults/defaults/main/02-image_registry.yaml +++ b/builtin/core/roles/defaults/defaults/main/02-image_registry.yaml @@ -73,7 +73,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # ========== image registry: docker-registry ========== # docker-registry image tag docker_registry_version: 2.8.3 diff --git a/builtin/core/roles/defaults/vars/10-download.yaml b/builtin/core/roles/defaults/vars/10-download.yaml index ef95c7b2..e2f6ed3a 100644 --- a/builtin/core/roles/defaults/vars/10-download.yaml +++ b/builtin/core/roles/defaults/vars/10-download.yaml @@ -167,9 +167,9 @@ download: {{- end -}} docker_registry: 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: >- - 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: amd64: >- {{- if .download.zone | eq "cn" -}} @@ -177,12 +177,12 @@ download: {{- else -}} https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz {{- end -}} -# arm64: >- -# {{- if .download.zone | eq "cn" -}} -# https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-{{ .image_registry.harbor_version }}-linux-arm64.tgz -# {{- else -}} -# https://github.com/goharbor/harbor/releases/download/{{ .image_registry.harbor_version }}/harbor-{{ .image_registry.harbor_version }}-linux-arm64.tgz -# {{- end -}} + arm64: >- + {{- if .download.zone | eq "cn" -}} + https://{{ .download.cn_host }}/github.com/kubesphere/kubekey/releases/download/iso-latest/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz + {{- else -}} + https://github.com/kubesphere/kubekey/releases/download/iso-latest/harbor-offline-installer-{{ .image_registry.harbor_version }}.tgz + {{- end -}} # keepalived: # amd64: >- # {{- if .download.zone | eq "cn" -}} diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml index 9ca7578d..9a087e39 100644 --- a/builtin/core/roles/defaults/vars/v1.27.yaml +++ b/builtin/core/roles/defaults/vars/v1.27.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml index f868db4b..efa245ea 100644 --- a/builtin/core/roles/defaults/vars/v1.28.yaml +++ b/builtin/core/roles/defaults/vars/v1.28.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml index f7889620..630f9e51 100644 --- a/builtin/core/roles/defaults/vars/v1.29.yaml +++ b/builtin/core/roles/defaults/vars/v1.29.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml index fd9ca170..2af03584 100644 --- a/builtin/core/roles/defaults/vars/v1.30.yaml +++ b/builtin/core/roles/defaults/vars/v1.30.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml index 58d6860d..b1dcec8e 100644 --- a/builtin/core/roles/defaults/vars/v1.31.yaml +++ b/builtin/core/roles/defaults/vars/v1.31.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml index 67f19002..47e5a1b6 100644 --- a/builtin/core/roles/defaults/vars/v1.32.yaml +++ b/builtin/core/roles/defaults/vars/v1.32.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml index 58c46c6b..bc0a7fe4 100644 --- a/builtin/core/roles/defaults/vars/v1.33.yaml +++ b/builtin/core/roles/defaults/vars/v1.33.yaml @@ -10,7 +10,7 @@ image_registry: keepalived_version: 2.0.20 # ========== image registry: harbor ========== # harbor image tag - harbor_version: v2.10.1 + harbor_version: v2.10.2 # docker-compose binary dockercompose_version: v2.20.3 # ========== image registry: docker-registry ========== diff --git a/docs/en/core/image_registry.md b/docs/en/core/image_registry.md index b8dfe169..2a1baeaa 100644 --- a/docs/en/core/image_registry.md +++ b/docs/en/core/image_registry.md @@ -60,20 +60,20 @@ Harbor is the default image registry. 1. Precheck before installation ```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 - Standalone installation `image_registry` can be installed independently of the cluster. ```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 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 -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 @@ -93,7 +93,7 @@ KubeKey method, suitable for server deployment. Installation example: ```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: diff --git a/docs/zh/core/image_registry.md b/docs/zh/core/image_registry.md index 2a89cdfd..f44d6db8 100644 --- a/docs/zh/core/image_registry.md +++ b/docs/zh/core/image_registry.md @@ -60,19 +60,19 @@ spec: harbor是默认安装的镜像仓库 1. 安装前检查 ```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. 安装 - 单独安装 `image_registry` 可以脱离集群单独进行安装。 ```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`。 ```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高可用 @@ -92,7 +92,7 @@ kubekey的做法,适用于在服务器上安装。 安装示例: ```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 组中设置多个节点