Skip to content

Commit 7cc782e

Browse files
authored
fix(dependencies): upgrade dependencies and fix namespace in certs (#764)
1 parent f2e31e8 commit 7cc782e

34 files changed

+491
-481
lines changed

examples/ConversionWebhookOperator/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using KubeOps.Operator;
22
using KubeOps.Operator.Web.Builder;
33

4+
#pragma warning disable CS0618 // Type or member is obsolete
5+
46
var builder = WebApplication.CreateBuilder(args);
57
builder.Services
68
.AddKubernetesOperator()

examples/WebhookOperator/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using KubeOps.Operator;
22
using KubeOps.Operator.Web.Builder;
33

4+
#pragma warning disable CS0618 // Type or member is obsolete
5+
46
var builder = WebApplication.CreateBuilder(args);
57
builder.Services
68
.AddKubernetesOperator()

src/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
<ItemGroup>
3737
<PackageReference
3838
Include="StyleCop.Analyzers"
39-
Version="1.2.0-beta.507"
39+
Version="1.2.0-beta.556"
4040
PrivateAssets="all"
4141
Condition="$(MSBuildProjectExtension) == '.csproj'" />
4242
<PackageReference
4343
Include="SonarAnalyzer.CSharp"
44-
Version="9.20.0.85982"
44+
Version="9.25.0.90414"
4545
PrivateAssets="all"
4646
Condition="$(MSBuildProjectExtension) == '.csproj'" />
47-
<PackageReference Include="Roslynator.Analyzers" Version="4.11.0" PrivateAssets="All" />
47+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.3" PrivateAssets="All" />
4848
</ItemGroup>
4949

5050
<ItemGroup>
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Security.Cryptography;
22
using System.Security.Cryptography.X509Certificates;
33

4-
namespace KubeOps.Abstractions.Certificates
5-
{
6-
public record CertificatePair(X509Certificate2 Certificate, AsymmetricAlgorithm Key);
7-
}
4+
namespace KubeOps.Abstractions.Certificates;
5+
6+
public record CertificatePair(X509Certificate2 Certificate, AsymmetricAlgorithm Key);
Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
using System.Security.Cryptography;
2-
using System.Security.Cryptography.X509Certificates;
1+
namespace KubeOps.Abstractions.Certificates;
32

4-
namespace KubeOps.Abstractions.Certificates
3+
/// <summary>
4+
/// Defines properties for certificate/key pair so a custom certificate/key provider may be implemented.
5+
/// The provider is used by the CertificateWebhookService to provide a caBundle to the webhooks.
6+
/// </summary>
7+
public interface ICertificateProvider : IDisposable
58
{
69
/// <summary>
7-
/// Defines properties for certificate/key pair so a custom certificate/key provider may be implemented.
8-
/// The provider is used by the CertificateWebhookService to provide a caBundle to the webhooks.
10+
/// The server certificate and key.
911
/// </summary>
10-
public interface ICertificateProvider : IDisposable
11-
{
12-
/// <summary>
13-
/// The server certificate and key.
14-
/// </summary>
15-
CertificatePair Server { get; }
12+
CertificatePair Server { get; }
1613

17-
/// <summary>
18-
/// The root certificate and key.
19-
/// </summary>
20-
CertificatePair Root { get; }
21-
}
14+
/// <summary>
15+
/// The root certificate and key.
16+
/// </summary>
17+
CertificatePair Root { get; }
2218
}

src/KubeOps.Abstractions/KubeOps.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="KubernetesClient" Version="12.1.1"/>
17+
<PackageReference Include="KubernetesClient" Version="14.0.2" />
1818
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
1919
</ItemGroup>
2020

src/KubeOps.Cli/Generators/CertificateGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal class CertificateGenerator(string serverName, string namespaceName) : I
77
{
88
public void Generate(ResultOutput output)
99
{
10-
using Operator.Web.CertificateGenerator generator = new(serverName, namespaceName);
10+
using Operator.Web.Certificates.CertificateGenerator generator = new(serverName, namespaceName);
1111

1212
output.Add("ca.pem", generator.Root.Certificate.EncodeToPem(), OutputFormat.Plain);
1313
output.Add("ca-key.pem", generator.Root.Key.EncodeToPem(), OutputFormat.Plain);

src/KubeOps.Cli/Generators/RbacGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void Generate(ResultOutput output)
2626

2727
var roleBinding = new V1ClusterRoleBinding(
2828
roleRef: new V1RoleRef(V1ClusterRole.KubeGroup, V1ClusterRole.KubeKind, "operator-role"),
29-
subjects: new List<V1Subject>
29+
subjects: new List<Rbacv1Subject>
3030
{
3131
new(V1ServiceAccount.KubeKind, "default", namespaceProperty: "system"),
3232
})

src/KubeOps.Cli/KubeOps.Cli.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Build.Locator" Version="1.7.1" />
22-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
25-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
26-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0" />
27-
<PackageReference Include="Spectre.Console" Version="0.48.0" />
28-
<PackageReference Include="Spectre.Console.Analyzer" Version="0.48.0">
21+
<PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
22+
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
25+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.2" />
27+
<PackageReference Include="Spectre.Console" Version="0.49.1" />
28+
<PackageReference Include="Spectre.Console.Analyzer" Version="0.49.1">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>

src/KubeOps.Cli/Transpilation/BaseWebhook.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ namespace KubeOps.Cli.Transpilation;
66

77
internal abstract record BaseWebhook(TypeInfo Webhook, EntityMetadata Metadata)
88
{
9+
public abstract string WebhookPath { get; }
10+
911
private bool HasCreate => Webhook.DeclaredMembers.Any(m => m.Name.StartsWith("Create"));
1012

1113
private bool HasUpdate => Webhook.DeclaredMembers.Any(m => m.Name.StartsWith("Update"));
1214

1315
private bool HasDelete => Webhook.DeclaredMembers.Any(m => m.Name.StartsWith("Delete"));
1416

15-
public abstract string WebhookPath { get; }
16-
1717
public string[] GetOperations() =>
1818
new[] { HasCreate ? "CREATE" : null, HasUpdate ? "UPDATE" : null, HasDelete ? "DELETE" : null, }
1919
.Where(o => o is not null).ToArray()!;

0 commit comments

Comments
 (0)