From 3ece592b51003ce4dafa6ac8345c208043c884cd Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Sat, 2 Aug 2025 02:03:16 +0800
Subject: [PATCH] Refactor: add common_crds role & migrate gateway_api

Adding commonly used CRDs can be expanded

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 playbooks/cluster.yml                                       | 6 +-----
 .../{ => common_crds}/gateway_api/defaults/main.yml         | 0
 .../{ => common_crds}/gateway_api/tasks/main.yml            | 2 +-
 roles/kubernetes-apps/common_crds/meta/main.yml             | 6 ++++++
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename roles/kubernetes-apps/{ => common_crds}/gateway_api/defaults/main.yml (100%)
 rename roles/kubernetes-apps/{ => common_crds}/gateway_api/tasks/main.yml (94%)
 create mode 100644 roles/kubernetes-apps/common_crds/meta/main.yml

diff --git a/playbooks/cluster.yml b/playbooks/cluster.yml
index 85829ca44..71cef8483 100644
--- a/playbooks/cluster.yml
+++ b/playbooks/cluster.yml
@@ -52,11 +52,7 @@
     - { role: kubernetes/kubeadm, tags: kubeadm}
     - { role: kubernetes/node-label, tags: node-label }
     - { role: kubernetes/node-taint, tags: node-taint }
-    - role: kubernetes-apps/gateway_api
-      when: gateway_api_enabled
-      tags: gateway_api
-      delegate_to: "{{ groups['kube_control_plane'][0] }}"
-      run_once: true
+    - { role: kubernetes-apps/common_crds }
     - { role: network_plugin, tags: network }
 
 - name: Install Calico Route Reflector
diff --git a/roles/kubernetes-apps/gateway_api/defaults/main.yml b/roles/kubernetes-apps/common_crds/gateway_api/defaults/main.yml
similarity index 100%
rename from roles/kubernetes-apps/gateway_api/defaults/main.yml
rename to roles/kubernetes-apps/common_crds/gateway_api/defaults/main.yml
diff --git a/roles/kubernetes-apps/gateway_api/tasks/main.yml b/roles/kubernetes-apps/common_crds/gateway_api/tasks/main.yml
similarity index 94%
rename from roles/kubernetes-apps/gateway_api/tasks/main.yml
rename to roles/kubernetes-apps/common_crds/gateway_api/tasks/main.yml
index 7134fe2d8..8d792c3ed 100644
--- a/roles/kubernetes-apps/gateway_api/tasks/main.yml
+++ b/roles/kubernetes-apps/common_crds/gateway_api/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Gateway API | Download YAML
-  include_tasks: "../../../download/tasks/download_file.yml"
+  include_tasks: "../../../../download/tasks/download_file.yml"
   vars:
     download: "{{ download_defaults | combine(downloads.gateway_api_crds) }}"
 
diff --git a/roles/kubernetes-apps/common_crds/meta/main.yml b/roles/kubernetes-apps/common_crds/meta/main.yml
new file mode 100644
index 000000000..27dba36e5
--- /dev/null
+++ b/roles/kubernetes-apps/common_crds/meta/main.yml
@@ -0,0 +1,6 @@
+---
+dependencies:
+  - role: kubernetes-apps/common_crds/gateway_api
+    when: gateway_api_enabled
+    tags:
+      - gateway_api