From 8c1e363c851f63fe8a006cd7f8f8c73895d5458c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 May 2026 12:47:19 +0000 Subject: [PATCH 1/4] Bump OpenTelemetry.Instrumentation.Http from 1.12.0 to 1.15.1 --- updated-dependencies: - dependency-name: OpenTelemetry.Instrumentation.Http dependency-version: 1.15.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a8152c670..5cb41cc6e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,7 +17,7 @@ - + From 9dc5183214f816dfaef5419a579a91018f427c7c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 May 2026 01:23:30 +0000 Subject: [PATCH 2/4] test: retry pod update on conflict in ClientSet e2e test Agent-Logs-Url: https://github.com/kubernetes-client/csharp/sessions/ff6f30f6-9536-4b4d-8461-b0ca02c4dcad Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com> --- tests/E2E.Tests/MinikubeTests.cs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tests/E2E.Tests/MinikubeTests.cs b/tests/E2E.Tests/MinikubeTests.cs index 8a7834a54..5b9433e85 100644 --- a/tests/E2E.Tests/MinikubeTests.cs +++ b/tests/E2E.Tests/MinikubeTests.cs @@ -739,12 +739,24 @@ await clientSet.CoreV1.Pod // replace + get { - var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); - pod.Spec.Containers[0].Image = "httpd"; - await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false); + var retry = 5; + while (retry-- > 0) + { + var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); + pod.Spec.Containers[0].Image = "httpd"; + try + { + await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false); + break; + } + catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && retry > 0) + { + await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false); + } + } - pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); - Assert.Equal("httpd", pod.Spec.Containers[0].Image); + var updatedPod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); + Assert.Equal("httpd", updatedPod.Spec.Containers[0].Image); } // delete + list From 7ba3c07189765b4520ca64b4cb0987bd05904433 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 May 2026 01:25:35 +0000 Subject: [PATCH 3/4] test: clarify conflict retry attempt count in ClientSet test Agent-Logs-Url: https://github.com/kubernetes-client/csharp/sessions/ff6f30f6-9536-4b4d-8461-b0ca02c4dcad Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com> --- tests/E2E.Tests/MinikubeTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/E2E.Tests/MinikubeTests.cs b/tests/E2E.Tests/MinikubeTests.cs index 5b9433e85..70e5398c8 100644 --- a/tests/E2E.Tests/MinikubeTests.cs +++ b/tests/E2E.Tests/MinikubeTests.cs @@ -739,8 +739,8 @@ await clientSet.CoreV1.Pod // replace + get { - var retry = 5; - while (retry-- > 0) + const int maxAttempts = 5; + for (var attempt = 1; attempt <= maxAttempts; attempt++) { var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); pod.Spec.Containers[0].Image = "httpd"; @@ -749,7 +749,7 @@ await clientSet.CoreV1.Pod await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false); break; } - catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && retry > 0) + catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && attempt < maxAttempts) { await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false); } From 213238c0e90dd65122a942fb721837ab99c15807 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 6 May 2026 01:27:38 +0000 Subject: [PATCH 4/4] test: assert pod update succeeds after conflict retries Agent-Logs-Url: https://github.com/kubernetes-client/csharp/sessions/ff6f30f6-9536-4b4d-8461-b0ca02c4dcad Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com> --- tests/E2E.Tests/MinikubeTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/E2E.Tests/MinikubeTests.cs b/tests/E2E.Tests/MinikubeTests.cs index 70e5398c8..c55d26cdd 100644 --- a/tests/E2E.Tests/MinikubeTests.cs +++ b/tests/E2E.Tests/MinikubeTests.cs @@ -740,6 +740,7 @@ await clientSet.CoreV1.Pod // replace + get { const int maxAttempts = 5; + var updated = false; for (var attempt = 1; attempt <= maxAttempts; attempt++) { var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); @@ -747,6 +748,7 @@ await clientSet.CoreV1.Pod try { await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false); + updated = true; break; } catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && attempt < maxAttempts) @@ -755,6 +757,7 @@ await clientSet.CoreV1.Pod } } + Assert.True(updated, "Failed to update pod after retries due to conflicts."); var updatedPod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false); Assert.Equal("httpd", updatedPod.Spec.Containers[0].Image); }