Skip to content

Combine open Dependabot dependency updates into a single branch#1811

Merged
kubernetes-prow[bot] merged 1 commit into
masterfrom
dependabot/combined-updates
Jun 22, 2026
Merged

Combine open Dependabot dependency updates into a single branch#1811
kubernetes-prow[bot] merged 1 commit into
masterfrom
dependabot/combined-updates

Conversation

@brendandburns

@brendandburns brendandburns commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Summary

This PR combines the currently open Dependabot updates into one integration PR to simplify review and CI.

Included updates:

  • actions/checkout from 6.0.2 to 6.0.3
  • Autofac from 9.1.0 to 9.2.0
  • Microsoft.Extensions.Logging to 10.0.9
  • Microsoft.Bcl.AsyncInterfaces and System.Text.Json dependency updates from the Dependabot multi-package branch
  • OpenTelemetry.Instrumentation.Http from 1.12.0 to 1.15.1
  • WireMock.Net from 1.12.0 to 2.6.0

Note: Xunit.StaFact remains at 1.2.69. Upgrading to 3.0.13 was attempted but reverted because Xunit.StaFact 3.x pulls in xunit.v3.core, which conflicts with the existing xunit 2.9.3 dependency. A full xunit v3 migration is a separate effort.

Additional test fixes carried with dependency branches

  • Conflict-retry test updates in tests/E2E.Tests/MinikubeTests.cs
  • Leader election test stabilization updates in tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs

Files in scope

  • .github/workflows/buildtest.yaml
  • Directory.Packages.props
  • examples/openTelemetryConsole/openTelemetryConsole.csproj
  • tests/E2E.Tests/MinikubeTests.cs
  • tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs

Validation note

Local dotnet test could not be executed in this dev container because installed SDK is 8.0.422 while projects target net9.0 (NETSDK1045). CI and/or a .NET 9 environment should perform final validation.

Copilot AI review requested due to automatic review settings June 18, 2026 16:52
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2026
@k8s-ci-robot k8s-ci-robot requested a review from tg123 June 18, 2026 16:52
@linux-foundation-easycla

linux-foundation-easycla Bot commented Jun 18, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: brendandburns / name: Brendan Burns (5100287)

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 18, 2026
brendandburns added a commit that referenced this pull request Jun 18, 2026
Squash all dependency and related test-fix changes from open Dependabot branches into a single commit for PR #1811.
@brendandburns brendandburns force-pushed the dependabot/combined-updates branch from 0d52fd4 to 640087a Compare June 18, 2026 16:53
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR consolidates multiple open Dependabot upgrades into a single integration branch, updating shared package versions (via central package management), refreshing the Actions checkout version in CI, and carrying forward a couple of test-stabilization tweaks to keep CI green with the upgraded dependencies.

Changes:

  • Update GitHub Actions workflow to actions/checkout v6.0.3 (pinned SHA).
  • Bump multiple NuGet dependencies in Directory.Packages.props (e.g., Autofac, Microsoft.Extensions.Logging, OpenTelemetry.Instrumentation.Http, WireMock.Net, Xunit.StaFact).
  • Adjust test logic for stability (leader election history tracking; retry-on-conflict loop in Minikube E2E test) and add a package reference needed by an OpenTelemetry example.
Show a summary per file
File Description
.github/workflows/buildtest.yaml Updates the pinned actions/checkout SHA to v6.0.3 for CI jobs.
Directory.Packages.props Centralized package version bumps across the repo (including several major/minor updates).
examples/openTelemetryConsole/openTelemetryConsole.csproj Adds a logging package reference for the OpenTelemetry console example (but currently redundantly overrides the central version).
tests/E2E.Tests/MinikubeTests.cs Refactors retry-on-conflict update loop for clearer attempt semantics and post-condition validation.
tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs Switches histories to thread-safe queues to reduce race/flakiness under concurrent event callbacks.

Copilot's findings

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

  • Files reviewed: 5/5 changed files
  • Comments generated: 2

Comment thread tests/E2E.Tests/MinikubeTests.cs
Comment thread examples/openTelemetryConsole/openTelemetryConsole.csproj Outdated
Copilot AI review requested due to automatic review settings June 18, 2026 17:38
@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot's findings

  • Files reviewed: 5/5 changed files
  • Comments generated: 3

Comment thread Directory.Packages.props
Comment thread examples/openTelemetryConsole/openTelemetryConsole.csproj Outdated
Comment thread tests/E2E.Tests/MinikubeTests.cs
Copilot AI review requested due to automatic review settings June 18, 2026 17:42
@brendandburns brendandburns force-pushed the dependabot/combined-updates branch from a856a6e to e5e9010 Compare June 18, 2026 17:42
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot's findings

  • Files reviewed: 4/4 changed files
  • Comments generated: 3

Comment thread tests/E2E.Tests/MinikubeTests.cs
Comment thread examples/openTelemetryConsole/openTelemetryConsole.csproj Outdated
Comment thread Directory.Packages.props
@brendandburns

Copy link
Copy Markdown
Contributor Author

/lgtm
/approve

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

@brendandburns: you cannot LGTM your own PR.

Details

In response to this:

/lgtm
/approve

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@brendandburns

Copy link
Copy Markdown
Contributor Author

@copilot please fix CI/CD failures

Copilot AI review requested due to automatic review settings June 19, 2026 03:32
@brendandburns brendandburns removed the request for review from Copilot June 19, 2026 03:32

Copilot AI commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@copilot please fix CI/CD failures

The CI failure was caused by Xunit.StaFact 3.0.13 pulling in xunit.v3.core, which created ambiguous type references (FactAttribute, ITestOutputHelper) with the existing xunit 2.9.3 dependency. Fixed in the latest commit by reverting Xunit.StaFact to 1.2.69, which is compatible with xunit 2.x.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 19, 2026
Copilot AI review requested due to automatic review settings June 19, 2026 03:34

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot's findings

  • Files reviewed: 9/9 changed files
  • Comments generated: 6

Comment thread tests/KubernetesClient.Tests/WebSocketTestBase.cs
Comment thread tests/KubernetesClient.Tests/WatchTests.cs
Comment thread tests/KubernetesClient.Tests/SerializationTests.cs
Comment thread tests/KubernetesClient.Tests/PodExecTests.cs
Comment thread tests/KubernetesClient.Tests/KubernetesMetricsTests.cs
Comment thread tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
@brendandburns brendandburns force-pushed the dependabot/combined-updates branch from 80dd46a to 5100287 Compare June 19, 2026 16:06
@k8s-ci-robot k8s-ci-robot removed the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jun 19, 2026
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 19, 2026
Copilot AI review requested due to automatic review settings June 19, 2026 16:07
@brendandburns brendandburns force-pushed the dependabot/combined-updates branch from 5100287 to b558898 Compare June 19, 2026 16:07

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot's findings

  • Files reviewed: 4/4 changed files
  • Comments generated: 0 new

@brendandburns

Copy link
Copy Markdown
Contributor Author

/lgtm
/approve

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

@brendandburns: you cannot LGTM your own PR.

Details

In response to this:

/lgtm
/approve

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tg123 tg123 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/LGTM

@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2026
@kubernetes-prow

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, tg123

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [brendandburns,tg123]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubernetes-prow kubernetes-prow Bot merged commit 0d559c9 into master Jun 22, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants