From f298339152d0b90a2007a30e0fddf2de23c0b38b Mon Sep 17 00:00:00 2001 From: Codex Date: Tue, 12 May 2026 09:26:03 -0500 Subject: [PATCH] fix(guacamole): add --- separator between macmini-vnc-creds OnePasswordItem and guacamole-branding ConfigMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missing document separator caused YAML to merge the OnePasswordItem's top-level `spec: itemPath:` block into the ConfigMap that follows. Result: a ConfigMap with a `.spec` field whose K8s schema does not declare one, triggering ArgoCD's structured-merge diff to fail since 2026-05-11T15:30:54Z: Failed to compare desired state to live state: failed to calculate diff: error calculating structured merge diff: error building typed value from config resource: .spec: field not declared in schema App stayed Healthy (live K8s tolerated the extra field — ConfigMap ignored it) but ArgoCD's diff calc was broken, leaving the app stuck at sync=Unknown for all 21 resources. Adding the missing `---` separator makes the OnePasswordItem and ConfigMap proper sibling YAML documents, each with its own kind-correct schema. Diagnosed during 2026-05-12 morning routine. Co-Authored-By: Claude Opus 4.7 (1M context) --- apps/guacamole/guacamole.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/guacamole/guacamole.yaml b/apps/guacamole/guacamole.yaml index ebee21d..d9b6933 100644 --- a/apps/guacamole/guacamole.yaml +++ b/apps/guacamole/guacamole.yaml @@ -466,11 +466,11 @@ spec: itemPath: vaults/IAmWorkin/items/Guacamole JSON Auth --- --- -# 1Password-backed credentials for Mac mini VNC access (Phase 1 — 2026-04-28) +# 1Password-backed credentials for Mac mini VNC access (Phase 1 � 2026-04-28) # The operator mints Secret 'macmini-vnc-creds' with keys: username, password, VNC Password # Note: '1Password' field label 'VNC Password' -> K8s Secret key 'VNC Password' (space retained) # Guacamole VNC connection password is sourced from the 'VNC Password' field. -# Actual IP is 10.0.56.115 (INFRA VLAN) — the 1P item 'IP' field is kept as backup reference. +# Actual IP is 10.0.56.115 (INFRA VLAN) � the 1P item 'IP' field is kept as backup reference. apiVersion: onepassword.com/v1 kind: OnePasswordItem metadata: @@ -481,6 +481,7 @@ metadata: app.kubernetes.io/part-of: flowercore spec: itemPath: vaults/IAmWorkin/items/Mac Mini +--- # Blue Jay Branding Extension (CSS + translations) apiVersion: v1 kind: ConfigMap