From 4e3a92acec59a9198791ea6fa845ed11e0a6945a Mon Sep 17 00:00:00 2001 From: zuoxuesong-worker Date: Fri, 21 Nov 2025 17:23:50 +0800 Subject: [PATCH] feat: update some default config values (#2866) feat: update some default config values Signed-off-by: xuesongzuo@yunify.com --- .../core/roles/defaults/defaults/main/01-cluster_require.yaml | 2 ++ builtin/core/roles/defaults/defaults/main/03-kubernetes.yaml | 4 ++-- builtin/core/roles/defaults/vars/10-download.yaml | 4 ++++ builtin/core/roles/precheck/etcd/tasks/main.yaml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml index 6e27c0c2..12ff29a0 100644 --- a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml +++ b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml @@ -10,6 +10,8 @@ cluster_require: - '"ubuntu"' - centos - '"centos"' + - kylin + - '"kylin"' # Required network plugins require_network_plugin: ['calico', 'flannel', 'cilium', 'hybridnet', 'kube-ovn'] # Minimum supported Kubernetes version diff --git a/builtin/core/roles/defaults/defaults/main/03-kubernetes.yaml b/builtin/core/roles/defaults/defaults/main/03-kubernetes.yaml index e23f8797..f650e1d5 100644 --- a/builtin/core/roles/defaults/defaults/main/03-kubernetes.yaml +++ b/builtin/core/roles/defaults/defaults/main/03-kubernetes.yaml @@ -82,7 +82,7 @@ kubernetes: mode: ARP image: registry: >- - {{ .dockerio_registry }} + {{ .image_registry.dockerio_registry }} repository: plndr/kube-vip tag: v0.7.2 haproxy: @@ -91,7 +91,7 @@ kubernetes: health_port: 8081 image: registry: >- - {{ .dockerio_registry }} + {{ .image_registry.dockerio_registry }} repository: library/haproxy tag: 2.9.6-alpine diff --git a/builtin/core/roles/defaults/vars/10-download.yaml b/builtin/core/roles/defaults/vars/10-download.yaml index ebf716b4..ef95c7b2 100644 --- a/builtin/core/roles/defaults/vars/10-download.yaml +++ b/builtin/core/roles/defaults/vars/10-download.yaml @@ -235,6 +235,10 @@ download: - "{{ .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/kylin-v10SP2-rpms-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/kylin-v10SP2-rpms-arm64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/kylin-v10SP1-rpms-amd64.iso" + - "{{ .download.iso_url.base_path }}/kubesphere/kubekey/releases/download/iso-latest/kylin-v10SP1-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" diff --git a/builtin/core/roles/precheck/etcd/tasks/main.yaml b/builtin/core/roles/precheck/etcd/tasks/main.yaml index 99d890cc..72bac5bd 100644 --- a/builtin/core/roles/precheck/etcd/tasks/main.yaml +++ b/builtin/core/roles/precheck/etcd/tasks/main.yaml @@ -26,7 +26,7 @@ register_type: json - name: ETCD | Assert disk fsync latency meets requirements assert: - that: (index (.fio_result.stdout.jobs | first) "sync" "lat_ns" "percentile" "90.000000") | le .cluster_require.etcd_disk_wal_fysnc_duration_seconds + that: (index (.fio_result.stdout.jobs | first) "sync" "lat_ns" "percentile" "90.000000") | ge .cluster_require.etcd_disk_wal_fysnc_duration_seconds fail_msg: >- The 90th percentile fsync latency is {{ index (.fio_result.stdout.jobs | first) "sync" "lat_ns" "percentile" "90.000000" }}ns, which exceeds the maximum allowed: {{ .cluster_require.etcd_disk_wal_fysnc_duration_seconds }}ns. always: