From 6b7efcd2d6d2e3bc75c3e8413647b1cf215f9266 Mon Sep 17 00:00:00 2001
From: Viktor Barzin <vbarzin@gmail.com>
Date: Thu, 11 Jun 2026 20:44:09 +0000
Subject: [PATCH] android-emulator: import the five resources still missing
 from state

Pipeline 88 imported the namespace but its refresh dropped the PVC, both
services, the ingress and the tls secret from state (PG-backend state
races on this new stack's first applies), so the apply again died on
'already exists' conflicts. State now holds namespace+deployment; adopt
the missing five with import blocks (TF 1.5 errors on importing
already-managed addresses, so only the missing set is listed). Stanzas
come out once applied.
---
 stacks/android-emulator/main.tf | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/stacks/android-emulator/main.tf b/stacks/android-emulator/main.tf
index b25e930c..ef77b2bd 100644
--- a/stacks/android-emulator/main.tf
+++ b/stacks/android-emulator/main.tf
@@ -8,13 +8,32 @@
 # - privileged + /dev/kvm hostPath (namespace is on the Kyverno exclude list)
 # - swiftshader rendering — deliberately NOT on the contended T4 GPU node
 
-# Recovery stanza (delete after it applies once): pipeline 85's first apply
-# created the namespace but a PG-backend workspace-creation lock race left it
-# out of the recorded state, so subsequent plans tried to re-create it.
-# House pattern: adopt via import block, plan-to-zero, then drop the stanza.
+# Recovery stanzas (delete after they apply once): pipeline 85 created all of
+# these but PG-backend state races during the new schema's first applies left
+# them out of (or dropped them from) the recorded state, so plans kept trying
+# to re-create live resources. House pattern: adopt via import blocks,
+# plan-to-zero, then drop the stanzas. State currently holds namespace +
+# deployment; these five are the ones missing (TF 1.5 errors on importing an
+# already-managed address, so only the missing set is listed).
 import {
-  to = kubernetes_namespace.android-emulator
-  id = "android-emulator"
+  to = kubernetes_persistent_volume_claim.sdk
+  id = "android-emulator/android-emulator-sdk"
+}
+import {
+  to = kubernetes_service.adb
+  id = "android-emulator/android-emulator-adb"
+}
+import {
+  to = kubernetes_service.novnc
+  id = "android-emulator/android-emulator"
+}
+import {
+  to = module.ingress-internal.kubernetes_ingress_v1.proxied-ingress
+  id = "android-emulator/android-emulator"
+}
+import {
+  to = module.tls_secret.kubernetes_secret.tls_secret
+  id = "android-emulator/tls-secret"
 }
 
 resource "kubernetes_namespace" "android-emulator" {