From 334fe05738a2ec2b81df874ec19a944d3dfc0f1d Mon Sep 17 00:00:00 2001
From: rohow <admin@dev.cm>
Date: Tue, 16 Jun 2026 15:35:31 +0800
Subject: [PATCH] fix(k3s): update Flux node selectors, remove clawjp host, and
 adjust Gitea runner/Docker tag settings

---
 ansible/inventory/hosts.yml                                   | 4 ----
 flux/flux-instance.yaml                                       | 2 +-
 .../infra-gitops/post/helmrelease-gitea-actions.yaml          | 3 ++-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ansible/inventory/hosts.yml b/ansible/inventory/hosts.yml
index 2b87a4b..ca8cfa3 100644
--- a/ansible/inventory/hosts.yml
+++ b/ansible/inventory/hosts.yml
@@ -94,10 +94,6 @@ all:
           ansible_host: clawhk.node.dev.cm
           node_hostname: clawhk
           node_region: cn-hk
-        clawjp:
-          ansible_host: clawjp.node.dev.cm
-          node_hostname: clawjp
-          node_region: jp-tyo
         orajpa:
           ansible_host: orajpa.node.dev.cm
           node_hostname: orajpa
diff --git a/flux/flux-instance.yaml b/flux/flux-instance.yaml
index 7e10b4d..ebf274d 100644
--- a/flux/flux-instance.yaml
+++ b/flux/flux-instance.yaml
@@ -47,7 +47,7 @@ spec:
                         - key: kubernetes.io/hostname
                           operator: In
                           values:
-                            - clawjp
+                            - tchk
       - target:
           kind: Deployment
           name: (helm-controller|kustomize-controller|notification-controller)
diff --git a/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml b/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml
index 79a7eac..cae9ff0 100644
--- a/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml
+++ b/flux/infrastructure/infra-gitops/post/helmrelease-gitea-actions.yaml
@@ -20,7 +20,7 @@ spec:
   values:
     enabled: true
     statefulset:
-      actRunner:
+      runner:
         config: |
           log:
             level: info
@@ -32,6 +32,7 @@ spec:
             # 使用bridge网络模式，解决新建任务临时网络mtu与主机不一致的问题
             network: bridge
       dind:
+        tag: 29.5.2-dind
         # 挂载dind docker配置文件，解决mtu带来的网络问题
         extraVolumeMounts:
           - name: dind-config-volume