Skip to content

Commit f5e2671

Browse files
tg123tg123
committed
Merge branch 'master' into net5
2 parents c2e4dfe + a614d95 commit f5e2671

File tree

82 files changed

+1098
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1098
-687
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ master ]
9+
schedule:
10+
- cron: '15 23 * * 1'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
language: [ 'csharp' ]
21+
22+
steps:
23+
- name: Checkout repository
24+
uses: actions/checkout@v2
25+
with:
26+
fetch-depth: 0
27+
28+
# Initializes the CodeQL tools for scanning.
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v1
31+
with:
32+
languages: ${{ matrix.language }}
33+
# If you wish to specify custom queries, you can do so here or in a config file.
34+
# By default, queries listed here will override any specified in a config file.
35+
# Prefix the list here with "+" to use these queries and those in the config file.
36+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
37+
38+
- name: Autobuild
39+
uses: github/codeql-action/autobuild@v1
40+
41+
- name: Perform CodeQL Analysis
42+
uses: github/codeql-action/analyze@v1

‎.github/workflows/nuget.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
uses: actions/setup-dotnet@v1
2222
with:
2323
dotnet-version: '3.1.x'
24+
- name: Setup dotnet SDK 5
25+
uses: actions/setup-dotnet@v1
26+
with:
27+
dotnet-version: '5.0.x'
2428
- name: Test
2529
run: dotnet test
2630
- name: Pack

‎examples/attach/attach.csproj

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

3-
<ItemGroup>
3+
<ItemGroup>
44
<ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
55
</ItemGroup>
66

77
<PropertyGroup>
8-
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp2.1</TargetFramework>
10-
<LangVersion>7.1</LangVersion>
8+
<OutputType>Exe</OutputType>
9+
<TargetFramework>net5</TargetFramework>
1110
</PropertyGroup>
1211

1312
</Project>

‎examples/exec/exec.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp2.1</TargetFramework>
10-
<LangVersion>7.1</LangVersion>
9+
<TargetFramework>net5</TargetFramework>
1110
</PropertyGroup>
1211

1312
</Project>

‎examples/generic/Generic.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
using k8s;
4+
using k8s.Models;
5+
6+
namespace exec
7+
{
8+
internal class Generic
9+
{
10+
private static async Task Main(string[] args)
11+
{
12+
var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
13+
var generic = new GenericClient(config, "", "v1", "nodes");
14+
var node = await generic.ReadAsync<V1Node>("kube0").ConfigureAwait(false);
15+
Console.WriteLine(node.Metadata.Name);
16+
17+
var genericPods = new GenericClient(config, "", "v1", "pods");
18+
var pods = await genericPods.ListNamespacedAsync<V1PodList>("default").ConfigureAwait(false);
19+
foreach (var pod in pods.Items)
20+
{
21+
Console.WriteLine(pod.Metadata.Name);
22+
}
23+
}
24+
}
25+
}

‎examples/generic/generic.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
5+
</ItemGroup>
6+
7+
<PropertyGroup>
8+
<OutputType>Exe</OutputType>
9+
<TargetFramework>net5</TargetFramework>
10+
<LangVersion>7.1</LangVersion>
11+
</PropertyGroup>
12+
13+
</Project>

‎examples/httpClientFactory/httpClientFactory.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
6-
<LangVersion>latest</LangVersion>
5+
<TargetFramework>net5</TargetFramework>
76
</PropertyGroup>
87

98
<ItemGroup>

‎examples/labels/labels.csproj

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

33
<ItemGroup>
44
<ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
55
</ItemGroup>
66

77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp2.0</TargetFramework>
9+
<TargetFramework>net5</TargetFramework>
1010
</PropertyGroup>
1111

1212
</Project>

‎examples/logs/logs.csproj

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

33
<ItemGroup>
44
<ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
55
</ItemGroup>
66

77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp2.0</TargetFramework>
10-
<LangVersion>7.1</LangVersion>
9+
<TargetFramework>net5</TargetFramework>
1110
</PropertyGroup>
1211

1312
</Project>

‎examples/metrics/metrics.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

0 commit comments

Comments
 (0)