Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: New kube applier for server side diff dry run with refactoring (#21488) #21749

Conversation

andrii-korotkov-verkada
Copy link
Contributor

@andrii-korotkov-verkada andrii-korotkov-verkada commented Feb 3, 2025

Fixes: #21488

Use the new kube applier from gitops engine, which avoid the error arising from concatenating kube command stderr to stdout.

Needs to be cherry-picked to v2.14, but need a manual PR due to referencing v3 vs v2.

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 Toolchain Guide
  • 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).

…rgoproj#21488)

Fixes: argoproj#21488

Use the new kube applier from gitops engine, which avoid the error arising from concatenating kube command stderr to stdout.

Needs to be cherry-picked to v2.14.

Signed-off-by: Andrii Korotkov <[email protected]>
Copy link

bunnyshell bot commented Feb 3, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

codecov bot commented Feb 3, 2025

Codecov Report

Attention: Patch coverage is 33.33333% with 16 lines in your changes missing coverage. Please review.

Project coverage is 55.65%. Comparing base (922dd77) to head (c2058dc).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
util/kube/kubectl.go 10.00% 9 Missing ⚠️
controller/state.go 25.00% 3 Missing ⚠️
cmd/argocd/commands/admin/app.go 71.42% 1 Missing and 1 partial ⚠️
controller/sync.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #21749      +/-   ##
==========================================
+ Coverage   55.63%   55.65%   +0.02%     
==========================================
  Files         339      339              
  Lines       56812    56826      +14     
==========================================
+ Hits        31609    31629      +20     
+ Misses      22553    22546       -7     
- Partials     2650     2651       +1     

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

andrii-korotkov-verkada and others added 11 commits February 3, 2025 12:38
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
…f-dry-run-with-refactoring

Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
@andrii-korotkov-verkada andrii-korotkov-verkada marked this pull request as ready for review February 7, 2025 16:16
@andrii-korotkov-verkada andrii-korotkov-verkada requested a review from a team as a code owner February 7, 2025 16:16
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@leoluz leoluz merged commit 5b79c34 into argoproj:master Feb 7, 2025
27 checks passed
andrii-korotkov-verkada added a commit to andrii-korotkov-verkada/argo-cd that referenced this pull request Feb 7, 2025
@andrii-korotkov-verkada
Copy link
Contributor Author

Cherry pick PR for 2.14 #21819

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.

Server-Side Diff breaks Ingress modifications
2 participants