From 21ccfe29345274430b3a4d5455e82e6d090666cb Mon Sep 17 00:00:00 2001 From: zuoxuesong-worker Date: Thu, 20 Nov 2025 14:26:36 +0800 Subject: [PATCH] feat: add kylin v10-sp1/sp2 (#2863) feat: add kylin v10-sp1/sp2 Signed-off-by: xuesongzuo@yunify.com --- .../core/roles/defaults/vars/10-download.yaml | 36 +++++++++---------- .../roles/native/repository/tasks/main.yaml | 8 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/builtin/core/roles/defaults/vars/10-download.yaml b/builtin/core/roles/defaults/vars/10-download.yaml index 7380053c..ebf716b4 100644 --- a/builtin/core/roles/defaults/vars/10-download.yaml +++ b/builtin/core/roles/defaults/vars/10-download.yaml @@ -225,21 +225,21 @@ download: https://github.com {{- end -}} urls: - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/almalinux-9.0-rpms-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/almalinux-9.0-rpms-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/centos-8-rpms-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/centos-8-rpms-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/debian-10-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/debian-10-debs-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/debian-11-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/debian-11-debs-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/kylin-v10SP3-rpms-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/kylin-v10SP3-rpms-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-18.04-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-18.04-debs-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-20.04-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-20.04-debs-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-22.04-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-22.04-debs-arm64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-24.04-debs-amd64.iso" - - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/ISO-20250915/ubuntu-24.04-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/almalinux-9.0-rpms-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/almalinux-9.0-rpms-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/centos-8-rpms-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/centos-8-rpms-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/debian-10-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/debian-10-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/debian-11-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/debian-11-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/kylin-v10SP3-rpms-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/kylin-v10SP3-rpms-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-18.04-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-18.04-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-20.04-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-20.04-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-22.04-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-22.04-debs-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-24.04-debs-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/ubuntu-24.04-debs-arm64.iso" diff --git a/builtin/core/roles/native/repository/tasks/main.yaml b/builtin/core/roles/native/repository/tasks/main.yaml index 656cfab7..bd1125f8 100644 --- a/builtin/core/roles/native/repository/tasks/main.yaml +++ b/builtin/core/roles/native/repository/tasks/main.yaml @@ -21,11 +21,11 @@ set_fact: system_string: >- {{- if .os.release.ID | unquote | eq "kylin" }} - kylin-{{ .os.release.VERSION_ID }}-{{ .sp_version }} + kylin-{{ .os.release.VERSION_ID | replace "\"" "" | unquote | trim | lower }}{{ .sp_version | trim }} {{- else if .os.release.ID_LIKE | unquote | eq "rhel fedora" }} - {{ .os.release.ID }}{{ .os.release.VERSION_ID }} + {{ .os.release.ID | replace "\"" "" | unquote | trim | lower }}{{ .os.release.VERSION_ID | trim }} {{- else }} - {{ .os.release.ID }}-{{ .os.release.VERSION_ID }} + {{ .os.release.ID | replace "\"" "" | unquote | trim | lower }}-{{ .os.release.VERSION_ID | trim }} {{- end -}} - name: Repository | Define the package file type by system info @@ -41,7 +41,7 @@ when: - .iso_name | empty set_fact: - iso_name: "{{ .system_string | replace \"\\\"\" \"\" | unquote | trim | lower }}-{{ .iso_type | trim }}-{{ .binary_type }}.iso" + iso_name: "{{ .system_string | trim }}-{{ .iso_type | trim }}-{{ .binary_type }}.iso" - name: Repository | Copy local repository ISO file ignore_errors: true