Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/buildtest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Setup dotnet SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'
dotnet-version: '10.0.1xx'
- name: Restore nugets (msbuild)
run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true
- name: Build (msbuild)
Expand Down
5 changes: 5 additions & 0 deletions src/KubernetesClient/Kubernetes.ConfigInit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@
{
Timeout = Timeout.InfiniteTimeSpan,
};

if (!string.IsNullOrWhiteSpace(config.UserAgent))
{
HttpClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", config.UserAgent);
}
}

/// <summary>
Expand Down Expand Up @@ -220,7 +225,7 @@
#else
throw new NotSupportedException("Custom trust store requires .NET 5.0 or later. Current platform does not support this feature.");
#endif
var isValid = chain.Build((X509Certificate2)certificate);

Check warning on line 228 in src/KubernetesClient/Kubernetes.ConfigInit.cs

View workflow job for this annotation

GitHub Actions / Dotnet build (macOS-latest)

Unreachable code detected

Check warning on line 228 in src/KubernetesClient/Kubernetes.ConfigInit.cs

View workflow job for this annotation

GitHub Actions / Dotnet build (windows-latest)

Unreachable code detected

Check warning on line 228 in src/KubernetesClient/Kubernetes.ConfigInit.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Unreachable code detected

var isTrusted = false;

Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/KubernetesClientConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public partial class KubernetesClientConfiguration
/// Gets or sets the HTTP user agent.
/// </summary>
/// <value>Http user agent.</value>
public string UserAgent { get; set; }
public string UserAgent { get; set; } = $"kubernetes-csharp/{GeneratedApiVersion.AssemblyVersion}";

/// <summary>
/// Gets or sets the username (HTTP basic authentication).
Expand Down
43 changes: 43 additions & 0 deletions tests/KubernetesClient.Tests/AuthTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -633,5 +633,48 @@ private K8SConfiguration GetK8SConfiguration(string serverUri, string responseJs
return kubernetesConfig;
}
}

[Fact]
public void DefaultUserAgent()
{
using (var server = new MockKubeApiServer(testOutput, cxt =>
{
var header = cxt.Request.Headers["User-Agent"].FirstOrDefault();
Assert.NotNull(header);
Assert.StartsWith("kubernetes-csharp/", header);
return Task.FromResult(true);
}))
{
var client = new Kubernetes(new KubernetesClientConfiguration { Host = server.Uri.ToString() });

var listTask = ExecuteListPods(client);

Assert.True(listTask.Response.IsSuccessStatusCode);
}
}

[Fact]
public void CustomUserAgent()
{
const string customAgent = "my-app/1.0";

using (var server = new MockKubeApiServer(testOutput, cxt =>
{
var header = cxt.Request.Headers["User-Agent"].FirstOrDefault();
Assert.Equal(customAgent, header);
return Task.FromResult(true);
}))
{
var client = new Kubernetes(new KubernetesClientConfiguration
{
Host = server.Uri.ToString(),
UserAgent = customAgent,
});

var listTask = ExecuteListPods(client);

Assert.True(listTask.Response.IsSuccessStatusCode);
}
}
}
}
Loading