From 9f7e9f1fee68def86e33519ed456f996aa79b43a Mon Sep 17 00:00:00 2001
From: mw-0 <26769729+mw-0@users.noreply.github.com>
Date: Thu, 24 Sep 2026 17:29:20 +0100
Subject: [PATCH 1/2] CKS: support headlamp.yaml in upgrade-kubernetes.sh

Fixes #14244
---
 .../src/main/resources/script/upgrade-kubernetes.sh       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
index a947d508436e..6231972afb1e 100755
--- a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
+++ b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
@@ -151,7 +151,13 @@ if [ -d "$BINARIES_DIR" ]; then
     if [[ ${EXTERNAL_CNI} == true ]]; then
       /opt/bin/kubectl apply -f ${BINARIES_DIR}/network.yaml
     fi
-    /opt/bin/kubectl apply -f ${BINARIES_DIR}/dashboard.yaml
+    if [ -f "${BINARIES_DIR}/headlamp.yaml" ]; then
++      /opt/bin/kubectl apply -f ${BINARIES_DIR}/headlamp.yaml
++    elif [ -f "${BINARIES_DIR}/dashboard.yaml" ]; then
++      /opt/bin/kubectl apply -f ${BINARIES_DIR}/dashboard.yaml
++    else
++      echo "Warning: No dashboard YAML found in ISO (neither headlamp.yaml nor dashboard.yaml)"
++    fi
   fi
 
   umount "${ISO_MOUNT_DIR}" && rmdir "${ISO_MOUNT_DIR}"

From bcaf69a5cb8db035fe07c4ff94ab978dbc97b591 Mon Sep 17 00:00:00 2001
From: mw-0 <26769729+mw-0@users.noreply.github.com>
Date: Fri, 16 Oct 2026 17:08:08 +0100
Subject: [PATCH 2/2] Update upgrade-kubernetes.sh

---
 .../src/main/resources/script/upgrade-kubernetes.sh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
index 6231972afb1e..2e73467c9823 100755
--- a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
+++ b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
@@ -152,12 +152,12 @@ if [ -d "$BINARIES_DIR" ]; then
       /opt/bin/kubectl apply -f ${BINARIES_DIR}/network.yaml
     fi
     if [ -f "${BINARIES_DIR}/headlamp.yaml" ]; then
-+      /opt/bin/kubectl apply -f ${BINARIES_DIR}/headlamp.yaml
-+    elif [ -f "${BINARIES_DIR}/dashboard.yaml" ]; then
-+      /opt/bin/kubectl apply -f ${BINARIES_DIR}/dashboard.yaml
-+    else
-+      echo "Warning: No dashboard YAML found in ISO (neither headlamp.yaml nor dashboard.yaml)"
-+    fi
+      /opt/bin/kubectl apply -f ${BINARIES_DIR}/headlamp.yaml
+    elif [ -f "${BINARIES_DIR}/dashboard.yaml" ]; then
+      /opt/bin/kubectl apply -f ${BINARIES_DIR}/dashboard.yaml
+    else
+      echo "Warning: No dashboard YAML found in ISO (neither headlamp.yaml nor dashboard.yaml)"
+    fi
   fi
 
   umount "${ISO_MOUNT_DIR}" && rmdir "${ISO_MOUNT_DIR}"