Skip to content

Commit 30a030b

Browse files
winromuluswinromulus
authored
refactor(project): upgrade to dotnet 9 (#476)
- Upgraded to .net 9 and removed Autofac
1 parent 16c1251 commit 30a030b

27 files changed

+361
-296
lines changed

‎.github/workflows/pipeline.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- ".github/workflows/**"
1212

1313
env:
14-
version: 7.1.${{github.run_number}}
14+
version: 9.0.${{github.run_number}}
1515
imageRepository: "emberstack/kubernetes-reflector"
1616
DOCKER_CLI_EXPERIMENTAL: "enabled"
1717

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you need help or found a bug, please feel free to open an Issue on GitHub (ht
1818
Reflector can be deployed either manually or using Helm (recommended).
1919

2020
### Prerequisites
21-
- Kubernetes 1.14+
21+
- Kubernetes 1.22+
2222
- Helm 3 (if deployed using Helm)
2323

2424
#### Deployment using Helm

‎src/Directory.Build.props‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project>
2+
<!-- Project defaults -->
3+
<PropertyGroup>
4+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
5+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<!--Generate debug symbols and embed them in the build output.-->
9+
<DebugType>embedded</DebugType>
10+
<DebugSymbols>true</DebugSymbols>
11+
<!--Set the solution directory to the parent directory of the build file.-->
12+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)..\</SolutionDir>
13+
<!--Generate XML documentation file-->
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
<!--Disable warnings from XML documentation - CS1591;CS1571;CS1573;CS1574;CS1723; - -->
16+
<!--Disable warnings NuGet vulnerabilities - NU1901;NU1902;NU1903; - -->
17+
<NoWarn>CS1591;CS1571;CS1573;CS1574;CS1723;NU1901;NU1902;NU1903;</NoWarn>
18+
</PropertyGroup>
19+
20+
<!-- JetBrains.Annotations -->
21+
<ItemGroup>
22+
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
23+
</ItemGroup>
24+
25+
<!--Test projects-->
26+
<ItemGroup Condition="'$(MSBuildProjectName)' == '' Or $(MSBuildProjectName.Contains('.Tests'))">
27+
<AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
28+
</ItemGroup>
29+
<PropertyGroup Condition="'$(MSBuildProjectName)' == '' Or $(MSBuildProjectName.Contains('.Tests'))">
30+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
31+
<VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
32+
<VSTestResultsDirectory>$(MSBuildThisFileDirectory).artifacts/TestResults</VSTestResultsDirectory>
33+
</PropertyGroup>
34+
</Project>

‎src/Directory.Packages.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="ES.FX.Ignite" Version="9.0.2" />
8+
<PackageVersion Include="ES.FX.Ignite.OpenTelemetry.Exporter.Seq" Version="9.0.2" />
9+
<PackageVersion Include="ES.FX.Ignite.Serilog" Version="9.0.2" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
11+
<PackageVersion Include="KubernetesClient" Version="16.0.2" />
12+
<PackageVersion Include="MediatR" Version="12.4.1" />
13+
<PackageVersion Include="Microsoft.AspNetCore.JsonPatch" Version="9.0.2" />
14+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
15+
</ItemGroup>
16+
</Project>

‎src/ES.Kubernetes.Reflector.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ VisualStudioVersion = 17.0.31710.8
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ES.Kubernetes.Reflector", "ES.Kubernetes.Reflector\ES.Kubernetes.Reflector.csproj", "{96CDE0CF-7782-490B-8AF6-4219DB0236B3}"
77
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "....Solution Items", "....Solution Items", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
9+
ProjectSection(SolutionItems) = preProject
10+
Directory.Build.props = Directory.Build.props
11+
EndProjectSection
12+
EndProject
813
Global
914
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1015
Debug|Any CPU = Debug|Any CPU

‎src/ES.Kubernetes.Reflector/Core/ConfigMapMirror.cs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@
66

77
namespace ES.Kubernetes.Reflector.Core;
88

9-
public class ConfigMapMirror : ResourceMirror<V1ConfigMap>
9+
public class ConfigMapMirror(ILogger<ConfigMapMirror> logger, IServiceProvider serviceProvider)
10+
: ResourceMirror<V1ConfigMap>(logger, serviceProvider)
1011
{
11-
public ConfigMapMirror(ILogger<ConfigMapMirror> logger, IKubernetes client) : base(logger, client)
12-
{
13-
}
12+
private readonly IServiceProvider _serviceProvider = serviceProvider;
1413

1514
protected override async Task<V1ConfigMap[]> OnResourceWithNameList(string itemRefName)
1615
{
17-
return (await Client.CoreV1.ListConfigMapForAllNamespacesAsync(fieldSelector: $"metadata.name={itemRefName}")).Items
16+
using var client = _serviceProvider.GetRequiredService<IKubernetes>();
17+
return (await client.CoreV1.ListConfigMapForAllNamespacesAsync(fieldSelector: $"metadata.name={itemRefName}"))
18+
.Items
1819
.ToArray();
1920
}
2021

21-
protected override Task OnResourceApplyPatch(V1Patch patch, KubeRef refId)
22+
protected override async Task OnResourceApplyPatch(V1Patch patch, KubeRef refId)
2223
{
23-
return Client.CoreV1.PatchNamespacedConfigMapAsync(patch, refId.Name, refId.Namespace);
24+
using var client = _serviceProvider.GetRequiredService<IKubernetes>();
25+
await client.CoreV1.PatchNamespacedConfigMapAsync(patch, refId.Name, refId.Namespace);
2426
}
2527

2628
protected override Task OnResourceConfigurePatch(V1ConfigMap source, JsonPatchDocument<V1ConfigMap> patchDoc)
@@ -30,9 +32,10 @@ protected override Task OnResourceConfigurePatch(V1ConfigMap source, JsonPatchDo
3032
return Task.CompletedTask;
3133
}
3234

33-
protected override Task OnResourceCreate(V1ConfigMap item, string ns)
35+
protected override async Task OnResourceCreate(V1ConfigMap item, string ns)
3436
{
35-
return Client.CoreV1.CreateNamespacedConfigMapAsync(item, ns);
37+
using var client = _serviceProvider.GetRequiredService<IKubernetes>();
38+
await client.CoreV1.CreateNamespacedConfigMapAsync(item, ns);
3639
}
3740

3841
protected override Task<V1ConfigMap> OnResourceClone(V1ConfigMap sourceResource)
@@ -46,13 +49,15 @@ protected override Task<V1ConfigMap> OnResourceClone(V1ConfigMap sourceResource)
4649
});
4750
}
4851

