Skip to content

Commit 85755cc

Browse files
tg123tg123
authored
8.0: API Group + v1.24 (#850)
* swagger 1.24 * trim converter * api group * before moving method * grouped api for client * fix classic build * fix e2e * move all code to v8 * fix vis to * bump ver * fix authtest filename
1 parent 78bfa24 commit 85755cc

Some content is hidden

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

51 files changed

+2551
-3425
lines changed

‎csharp.settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export KUBERNETES_BRANCH=v1.23.0
1+
export KUBERNETES_BRANCH=v1.24.0
22
export CLIENT_VERSION=0.0.1
33
export PACKAGE_NAME=k8s

‎examples/attach/Attach.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private static async Task Main(string[] args)
1313
IKubernetes client = new Kubernetes(config);
1414
Console.WriteLine("Starting Request!");
1515

16-
var list = client.ListNamespacedPod("default");
16+
var list = client.CoreV1.ListNamespacedPod("default");
1717
var pod = list.Items[0];
1818
await AttachToPod(client, pod).ConfigureAwait(false);
1919
}

‎examples/csrApproval/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ string GenerateCertificate(string name)
5555
}
5656
};
5757

58-
await client.CreateCertificateSigningRequestAsync(request);
58+
await client.CertificatesV1.CreateCertificateSigningRequestAsync(request);
5959

6060
var serializeOptions = new JsonSerializerOptions
6161
{
6262
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
6363
WriteIndented = true
6464
};
65-
var readCert = await client.ReadCertificateSigningRequestAsync(name);
65+
var readCert = await client.CertificatesV1.ReadCertificateSigningRequestAsync(name);
6666
var old = JsonSerializer.SerializeToDocument(readCert, serializeOptions);
6767

6868
var replace = new List<V1CertificateSigningRequestCondition>
@@ -74,4 +74,4 @@ string GenerateCertificate(string name)
7474
var expected = JsonSerializer.SerializeToDocument(readCert, serializeOptions);
7575

7676
var patch = old.CreatePatch(expected);
77-
await client.PatchCertificateSigningRequestApprovalAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name);
77+
await client.CertificatesV1.PatchCertificateSigningRequestApprovalAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name);

