From 0d6d3f58282e5a7f1759ab90c84e3baf869c04a8 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 3 Nov 2025 13:10:29 +0100
Subject: [PATCH 1/2] kubectl_apply_stdin SSA support

---
 roles/kubernetes-apps/vars/main.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes-apps/vars/main.yml b/roles/kubernetes-apps/vars/main.yml
index b3c6c5bc6..9ce567414 100644
--- a/roles/kubernetes-apps/vars/main.yml
+++ b/roles/kubernetes-apps/vars/main.yml
@@ -1,2 +1,12 @@
 ---
-kubectl_apply_stdin: "{{ kubectl }} apply -f - -n {{ k8s_namespace }}"
+_kubectl_apply_stdin:
+- "{{ kubectl }}"
+- apply
+- -f
+- "-"
+- -n
+- "{{ k8s_namespace }}"
+- --server-side="{{ server_side_apply | lower }}"
+# TODO: switch to default SSA
+server_side_apply: false
+kubectl_apply_stdin: "{{ _kubectl_apply_stdin | join(' ') }}"

From e090c9ee26b95323e9c2f00c61a496b34532f15a Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 4 Nov 2025 12:08:42 +0100
Subject: [PATCH 2/2] Factor kubectl_apply_stdin into separate "vars only" role

This is needed to make it available to other roles than kubernetes-apps
---
 roles/kubernetes-apps/meta/main.yml                 | 2 ++
 roles/kubernetes-apps/{ => utils}/defaults/main.yml | 0
 roles/kubernetes-apps/{ => utils}/vars/main.yml     | 0
 3 files changed, 2 insertions(+)
 rename roles/kubernetes-apps/{ => utils}/defaults/main.yml (100%)
 rename roles/kubernetes-apps/{ => utils}/vars/main.yml (100%)

diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml
index aefc8d2a4..0ae4cec9d 100644
--- a/roles/kubernetes-apps/meta/main.yml
+++ b/roles/kubernetes-apps/meta/main.yml
@@ -1,5 +1,7 @@
 ---
 dependencies:
+  - role: kubernetes-apps/utils
+
   - role: kubernetes-apps/ansible
     when:
       - inventory_hostname == groups['kube_control_plane'][0]
diff --git a/roles/kubernetes-apps/defaults/main.yml b/roles/kubernetes-apps/utils/defaults/main.yml
similarity index 100%
rename from roles/kubernetes-apps/defaults/main.yml
rename to roles/kubernetes-apps/utils/defaults/main.yml
diff --git a/roles/kubernetes-apps/vars/main.yml b/roles/kubernetes-apps/utils/vars/main.yml
similarity index 100%
rename from roles/kubernetes-apps/vars/main.yml
rename to roles/kubernetes-apps/utils/vars/main.yml