49-
protected override Task OnResourceDelete(KubeRef resourceId)
52+
protected override async Task OnResourceDelete(KubeRef resourceId)
5053
{
51-
return Client.CoreV1.DeleteNamespacedConfigMapAsync(resourceId.Name, resourceId.Namespace);
54+
using var client = _serviceProvider.GetRequiredService<IKubernetes>();
55+
await client.CoreV1.DeleteNamespacedConfigMapAsync(resourceId.Name, resourceId.Namespace);
5256
}
5357

54-
protected override Task<V1ConfigMap> OnResourceGet(KubeRef refId)
58+
protected override async Task<V1ConfigMap> OnResourceGet(KubeRef refId)
5559
{
56-
return Client.CoreV1.ReadNamespacedConfigMapAsync(refId.Name, refId.Namespace);
60+
using var client = _serviceProvider.GetRequiredService<IKubernetes>();
61+
return await client.CoreV1.ReadNamespacedConfigMapAsync(refId.Name, refId.Namespace);
5762
}
5863
}

‎src/ES.Kubernetes.Reflector/Core/ConfigMapWatcher.cs‎

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

99
namespace ES.Kubernetes.Reflector.Core;
1010

11-
public class ConfigMapWatcher : WatcherBackgroundService<V1ConfigMap, V1ConfigMapList>
11+
public class ConfigMapWatcher(
12+
ILogger<ConfigMapWatcher> logger,
13+
IMediator mediator,
14+
IServiceProvider serviceProvider,
15+
IOptionsMonitor<ReflectorOptions> options)
16+
: WatcherBackgroundService<V1ConfigMap, V1ConfigMapList>(logger, mediator, serviceProvider, options)
1217
{
13-
public ConfigMapWatcher(ILogger<ConfigMapWatcher> logger, IMediator mediator, IKubernetes client,
14-
IOptionsMonitor<ReflectorOptions> options) :
15-
base(logger, mediator, client, options)
18+
protected override Task<HttpOperationResponse<V1ConfigMapList>> OnGetWatcher(IKubernetes client,
19+
CancellationToken cancellationToken)
1620
{
17-
}
18-
19-
20-
protected override Task<HttpOperationResponse<V1ConfigMapList>> OnGetWatcher(CancellationToken cancellationToken)
21-
{
22-
return Client.CoreV1.ListConfigMapForAllNamespacesWithHttpMessagesAsync(watch: true, timeoutSeconds: WatcherTimeout,
21+
return client.CoreV1.ListConfigMapForAllNamespacesWithHttpMessagesAsync(watch: true,
22+
timeoutSeconds: WatcherTimeout,
2323
cancellationToken: cancellationToken);
2424
}
2525
}

‎src/ES.Kubernetes.Reflector/Core/Extensions/MetadataExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class MetadataExtensions
1111

1212
public static IReadOnlyDictionary<string, string> SafeAnnotations(this V1ObjectMeta metadata)
1313
{
14-
return (IReadOnlyDictionary<string, string>) (metadata.Annotations ?? new Dictionary<string, string>());
14+
return (IReadOnlyDictionary<string, string>)(metadata.Annotations ?? new Dictionary<string, string>());
1515
}
1616

1717
public static KubeRef GetRef(this IKubernetesObject<V1ObjectMeta> resource)
@@ -39,11 +39,11 @@ public static bool TryGet<T>(this IReadOnlyDictionary<string, string> annotation
3939
Converters.TryAdd(typeof(T), conv);
4040
}
4141

42-
value = (T?) conv.ConvertFromString(raw.Trim());
42+
value = (T?)conv.ConvertFromString(raw.Trim());
4343
}
4444
else
4545
{
46-
value = (T) Convert.ChangeType(raw.Trim(), typeof(T));
46+
value = (T)Convert.ChangeType(raw.Trim(), typeof(T));
4747
}
4848

4949
return true;

‎src/ES.Kubernetes.Reflector/Core/Json/JsonPropertyNameContractResolver.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
1818
if (member.GetCustomAttribute<JsonPropertyNameAttribute>() is not { } propertyNameAttribute) return property;
1919
property.PropertyName = propertyNameAttribute.Name;
2020
return property;
21-
2221
}
2322
}

‎src/ES.Kubernetes.Reflector/Core/Mirroring/Extensions/ReflectionStatusExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static bool CanBeAutoReflectedToNamespace(this ReflectorProperties proper
2020
private static bool PatternListMatch(string patternList, string value)
2121
{
2222
if (string.IsNullOrEmpty(patternList)) return true;
23-
var regexPatterns = patternList.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries);
23+
var regexPatterns = patternList.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
2424
return regexPatterns.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim())
2525
.Select(pattern => Regex.Match(value, pattern))
2626
.Any(match => match.Success && match.Value.Length == value.Length);

0 commit comments

Comments
 (0)