From bca5b96a4a8e0f6794f34d34c86d0a3bd5bb0a40 Mon Sep 17 00:00:00 2001
From: liujian <joyceliu@yunify.com>
Date: Tue, 8 Jul 2025 10:50:21 +0800
Subject: [PATCH] feat: add local dns for image_registry.auth.registry (#2651)

Signed-off-by: joyceliu <joyceliu@yunify.com>
---
 builtin/core/playbooks/delete_cluster.yaml    |  4 --
 builtin/core/playbooks/delete_nodes.yaml      |  5 ---
 builtin/core/playbooks/delete_registry.yaml   |  2 -
 .../init/init-os/tasks/init_localdns.yaml     | 15 +++++++-
 .../init/init-os/tasks/init_repository.yaml   |  4 +-
 .../roles/init/init-os/templates/init-os.sh   |  2 +-
 .../tasks/init_kubernetes.yaml                |  4 +-
 .../tasks/join_kubernetes.yaml                |  8 ++--
 .../tasks/high-availability/main.yaml         |  2 +-
 .../image_registry/tasks/docker.yaml          | 38 +++++++++++++++++++
 .../uninstall/image_registry/tasks/main.yaml  |  5 ++-
 11 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 builtin/core/roles/uninstall/image_registry/tasks/docker.yaml

diff --git a/builtin/core/playbooks/delete_cluster.yaml b/builtin/core/playbooks/delete_cluster.yaml
index 1f7391a6..dc625727 100644
--- a/builtin/core/playbooks/delete_cluster.yaml
+++ b/builtin/core/playbooks/delete_cluster.yaml
@@ -36,9 +36,5 @@
     - role: uninstall/image_registry
       when:
        - .deleteImageRegistry
-    - role: uninstall/cri
-      when:
-       - .deleteImageRegistry
-       - .deleteCRI
 
 - import_playbook: hook/post_install.yaml
\ No newline at end of file
diff --git a/builtin/core/playbooks/delete_nodes.yaml b/builtin/core/playbooks/delete_nodes.yaml
index a015b701..c6a2dab9 100644
--- a/builtin/core/playbooks/delete_nodes.yaml
+++ b/builtin/core/playbooks/delete_nodes.yaml
@@ -83,10 +83,5 @@
       when:
        - .deleteImageRegistry
        - .delete_nodes | default list | has .inventory_hostname
-    - role: uninstall/cri
-      when:
-       - .deleteImageRegistry
-       - .deleteCRI
-       - .delete_nodes | default list | has .inventory_hostname
 
 - import_playbook: hook/post_install.yaml
\ No newline at end of file
diff --git a/builtin/core/playbooks/delete_registry.yaml b/builtin/core/playbooks/delete_registry.yaml
index 49b45a6c..634ea2a4 100644
--- a/builtin/core/playbooks/delete_registry.yaml
+++ b/builtin/core/playbooks/delete_registry.yaml
@@ -11,7 +11,5 @@
    - image_registry
   roles:
     - role: uninstall/image_registry
-    - role: uninstall/cri
-      when: .deleteCRI
 
 - import_playbook: hook/post_install.yaml
\ No newline at end of file
diff --git a/builtin/core/roles/init/init-os/tasks/init_localdns.yaml b/builtin/core/roles/init/init-os/tasks/init_localdns.yaml
index b3771fd8..0ec29274 100644
--- a/builtin/core/roles/init/init-os/tasks/init_localdns.yaml
+++ b/builtin/core/roles/init/init-os/tasks/init_localdns.yaml
@@ -5,7 +5,7 @@
     sed -i ':a;$!{N;ba};s@# kubekey hosts BEGIN.*# kubekey hosts END@@' {{ .item }}
     sed -i '/^$/N;/\n$/N;//D' {{ .item }}
     # defined new dns configuration
-    cat >>{{ .item }}<<EOF
+    cat >> {{ .item }} <<EOF
     # kubekey hosts BEGIN
     # kubernetes hosts
     {{- range .groups.k8s_cluster | default list }}
@@ -37,6 +37,19 @@
     {{ index $.hostvars . "internal_ipv6" }} {{ index $.hostvars . "hostname" }}
       {{- end }}
     {{- end }}
+    {{- if and (.image_registry.auth.registry | empty | not) (.groups.image_registry | empty | not) }}
+      {{- if .image_registry.ha_vip | empty | not }}
+    {{ .image_registry.ha_vip }} {{ .image_registry.auth.registry }}
+      {{- else }}
+        {{- if (index .hostvars (.groups.image_registry | first) "internal_ipv4") | empty | not }}
+    {{ index .hostvars (.groups.image_registry | first) "internal_ipv4" }} {{ .image_registry.auth.registry }}
+        {{- end }}
+        {{- if (index .hostvars (.groups.image_registry | first) "internal_ipv6") | empty | not }}
+    {{ index .hostvars (.groups.image_registry | first) "internal_ipv6" }} {{ .image_registry.auth.registry }}
+        {{- end }}
+    {{ .image_registry.auth.registry }} 
+      {{- end }}
+    {{- end }}
     # nfs hosts
     {{- range .groups.nfs | default list }}
       {{- if (index $.hostvars . "internal_ipv4") | empty | not }}
diff --git a/builtin/core/roles/init/init-os/tasks/init_repository.yaml b/builtin/core/roles/init/init-os/tasks/init_repository.yaml
index 012cfea5..45fd7349 100644
--- a/builtin/core/roles/init/init-os/tasks/init_repository.yaml
+++ b/builtin/core/roles/init/init-os/tasks/init_repository.yaml
@@ -50,11 +50,11 @@
         now=$(date +"%Y-%m-%d %H:%M:%S")
         if [ -f "{{ .tmp_dir }}/repository.iso" ];then
           # backup
-          mv /etc/yum.repos.d /etc/yum.repos.d.kubekey-$now.bak
+          mv /etc/yum.repos.d /etc/yum.repos.d.kubekey.bak-$now
           mkdir -p /etc/yum.repos.d
           # add repository
           rm -rf /etc/yum.repos.d/*
-          cat << EOF > /etc/yum.repos.d/CentOS-local.repo
+          cat <<EOF > /etc/yum.repos.d/CentOS-local.repo
         [base-local]
         name=rpms-local
       
diff --git a/builtin/core/roles/init/init-os/templates/init-os.sh b/builtin/core/roles/init/init-os/templates/init-os.sh
index 2963887f..bda1f31d 100644
--- a/builtin/core/roles/init/init-os/templates/init-os.sh
+++ b/builtin/core/roles/init/init-os/templates/init-os.sh
@@ -185,7 +185,7 @@ modprobe ip_vs_rr
 modprobe ip_vs_wrr
 modprobe ip_vs_sh
 
-cat > /etc/modules-load.d/kube_proxy-ipvs.conf << EOF
+cat > /etc/modules-load.d/kube_proxy-ipvs.conf <<EOF
 ip_vs
 ip_vs_rr
 ip_vs_wrr
diff --git a/builtin/core/roles/kubernetes/init-kubernetes/tasks/init_kubernetes.yaml b/builtin/core/roles/kubernetes/init-kubernetes/tasks/init_kubernetes.yaml
index 7ed1d040..3b922eb1 100644
--- a/builtin/core/roles/kubernetes/init-kubernetes/tasks/init_kubernetes.yaml
+++ b/builtin/core/roles/kubernetes/init-kubernetes/tasks/init_kubernetes.yaml
@@ -58,12 +58,12 @@
 - name: reset control_plane_endpoint localDNS
   command: |
     sed -i ':a;$!{N;ba};s@# kubekey control_plane_endpoint BEGIN.*# kubekey control_plane_endpoint END@@' {{ .item }}
-    cat >> {{ .item }} << EOF
+    cat >> {{ .item }} <<EOF
     # kubekey control_plane_endpoint BEGIN.
     127.0.0.1 {{ .kubernetes.control_plane_endpoint.host }}
     ::1 {{ .kubernetes.control_plane_endpoint.host }}
     # kubekey control_plane_endpoint END
-    EOF 
+    EOF
   loop: "{{ .localDNS | toJson }}"
     
 - name: Copy kubeconfig to default dir
diff --git a/builtin/core/roles/kubernetes/join-kubernetes/tasks/join_kubernetes.yaml b/builtin/core/roles/kubernetes/join-kubernetes/tasks/join_kubernetes.yaml
index 87c7f337..4e99f06d 100644
--- a/builtin/core/roles/kubernetes/join-kubernetes/tasks/join_kubernetes.yaml
+++ b/builtin/core/roles/kubernetes/join-kubernetes/tasks/join_kubernetes.yaml
@@ -45,12 +45,12 @@
         - .groups.kube_control_plane | default list | has .inventory_hostname
       command: |
         sed -i ':a;$!{N;ba};s@# kubekey control_plane_endpoint BEGIN.*# kubekey control_plane_endpoint END@@' {{ .item }}
-        cat >> {{ .item }} << EOF
+        cat >> {{ .item }} <<EOF
         # kubekey control_plane_endpoint BEGIN.
         127.0.0.1 {{ .kubernetes.control_plane_endpoint.host }}
         ::1 {{ .kubernetes.control_plane_endpoint.host }}
         # kubekey control_plane_endpoint END
-        EOF 
+        EOF
       loop: "{{ .localDNS | toJson }}"
     - name: reset worker localDNS
       when:
@@ -58,10 +58,10 @@
         - .kubernetes.control_plane_endpoint.type | eq "haproxy"
       command: |
         sed -i ':a;$!{N;ba};s@# kubekey control_plane_endpoint BEGIN.*# kubekey control_plane_endpoint END@@' {{ .item }}
-        cat >> {{ .item }} << EOF
+        cat >> {{ .item }} <<EOF
         # kubekey control_plane_endpoint BEGIN.
         127.0.0.1 {{ .kubernetes.control_plane_endpoint.host }}
         ::1 {{ .kubernetes.control_plane_endpoint.host }}
         # kubekey control_plane_endpoint END
-        EOF 
+        EOF
       loop: "{{ .localDNS | toJson }}"
\ No newline at end of file
diff --git a/builtin/core/roles/kubernetes/pre-kubernetes/tasks/high-availability/main.yaml b/builtin/core/roles/kubernetes/pre-kubernetes/tasks/high-availability/main.yaml
index e05fc25a..b76e4b03 100644
--- a/builtin/core/roles/kubernetes/pre-kubernetes/tasks/high-availability/main.yaml
+++ b/builtin/core/roles/kubernetes/pre-kubernetes/tasks/high-availability/main.yaml
@@ -43,7 +43,7 @@
 - name: Set Control Plane to localDNS file
   command: |
     sed -i ':a;$!{N;ba};s@# kubekey control_plane_endpoint BEGIN.*# kubekey control_plane_endpoint END@@' {{ .item }}
-    cat >> {{ .item }} << EOF
+    cat >> {{ .item }} <<EOF
     # kubekey control_plane_endpoint BEGIN.
     {{- if .kubernetes.control_plane_endpoint.type | eq "kube_vip" }}
     {{ .kubernetes.control_plane_endpoint.kube_vip.address }} {{ .kubernetes.control_plane_endpoint.host }}
diff --git a/builtin/core/roles/uninstall/image_registry/tasks/docker.yaml b/builtin/core/roles/uninstall/image_registry/tasks/docker.yaml
new file mode 100644
index 00000000..68d5f58b
--- /dev/null
+++ b/builtin/core/roles/uninstall/image_registry/tasks/docker.yaml
@@ -0,0 +1,38 @@
+---
+- name: Stop docker service
+  ignore_errors: true
+  command: |
+    systemctl stop docker.service
+    systemctl disable docker.service
+    rm -rf /etc/systemd/system/docker.service*
+    systemctl daemon-reload    
+    systemctl reset-failed docker.service
+
+- name: Uninstall containerd
+  block:
+    - name: Uninstall containerd service
+      ignore_errors: true
+      command: |
+        systemctl stop containerd.service
+        systemctl disable containerd.service
+        rm -rf /etc/systemd/system/containerd.service*
+        systemctl daemon-reload
+        systemctl reset-failed containerd.service
+    
+    - name: Delete containerd residue files
+      command: |
+        rm -rf {{ .cri.containerd.data_root }}
+        rm -rf /etc/containerd
+        rm -rf /usr/local/bin/containerd*
+        rm -f /usr/local/bin/runc
+        rm -f /usr/local/bin/ctr  
+
+- name: Delete docker residue files
+  command: |
+    rm -rf {{ .cri.docker.data_root }}
+    rm -rf /etc/docker
+    rm -rf /usr/local/bin/docker*
+
+- name: Uninstall docker interface
+  ignore_errors: true
+  command: ip link delete docker0
\ No newline at end of file
diff --git a/builtin/core/roles/uninstall/image_registry/tasks/main.yaml b/builtin/core/roles/uninstall/image_registry/tasks/main.yaml
index 66297416..981b695d 100644
--- a/builtin/core/roles/uninstall/image_registry/tasks/main.yaml
+++ b/builtin/core/roles/uninstall/image_registry/tasks/main.yaml
@@ -7,4 +7,7 @@
 - include_tasks: keepalived.yaml
   when: 
    - .image_registry.ha_vip | empty | not
-   - .groups.image_registry | len | lt 1
\ No newline at end of file
+   - .groups.image_registry | len | lt 1
+
+- include_tasks: docker.yaml
+  when: .deleteCRI
\ No newline at end of file