‎examples/customResource/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private static async Task Main(string[] args)
3131
try
3232
{
3333
Console.WriteLine("creating CR {0}", myCr.Metadata.Name);
34-
var response = await client.CreateNamespacedCustomObjectWithHttpMessagesAsync(
34+
var response = await client.CustomObjects.CreateNamespacedCustomObjectWithHttpMessagesAsync(
3535
myCr,
3636
myCRD.Group, myCRD.Version,
3737
myCr.Metadata.NamespaceProperty ?? "default",
@@ -66,7 +66,7 @@ private static async Task Main(string[] args)
6666
var crPatch = new V1Patch(patch, V1Patch.PatchType.JsonPatch);
6767
try
6868
{
69-
var patchResponse = await client.PatchNamespacedCustomObjectAsync(
69+
var patchResponse = await client.CustomObjects.PatchNamespacedCustomObjectAsync(
7070
crPatch,
7171
myCRD.Group,
7272
myCRD.Version,

‎examples/exec/Exec.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private static async Task Main(string[] args)
1313
IKubernetes client = new Kubernetes(config);
1414
Console.WriteLine("Starting Request!");
1515

16-
var list = client.ListNamespacedPod("default");
16+
var list = client.CoreV1.ListNamespacedPod("default");
1717
var pod = list.Items[0];
1818
await ExecInPod(client, pod).ConfigureAwait(false);
1919
}

‎examples/labels/PodList.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private static void Main(string[] args)
1212
IKubernetes client = new Kubernetes(config);
1313
Console.WriteLine("Starting Request!");
1414

15-
var list = client.ListNamespacedService("default");
15+
var list = client.CoreV1.ListNamespacedService("default");
1616
foreach (var item in list.Items)
1717
{
1818
Console.WriteLine("Pods for service: " + item.Metadata.Name);
@@ -30,7 +30,7 @@ private static void Main(string[] args)
3030

3131
var labelStr = string.Join(",", labels.ToArray());
3232
Console.WriteLine(labelStr);
33-
var podList = client.ListNamespacedPod("default", labelSelector: labelStr);
33+
var podList = client.CoreV1.ListNamespacedPod("default", labelSelector: labelStr);
3434
foreach (var pod in podList.Items)
3535
{
3636
Console.WriteLine(pod.Metadata.Name);

‎examples/logs/Logs.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private static async Task Main(string[] args)
1212
IKubernetes client = new Kubernetes(config);
1313
Console.WriteLine("Starting Request!");
1414

15-
var list = client.ListNamespacedPod("default");
15+
var list = client.CoreV1.ListNamespacedPod("default");
1616
if (list.Items.Count == 0)
1717
{
1818
Console.WriteLine("No pods!");
@@ -21,7 +21,7 @@ private static async Task Main(string[] args)
2121

2222
var pod = list.Items[0];
2323

24-
var response = await client.ReadNamespacedPodLogWithHttpMessagesAsync(
24+
var response = await client.CoreV1.ReadNamespacedPodLogWithHttpMessagesAsync(
2525
pod.Metadata.Name,
2626
pod.Metadata.NamespaceProperty, follow: true).ConfigureAwait(false);
2727
var stream = response.Body;

‎examples/namespace/NamespaceExample.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class NamespaceExample
1010
{
1111
private static void ListNamespaces(IKubernetes client)
1212
{
13-
var list = client.ListNamespace();
13+
var list = client.CoreV1.ListNamespace();
1414
foreach (var item in list.Items)
1515
{
1616
Console.WriteLine(item.Metadata.Name);
@@ -29,7 +29,7 @@ private static async Task DeleteAsync(IKubernetes client, string name, int delay
2929
await Task.Delay(delayMillis).ConfigureAwait(false);
3030
try
3131
{
32-
await client.ReadNamespaceAsync(name).ConfigureAwait(false);
32+
await client.CoreV1.ReadNamespaceAsync(name).ConfigureAwait(false);
3333
}
3434
catch (AggregateException ex)
3535
{
@@ -73,12 +73,12 @@ private static void Main(string[] args)
7373

7474
var ns = new V1Namespace { Metadata = new V1ObjectMeta { Name = "test" } };
7575

76-
var result = client.CreateNamespace(ns);
76+
var result = client.CoreV1.CreateNamespace(ns);
7777
Console.WriteLine(result);
7878

7979
ListNamespaces(client);
8080

81-
var status = client.DeleteNamespace(ns.Metadata.Name, new V1DeleteOptions());
81+
var status = client.CoreV1.DeleteNamespace(ns.Metadata.Name, new V1DeleteOptions());
8282

8383
if (status.HasObject)
8484
{

‎examples/patch/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private static void Main(string[] args)
1313
IKubernetes client = new Kubernetes(config);
1414
Console.WriteLine("Starting Request!");
1515

16-
var pod = client.ListNamespacedPod("default").Items.First();
16+
var pod = client.CoreV1.ListNamespacedPod("default").Items.First();
1717
var name = pod.Metadata.Name;
1818
PrintLabels(pod);
1919

@@ -26,8 +26,8 @@ private static void Main(string[] args)
2626
}
2727
}";
2828

29-
client.PatchNamespacedPod(new V1Patch(patchStr, V1Patch.PatchType.MergePatch), name, "default");
30-
PrintLabels(client.ReadNamespacedPod(name, "default"));
29+
client.CoreV1.PatchNamespacedPod(new V1Patch(patchStr, V1Patch.PatchType.MergePatch), name, "default");
30+
PrintLabels(client.CoreV1.ReadNamespacedPod(name, "default"));
3131
}
3232

3333
private static void PrintLabels(V1Pod pod)

‎examples/portforward/PortForward.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private static async Task Main(string[] args)
1616
IKubernetes client = new Kubernetes(config);
1717
Console.WriteLine("Starting port forward!");
1818

19-
var list = client.ListNamespacedPod("default");
19+
var list = client.CoreV1.ListNamespacedPod("default");
2020
var pod = list.Items[0];
2121
await Forward(client, pod);
2222
}

‎examples/prometheus/Prometheus.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ private static void Main(string[] args)
2121
Console.WriteLine("Making requests!");
2222
while (true)
2323
{
24-
client.ListNamespacedPod("default");
25-
client.ListNode();
26-
client.ListNamespacedDeployment("default");
24+
client.CoreV1.ListNamespacedPod("default");
25+
client.CoreV1.ListNode();
26+
client.AppsV1.ListNamespacedDeployment("default");
2727
Thread.Sleep(1000);
2828
}
2929
}

‎examples/restart/Program.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ double ConvertToUnixTimestamp(DateTime date)
1313

1414
async Task RestartDaemonSetAsync(string name, string @namespace, IKubernetes client)
1515
{
16-
var daemonSet = await client.ReadNamespacedDaemonSetAsync(name, @namespace);
16+
var daemonSet = await client.AppsV1.ReadNamespacedDaemonSetAsync(name, @namespace);
1717
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, WriteIndented = true };
1818
var old = JsonSerializer.SerializeToDocument(daemonSet, options);
1919

@@ -27,12 +27,12 @@ async Task RestartDaemonSetAsync(string name, string @namespace, IKubernetes cli
2727
var expected = JsonSerializer.SerializeToDocument(daemonSet);
2828

2929
var patch = old.CreatePatch(expected);
30-
await client.PatchNamespacedDaemonSetAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
30+
await client.AppsV1.PatchNamespacedDaemonSetAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
3131
}
3232

3333
async Task RestartDeploymentAsync(string name, string @namespace, IKubernetes client)
3434
{
35-
var deployment = await client.ReadNamespacedDeploymentAsync(name, @namespace);
35+
var deployment = await client.AppsV1.ReadNamespacedDeploymentAsync(name, @namespace);
3636
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, WriteIndented = true };
3737
var old = JsonSerializer.SerializeToDocument(deployment, options);
3838

@@ -46,12 +46,12 @@ async Task RestartDeploymentAsync(string name, string @namespace, IKubernetes cl
4646
var expected = JsonSerializer.SerializeToDocument(deployment);
4747

4848
var patch = old.CreatePatch(expected);
49-
await client.PatchNamespacedDeploymentAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
49+
await client.AppsV1.PatchNamespacedDeploymentAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
5050
}
5151

5252
async Task RestartStatefulSetAsync(string name, string @namespace, IKubernetes client)
5353
{
54-
var deployment = await client.ReadNamespacedStatefulSetAsync(name, @namespace);
54+
var deployment = await client.AppsV1.ReadNamespacedStatefulSetAsync(name, @namespace);
5555
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, WriteIndented = true };
5656
var old = JsonSerializer.SerializeToDocument(deployment, options);
5757

@@ -65,7 +65,7 @@ async Task RestartStatefulSetAsync(string name, string @namespace, IKubernetes c
6565
var expected = JsonSerializer.SerializeToDocument(deployment);
6666

6767
var patch = old.CreatePatch(expected);
68-
await client.PatchNamespacedStatefulSetAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
68+
await client.AppsV1.PatchNamespacedStatefulSetAsync(new V1Patch(patch, V1Patch.PatchType.JsonPatch), name, @namespace);
6969
}
7070

7171
var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();

‎examples/simple/PodList.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ private static void Main(string[] args)
1111
IKubernetes client = new Kubernetes(config);
1212
Console.WriteLine("Starting Request!");
1313

14-
var list = client.ListNamespacedPod("default");
14+
var list = client.CoreV1.ListNamespacedPod("default");
1515
foreach (var item in list.Items)
1616
{
1717
Console.WriteLine(item.Metadata.Name);

‎examples/watch/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ private async static Task Main(string[] args)
1414

1515
IKubernetes client = new Kubernetes(config);
1616

17-
var podlistResp = client.ListNamespacedPodWithHttpMessagesAsync("default", watch: true);
17+
var podlistResp = client.CoreV1.ListNamespacedPodWithHttpMessagesAsync("default", watch: true);
1818
// C# 8 required https://docs.microsoft.com/en-us/archive/msdn-magazine/2019/november/csharp-iterating-with-async-enumerables-in-csharp-8
1919
await foreach (var (type, item) in podlistResp.WatchAsync<V1Pod, V1PodList>())
2020
{
@@ -30,7 +30,7 @@ private async static Task Main(string[] args)
3030

3131
private static void WatchUsingCallback(IKubernetes client)
3232
{
33-
var podlistResp = client.ListNamespacedPodWithHttpMessagesAsync("default", watch: true);
33+
var podlistResp = client.CoreV1.ListNamespacedPodWithHttpMessagesAsync("default", watch: true);
3434
using (podlistResp.Watch<V1Pod, V1PodList>((type, item) =>
3535
{
3636
Console.WriteLine("==on watch event==");

0 commit comments

Comments
 (0)