Skip to content

Commit 2d8915d

Browse files
Bliamohtg123
Bliamoh
and
tg123
authored
Update customResource example + bump nuget packages versions (#720)
Update customResource example nuget packages + update example Update httpClientFactory example nuget packages Update nuget packages Change DateTime to DateTimeOffset Update tests nuget packages Make KubernetesClient project reference instead of Nuget package reference Co-authored-by: Boshi Lian <farmer1992@gmail.com> Co-authored-by: Boshi Lian <farmer1992@gmail.com>
1 parent fb553c5 commit 2d8915d

File tree

11 files changed

+63
-53
lines changed

11 files changed

+63
-53
lines changed

‎examples/customResource/CustomResourceDefinition.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Collections.Generic;
21
using k8s;
32
using k8s.Models;
43
using Newtonsoft.Json;
4+
using System.Collections.Generic;
55

66
[module: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "CA1724:TypeNamesShouldNotMatchNamespaces", Justification = "This is just an example.")]
77
[module: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "This is just an example.")]

‎examples/customResource/Program.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
2-
using System.Collections.Generic;
31
using k8s;
42
using k8s.Models;
5-
using System.Threading.Tasks;
63
using Microsoft.AspNetCore.JsonPatch;
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Threading.Tasks;
77

88

99
namespace customResource
@@ -12,7 +12,7 @@ public class Program
1212
{
1313
private static async Task Main(string[] args)
1414
{
15-
Console.WriteLine("strating main()...");
15+
Console.WriteLine("starting main()...");
1616

1717
// creating the k8s client
1818
var k8SClientConfig = KubernetesClientConfiguration.BuildConfigFromConfigFile();
@@ -21,7 +21,7 @@ private static async Task Main(string[] args)
2121
// creating a K8s client for the CRD
2222
var myCRD = Utils.MakeCRD();
2323
Console.WriteLine("working with CRD: {0}.{1}", myCRD.PluralName, myCRD.Group);
24-
var generic = new GenericClient(k8SClientConfig, myCRD.Group, myCRD.Version, myCRD.PluralName);
24+
var generic = new GenericClient(client, myCRD.Group, myCRD.Version, myCRD.PluralName);
2525

2626
// creating a sample custom resource content
2727
var myCr = Utils.MakeCResource();

‎examples/customResource/cResource.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using k8s.Models;
2-
using System.Collections.Generic;
3-
using k8s;
42
using Newtonsoft.Json;
53

64
namespace customResource

‎examples/customResource/config/crd.yaml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1-
apiVersion: apiextensions.k8s.io/v1beta1
1+
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: customresources.csharp.com
55
spec:
66
group: csharp.com
7-
version: v1alpha1
7+
versions:
8+
- name: v1alpha1
9+
storage: true
10+
served: true
11+
schema:
12+
openAPIV3Schema:
13+
type: object
14+
properties:
15+
spec:
16+
type: object
17+
properties:
18+
cityName:
19+
type: string
820
names:
921
kind: CResource
1022
plural: customresources
11-
scope: Namespaced
23+
scope: Namespaced

‎examples/customResource/customResource.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
6-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net5.0</TargetFramework>
6+
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
10-
<PackageReference Include="KubernetesClient" Version="3.0.16" />
11-
<PackageReference Include="Microsoft.Build" Version="16.8.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.1" />
13-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
10+
<ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
11+
<PackageReference Include="Microsoft.Build" Version="16.11.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.10" />
13+
</ItemGroup>
1414

1515
</Project>

‎examples/httpClientFactory/httpClientFactory.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net5</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/KubernetesClient/Authentication/OidcTokenProvider.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
using IdentityModel.OidcClient;
2+
using k8s.Exceptions;
3+
using Microsoft.Rest;
14
using System;
5+
using System.IdentityModel.Tokens.Jwt;
26
using System.Net.Http.Headers;
37
using System.Threading;
48
using System.Threading.Tasks;
5-
using System.IdentityModel.Tokens.Jwt;
6-
using Microsoft.Rest;
7-
using IdentityModel.OidcClient;
8-
using k8s.Exceptions;
99

1010
namespace k8s.Authentication
1111
{
@@ -14,7 +14,7 @@ public class OidcTokenProvider : ITokenProvider
1414
private OidcClient _oidcClient;
1515
private string _idToken;
1616
private string _refreshToken;
17-
private DateTime _expiry;
17+
private DateTimeOffset _expiry;
1818

1919
public OidcTokenProvider(string clientId, string clientSecret, string idpIssuerUrl, string idToken, string refreshToken)
2020
{

‎src/KubernetesClient/KubernetesClient.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
</PropertyGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="AutoMapper" Version="9.0.0" />
34-
<PackageReference Include="Fractions" Version="4.0.1" />
35-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
36-
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3" />
33+
<PackageReference Include="AutoMapper" Version="10.1.1" />
34+
<PackageReference Include="Fractions" Version="7.0.0" />
35+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240" PrivateAssets="all" />
36+
<PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
3737
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />
38-
<PackageReference Include="prometheus-net" Version="4.1.1" />
39-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
40-
<PackageReference Include="System.IO.Abstractions" Version="13.2.33" />
41-
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />
42-
<PackageReference Include="YamlDotNet" Version="8.1.2" />
38+
<PackageReference Include="prometheus-net" Version="5.0.1" />
39+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
40+
<PackageReference Include="System.IO.Abstractions" Version="13.2.47" />
41+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
42+
<PackageReference Include="YamlDotNet" Version="11.2.1" />
4343
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
44-
<PackageReference Include="IdentityModel.OidcClient" Version="3.1.2" />
44+
<PackageReference Include="IdentityModel.OidcClient" Version="4.0.0" />
4545
</ItemGroup>
4646

4747
<ItemGroup>

‎tests/E2E.Tests/E2E.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
<ItemGroup>
1010

11-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.10" />
1212

13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1414

15-
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
15+
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1818
<PrivateAssets>all</PrivateAssets>

‎tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.2" />
12-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
13-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
14-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.33" />
15-
<PackageReference Include="System.Reactive" Version="4.3.2" />
16-
<PackageReference Include="Nito.AsyncEx" Version="5.1.0" />
11+
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.2.0" />
12+
<PackageReference Include="FluentAssertions" Version="6.1.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
14+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.47" />
15+
<PackageReference Include="System.Reactive" Version="5.0.0" />
16+
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020

21-
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
21+
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2424
</PackageReference>
2525

26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
2727
<PackageReference Include="xunit" Version="2.4.1" />
2828
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
3232
<PackageReference Include="Xunit.StaFact" Version="1.0.37" />
33-
<PackageReference Include="Moq" Version="4.13.1" />
33+
<PackageReference Include="Moq" Version="4.16.1" />
3434

3535
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
3636
</ItemGroup>

0 commit comments

Comments
 (0)