From 3df64c95fe669f14e89b21e217e459de87ea5089 Mon Sep 17 00:00:00 2001 From: John Sell Date: Thu, 28 May 2026 18:01:58 -0400 Subject: [PATCH] fix(manifests): remove GITHUB_CALLBACK_URL from kustomize base The deploy workflow sets GITHUB_CALLBACK_URL imperatively via 'oc set env' after kustomize apply, which writes a plain value= into the live Deployment. Having GITHUB_CALLBACK_URL declared in the kustomize base (with valueFrom) causes oc apply's 3-way merge to produce a conflicting object with both value and valueFrom set, which Kubernetes rejects. Remove the var from the kustomize manifests entirely so oc set env owns it exclusively and no merge conflict can occur. Co-Authored-By: Claude Sonnet 4.6 --- components/manifests/base/core/frontend-deployment.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/manifests/base/core/frontend-deployment.yaml b/components/manifests/base/core/frontend-deployment.yaml index 494c3fcd5..0d4d67dd8 100644 --- a/components/manifests/base/core/frontend-deployment.yaml +++ b/components/manifests/base/core/frontend-deployment.yaml @@ -44,12 +44,6 @@ spec: name: unleash-credentials key: client-api-token optional: true - - name: GITHUB_CALLBACK_URL - valueFrom: - configMapKeyRef: - name: frontend-config - key: github-callback-url - optional: true resources: requests: cpu: 100m