对齐文件规范

ansible/playbooks/verify/04-01.yml

@@ -1,6 +1,45 @@
-- import_playbook: "{{ playbook_dir }}/../nodejs-demo-apply.yml"
+---
+- name: Apply nodejs-demo Kubernetes manifests
+  hosts: k3s_server
+  become: true
+  run_once: true
+  vars:
+    k3s_kubeconfig: /etc/rancher/k3s/k3s.yaml
+    nodejs_demo_manifest: "04-01-nodejs-demo.yaml"
+    manifests_dir: "{{ playbook_dir }}/../../files/04-01"
+  tasks:
+    - name: Ensure manifest file exists
+      ansible.builtin.stat:
+        path: "{{ manifests_dir }}/{{ nodejs_demo_manifest }}"
+      register: nodejs_manifest_stat
+      delegate_to: localhost
+      become: false
 
-- name: Verify 04-01 nodejs demo (rollout + HTTP)
+    - name: Fail if manifest not found
+      ansible.builtin.fail:
+        msg: "未找到 {{ manifests_dir }}/{{ nodejs_demo_manifest }}，请从仓库根检查文件名"
+      when: not nodejs_manifest_stat.stat.exists
+      delegate_to: localhost
+      become: false
+
+    - name: Copy manifest to control plane
+      ansible.builtin.copy:
+        src: "{{ manifests_dir }}/{{ nodejs_demo_manifest }}"
+        dest: "/tmp/{{ nodejs_demo_manifest }}"
+        mode: "0644"
+
+    - name: kubectl apply nodejs-demo manifest
+      ansible.builtin.shell: |
+        set -e
+        KUBECONFIG={{ k3s_kubeconfig }} kubectl apply -f /tmp/{{ nodejs_demo_manifest }}
+      register: nodejs_apply
+      changed_when: "'configured' in nodejs_apply.stdout or 'created' in nodejs_apply.stdout"
+
+    - name: Show kubectl apply output
+      ansible.builtin.debug:
+        var: nodejs_apply.stdout_lines
+
+- name: Verify 04-01 nodejs base (HTTP 200)
   hosts: k3s_server
   become: true
   run_once: true
@@ -11,39 +50,21 @@
     - name: Rollout status nodejs-demo
       ansible.builtin.shell: |
         set -e
-        KUBECONFIG={{ k3s_kubeconfig }} kubectl rollout status deployment/nodejs-demo -n default --timeout=180s
+        KUBECONFIG={{ k3s_kubeconfig }} kubectl rollout status deployment/nodejs-demo -n default --timeout=240s
       args:
         executable: /bin/bash
       changed_when: false
 
-    - name: HTTP check /node (expect 200 and Hello World)
+    - name: HTTP check /node
       ansible.builtin.shell: |
         set -e
         base="{{ verify_entry_base | trim | regex_replace('/+$','') }}"
         url="$base/node"
-        code=$(curl -s -o /dev/null -w "%{http_code}" --connect-timeout 3 --max-time 8 "$url" 2>/dev/null || echo "000")
+        code=$(curl -s -o /dev/null -w "%{http_code}" --connect-timeout 3 --max-time 10 "$url" 2>/dev/null || echo "000")
         echo "$url -> $code"
         test "$code" = "200"
-        body=$(curl -sS --connect-timeout 3 --max-time 8 "$url" 2>/dev/null || true)
-        echo "$body" | grep -q "Hello World from Node.js"
       args:
         executable: /bin/bash
       changed_when: false
 
-- name: Teardown 04-01 nodejs demo (optional)
-  hosts: k3s_server
-  become: true
-  run_once: true
-  vars:
-    k3s_kubeconfig: /etc/rancher/k3s/k3s.yaml
-    verify_teardown: "{{ (VERIFY_TEARDOWN | default('1')) | string }}"
-  tasks:
-    - name: Delete nodejs-demo resources when VERIFY_TEARDOWN=1
-      when: verify_teardown == "1"
-      ansible.builtin.shell: |
-        set -e
-        KUBECONFIG={{ k3s_kubeconfig }} kubectl delete deploy/nodejs-demo svc/nodejs-demo ing/nodejs-demo -n default --ignore-not-found=true
-      args:
-        executable: /bin/bash
-      changed_when: true