From 6fa22fc99f47d9a6796a47cbbbada59158cc6764 Mon Sep 17 00:00:00 2001
From: jaydee <jaydee@sectorq.eu>
Date: Mon, 23 Feb 2026 21:47:35 +0100
Subject: [PATCH] build

---
 roles/kubernetes/tasks/Ubuntu.yml | 34 +++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/roles/kubernetes/tasks/Ubuntu.yml b/roles/kubernetes/tasks/Ubuntu.yml
index 16ec9ce..7a36f12 100644
--- a/roles/kubernetes/tasks/Ubuntu.yml
+++ b/roles/kubernetes/tasks/Ubuntu.yml
@@ -54,16 +54,32 @@
           - software-properties-common
         state: present
 
-    - name: Add Docker GPG key for containerd
-      ansible.builtin.apt_key:
-        url: https://download.docker.com/linux/ubuntu/gpg
-        keyring: /etc/apt/trusted.gpg.d/containerd.gpg
-        state: present
+    - name: Remove old Docker repository files (if any)
+      file:
+        path: "{{ item }}"
+        state: absent
+      loop:
+        - /etc/apt/sources.list.d/docker.list
+        - /etc/apt/keyrings/docker.gpg
+        - /etc/apt/trusted.gpg.d/containerd.gpg
 
-    - name: Add Docker repository
-      ansible.builtin.apt_repository:
-        repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable"
+    - name: Create keyrings directory
+      file:
+        path: /etc/apt/keyrings
+        state: directory
+        mode: '0755'
+
+    - name: Download Docker GPG key
+      get_url:
+        url: https://download.docker.com/linux/ubuntu/gpg
+        dest: /etc/apt/keyrings/docker.gpg
+        mode: '0644'
+
+    - name: Add Docker repository (Ubuntu 24.04 safe)
+      apt_repository:
+        repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable"
         state: present
+        filename: docker
 
 
     - name: Install required packages
@@ -118,7 +134,7 @@
           - kubectl
         state: present
         update_cache: yes
-        
+
       register: k8s_install
       retries: 5
       delay: 10