Skip to content

fix: revert #25294 #28276

Draft
santi1s wants to merge 3 commits into
argoproj:masterfrom
santi1s:fix/revert-25294-restore-crd-array-ignore-differences
Draft

fix: revert #25294 #28276
santi1s wants to merge 3 commits into
argoproj:masterfrom
santi1s:fix/revert-25294-restore-crd-array-ignore-differences

Conversation

@santi1s

@santi1s santi1s commented Jun 12, 2026

Copy link
Copy Markdown

Reverts #25294, restoring the fix originally introduced in #24197.

#25294 reverted #24197 (CRD array element ignoreDifferences support) due to a nil pointer dereference (#25199). That underlying issue has since been resolved upstream per the
discussion in #17694.

Closes #23283

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@bunnyshell

bunnyshell Bot commented Jun 12, 2026

Copy link
Copy Markdown

✅ Preview Environment deployed on Bunnyshell

Component Endpoints
argocd https://argocd-6n7cua.bunnyenv.com/
argocd-ttyd https://argocd-web-cli-6n7cua.bunnyenv.com/

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔴 /bns:stop to stop the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

@santi1s santi1s changed the title Revert "fix: revert #24197 (#25294)" fix: revert #25294 Jun 12, 2026
@codecov

codecov Bot commented Jun 12, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

This reverts commit 5444415.

Signed-off-by: Sergio Santiago <sergio.santiago@doctolib.com>
@santi1s santi1s force-pushed the fix/revert-25294-restore-crd-array-ignore-differences branch from ba93ad9 to 0fc0cc5 Compare June 12, 2026 19:02
santi1s added 2 commits June 12, 2026 21:05
Signed-off-by: Sergio Santiago <sergio.santiago@doctolib.com>
Move the getOpenAPISchema call inside the RespectIgnoreDifferences=true
block so it is only invoked when the feature is actually used. This avoids
requiring all existing tests to stub GetOpenAPISchema on their ClusterCache mocks.

Signed-off-by: Sergio Santiago <sergio.santiago@doctolib.com>
@codecov

codecov Bot commented Jun 12, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 57.50000% with 17 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (master@f6ade14). Learn more about missing BASE report.

Files with missing lines Patch % Lines
controller/sync.go 57.50% 10 Missing and 7 partials ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master   #28276   +/-   ##
=========================================
  Coverage          ?   64.84%           
=========================================
  Files             ?      425           
  Lines             ?    59118           
  Branches          ?        0           
=========================================
  Hits              ?    38333           
  Misses            ?    17222           
  Partials          ?     3563           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Argocd overly conservative with RespectIgnoreDifferences for Rollouts

1 participant