Skip to content
This repository was archived by the owner on Nov 8, 2025. It is now read-only.

Conversation

@pjiang-dev
Copy link
Contributor

@pjiang-dev pjiang-dev commented Sep 3, 2025

fixes argoproj/argo-cd#24372

Changes

  1. k8s v.1.34 now require sigs.k8s.io/structured-merge-diff/v6
  2. runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &wf) no longer works with 1.34, refactored to remove this in favor of direct field access.

Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@pjiang-dev pjiang-dev requested a review from a team as a code owner September 3, 2025 18:06
Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 3, 2025

@codecov
Copy link

codecov bot commented Sep 3, 2025

Codecov Report

❌ Patch coverage is 75.00000% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 47.30%. Comparing base (8849c3f) to head (b9da2c0).
⚠️ Report is 61 commits behind head on master.

Files with missing lines Patch % Lines
pkg/health/health_argo.go 75.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #773      +/-   ##
==========================================
- Coverage   54.26%   47.30%   -6.97%     
==========================================
  Files          64       64              
  Lines        6164     6577     +413     
==========================================
- Hits         3345     3111     -234     
- Misses       2549     3209     +660     
+ Partials      270      257      -13     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rumstead
Copy link
Member

rumstead commented Sep 4, 2025

overall looks good to me. can you create a PR argo cd referencing this change so we can see the e2e tests?

@rumstead
Copy link
Member

rumstead commented Sep 5, 2025

argoproj/argo-cd#24405 passing e2e tests

@agaudreault agaudreault merged commit 97ad5b5 into argoproj:master Sep 8, 2025
4 of 5 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bump k8s 1.34

3 participants