Skip to content

Commit 638f614

Browse files
tg123tg123
committed
chore: update project files and clean up unused references
1 parent 0dfabb7 commit 638f614

File tree

9 files changed

+67
-45
lines changed

9 files changed

+67
-45
lines changed

‎examples/csrApproval/Program.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ string GenerateCertificate(string name)
6767

6868
var replace = new List<V1CertificateSigningRequestCondition>
6969
{
70-
new ("True", "Approved", DateTime.UtcNow, DateTime.UtcNow, "This certificate was approved by k8s client", "Approve"),
70+
new V1CertificateSigningRequestCondition
71+
{
72+
Type = "Approved",
73+
Status = "True",
74+
Reason = "Approve",
75+
Message = "This certificate was approved by k8s client",
76+
LastUpdateTime = DateTime.UtcNow,
77+
LastTransitionTime = DateTime.UtcNow,
78+
},
7179
};
7280
readCert.Status.Conditions = replace;
7381

‎examples/customResource/cResource.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public override string ToString()
1919
}
2020
}
2121

22-
public class CResourceSpec
22+
public record CResourceSpec
2323
{
2424
[JsonPropertyName("cityName")]
2525
public string CityName { get; set; }
2626
}
2727

28-
public class CResourceStatus : V1Status
28+
public record CResourceStatus : V1Status
2929
{
3030
[JsonPropertyName("temperature")]
3131
public string Temperature { get; set; }

‎src/KubernetesClient.Aot/KubernetesClient.Aot.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<Compile Include="..\KubernetesClient\Models\KubernetesList.cs" />
3333
<Compile Include="..\KubernetesClient\KubernetesObject.cs" />
3434
<Compile Include="..\KubernetesClient\Models\ModelExtensions.cs" />
35-
<Compile Include="..\KubernetesClient\Models\ModelVersionConverter.cs" />
3635
<Compile Include="..\KubernetesClient\Models\NodeMetrics.cs" />
3736
<Compile Include="..\KubernetesClient\Models\NodeMetricsList.cs" />
3837
<Compile Include="..\KubernetesClient\Models\PodMetrics.cs" />

‎src/KubernetesClient.Classic/KubernetesClient.Classic.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<Compile Include="..\KubernetesClient\KubernetesObject.cs" />
3737
<Compile Include="..\KubernetesClient\KubernetesYaml.cs" />
3838
<Compile Include="..\KubernetesClient\Models\ModelExtensions.cs" />
39-
<Compile Include="..\KubernetesClient\Models\ModelVersionConverter.cs" />
4039
<Compile Include="..\KubernetesClient\Models\NodeMetrics.cs" />
4140
<Compile Include="..\KubernetesClient\Models\NodeMetricsList.cs" />
4241
<Compile Include="..\KubernetesClient\Models\PodMetrics.cs" />

‎src/KubernetesClient/Models/ResourceQuantity.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@ public ResourceQuantity(decimal n, int exp, SuffixFormat format)
8585
Format = format;
8686
}
8787

88+
public ResourceQuantity(string s)
89+
{
90+
Value = s;
91+
CustomInit();
92+
}
93+
8894
public SuffixFormat Format { get; private set; }
8995

9096
public string CanonicalizeString()

