From cb806a8e4feb81638eed43847a847371042f1d08 Mon Sep 17 00:00:00 2001
From: Matthias Erll <merll@akamai.com>
Date: Wed, 5 Nov 2025 16:29:31 +0100
Subject: [PATCH 1/2] fix: force apply essential manifests on upgrade

---
 src/common/hf.ts              | 5 +++--
 src/common/runtime-upgrade.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/common/hf.ts b/src/common/hf.ts
index 86b96130eb..2e96afe04c 100644
--- a/src/common/hf.ts
+++ b/src/common/hf.ts
@@ -11,6 +11,7 @@ import { getParsedArgs, HelmArguments } from './yargs'
 import { ProcessOutputTrimmed, Streams } from './zx-enhance'
 import { resolve } from 'path'
 import { existsSync, mkdirSync, writeFileSync } from 'fs'
+import { applyServerSide } from './k8s'
 
 const replaceHFPaths = (output: string, envDir = env.ENV_DIR): string => output.replaceAll('../env', envDir)
 export const HF_DEFAULT_SYNC_ARGS = ['sync', '--concurrency=1', '--sync-args', '--disable-openapi-validation --qps=20']
@@ -191,7 +192,7 @@ export const hfTemplate = async (
   return template
 }
 
-export const deployEssential = async (labelOpts: string[] | null = null) => {
+export const deployEssential = async (labelOpts: string[] | null = null, force: boolean = false) => {
   const d = terminal('common:hf:applyEssential')
   const dir = '/tmp/otomi/'
 
@@ -215,7 +216,7 @@ export const deployEssential = async (labelOpts: string[] | null = null) => {
     }
     writeFileSync(templateFile, templateOutput)
 
-    await $`kubectl apply --server-side=true -f ${templateFile}`
+    await applyServerSide(templateFile, force)
   }
 
   return true
diff --git a/src/common/runtime-upgrade.ts b/src/common/runtime-upgrade.ts
index f876e6d998..97dcf25858 100644
--- a/src/common/runtime-upgrade.ts
+++ b/src/common/runtime-upgrade.ts
@@ -21,7 +21,7 @@ export async function runtimeUpgrade({ when }: RuntimeUpgradeArgs): Promise<void
   }
 
   d.info('Deploying essential manifests')
-  const essentialDeployResult = await deployEssential(['upgrade=true'])
+  const essentialDeployResult = await deployEssential(['upgrade=true'], true)
   if (!essentialDeployResult) {
     throw new Error('Failed to update namespaces')
   }

From daf6ab89236e21f02f582bef82cd65044fb15796 Mon Sep 17 00:00:00 2001
From: Matthias Erll <merll@akamai.com>
Date: Wed, 5 Nov 2025 20:10:13 +0100
Subject: [PATCH 2/2] fix: force apply team namespaces

---
 src/cmd/apply-teams.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmd/apply-teams.ts b/src/cmd/apply-teams.ts
index 073a9dadd0..643d5ed32d 100644
--- a/src/cmd/apply-teams.ts
+++ b/src/cmd/apply-teams.ts
@@ -8,7 +8,7 @@ const d = terminal(`cmd:${cmdName}:apply-teams`)
 
 export const applyTeams = async (): Promise<boolean> => {
   d.info('Deploying team namespaces')
-  const result = await deployEssential(['team=true'])
+  const result = await deployEssential(['team=true'], true)
 
   if (result) {
     d.info('Teams applied')