Repository navigation
fix(mctl-telegram): force client-side apply for oauth ExternalSecret - #226
Merged
Merged
Conversation
ArgoCD v3.3.8 with ServerSideApply + serverSideDiff fails to apply ExternalSecrets, rejecting the request with "metadata.managedFields must be nil". This left labs-mctl-telegram-oauth stuck OutOfSync after PR #224 repointed it at the dedicated Vault path, so the new OAUTH_JWT_SIGNING_KEY never reaches the cluster. Add an optional per-ExternalSecret `annotations` map to the base-service chart and use it to set `argocd.argoproj.io/sync-options: ServerSideApply=false` on labs-mctl-telegram-oauth. Client-side apply bypasses the broken SSA path. The chart change is additive — other ExternalSecrets render unchanged. The underlying ArgoCD bug is tracked separately.
Member
Author
|
@claude review |
|
Claude finished @mashkovd's task in 1m 3s —— View job Review complete
P1: 0 | P2: 0 | P3: 0 — No findings, good to merge. The Helm template addition in The values entry uses the correct ArgoCD sync option ( |
This was referenced May 17, 2026
10 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
PR #224 repointed
labs-mctl-telegram-oauthat a dedicated Vault path, butArgoCD v3.3.8 cannot apply the updated ExternalSecret — it fails with
metadata.managedFields must be nil(ServerSideApply + serverSideDiff bug).The new
OAUTH_JWT_SIGNING_KEYtherefore never reaches the cluster and themctl-telegram dedicated-key rollout is stuck at the last step.
What
annotationsmapto
externalsecret-extra.yaml. Purely additive — ExternalSecrets that don'tset it render byte-identically (verified with
helm template).argocd.argoproj.io/sync-options: ServerSideApply=falseonlabs-mctl-telegram-oauthso ArgoCD applies it client-side, bypassing thebroken SSA path.
No manual deletion of secret resources — GitOps stays the source of truth.
Follow-up
The underlying ArgoCD bug is tracked in #225 (also affects
admins-mctl-agent).Remove this per-resource workaround once ArgoCD is fixed/upgraded.