‎src/LibKubernetesGenerator/ModelGenerator.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public void Generate(OpenApiDocument swagger, IncrementalGeneratorPostInitializa
2222
var extSkippedTypes = new HashSet<string>
2323
{
2424
"V1WatchEvent",
25-
"V1Status",
26-
"V1Patch",
2725
};
2826

2927
var typeOverrides = new Dictionary<string, string>

‎tests/E2E.Aot.Tests/MinikubeTests.cs‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -172,27 +172,33 @@ public async Task DatetimeFieldTest()
172172
using var kubernetes = CreateClient();
173173

174174
await kubernetes.CoreV1.CreateNamespacedEventAsync(
175-
new Corev1Event(
176-
new V1ObjectReference(
177-
"v1alpha1",
178-
kind: "Test",
179-
name: "test",
180-
namespaceProperty: "default",
181-
resourceVersion: "1",
182-
uid: "1"),
183-
new V1ObjectMeta()
175+
new Corev1Event
176+
{
177+
InvolvedObject = new V1ObjectReference
178+
{
179+
ApiVersion = "v1alpha1",
180+
Kind = "Test",
181+
Name = "test",
182+
NamespaceProperty = "default",
183+
ResourceVersion = "1",
184+
Uid = "1",
185+
},
186+
Metadata = new V1ObjectMeta
184187
{
185188
GenerateName = "started-",
186189
},
187-
action: "STARTED",
188-
type: "Normal",
189-
reason: "STARTED",
190-
message: "Started",
191-
eventTime: DateTime.Now,
192-
firstTimestamp: DateTime.Now,
193-
lastTimestamp: DateTime.Now,
194-
reportingComponent: "37",
195-
reportingInstance: "38"), "default").ConfigureAwait(false);
190+
Action = "STARTED",
191+
Type = "Normal",
192+
Reason = "STARTED",
193+
Message = "Started",
194+
EventTime = DateTime.Now,
195+
FirstTimestamp = DateTime.Now,
196+
LastTimestamp = DateTime.Now,
197+
ReportingComponent = "37",
198+
ReportingInstance = "38",
199+
},
200+
"default"
201+
).ConfigureAwait(false);
196202
}
197203

198204
[MinikubeFact]

‎tests/E2E.Tests/MinikubeTests.cs‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -451,27 +451,33 @@ public async Task DatetimeFieldTest()
451451
using var kubernetes = CreateClient();
452452

453453
await kubernetes.CoreV1.CreateNamespacedEventAsync(
454-
new Corev1Event(
455-
new V1ObjectReference(
456-
"v1alpha1",
457-
kind: "Test",
458-
name: "test",
459-
namespaceProperty: "default",
460-
resourceVersion: "1",
461-
uid: "1"),
462-
new V1ObjectMeta()
454+
new Corev1Event
455+
{
456+
Metadata = new V1ObjectMeta
463457
{
464458
GenerateName = "started-",
459+
NamespaceProperty = "default",
460+
},
461+
InvolvedObject = new V1ObjectReference
462+
{
463+
ApiVersion = "v1alpha1",
464+
Kind = "Test",
465+
Name = "test",
466+
NamespaceProperty = "default",
467+
ResourceVersion = "1",
468+
Uid = "1",
465469
},
466-
action: "STARTED",
467-
type: "Normal",
468-
reason: "STARTED",
469-
message: "Started",
470-
eventTime: DateTime.Now,
471-
firstTimestamp: DateTime.Now,
472-
lastTimestamp: DateTime.Now,
473-
reportingComponent: "37",
474-
reportingInstance: "38"), "default").ConfigureAwait(false);
470+
Action = "STARTED",
471+
Type = "Normal",
472+
Reason = "STARTED",
473+
Message = "Started",
474+
EventTime = DateTime.Now,
475+
FirstTimestamp = DateTime.Now,
476+
LastTimestamp = DateTime.Now,
477+
ReportingComponent = "37",
478+
ReportingInstance = "38",
479+
},
480+
"default").ConfigureAwait(false);
475481
}
476482

477483
[MinikubeFact]

‎tests/KubernetesClient.Tests/KubernetesYamlTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void LoadAllFromString()
3333
}
3434

3535
#pragma warning disable CA1812 // Class is used for YAML deserialization tests
36-
private class MyPod : V1Pod
36+
private record MyPod : V1Pod
3737
{
3838
}
3939
#pragma warning restore CA1812
@@ -531,7 +531,7 @@ public void SerializeIntOrString()
531531
var obj = new V1Service
532532
{
533533
Kind = "Service",
534-
Metadata = new V1ObjectMeta(labels: labels, name: "test-svc"),
534+
Metadata = new V1ObjectMeta { Name = "test-svc", Labels = labels },
535535
ApiVersion = "v1",
536536
Spec = new V1ServiceSpec
537537
{

0 commit comments

Comments
 (0)