Merge branch 'main' into feature/1065-field-selector

Author: kimpenhaus

docs/docs/operator/build-customization.mdx

@@ -243,19 +243,17 @@ If you need to override how the CLI is invoked (for example, when installing to
 
 ## Using with the CRD Installer for Local Development
 
-For local development, you may want to not automatically generate resources in Debug mode and have them installed in your cluster. You can combine `GenerateOperatorResources` with the [CRD Installer utility](./utilities) for this purpose.
+For local development, you may want to not automatically generate resources in Debug mode and have them installed in your cluster. You can combine `GenerateOperatorResources` with the [CRD Installer utility](./utilities#crd-installer-utility) for this purpose.
 
 For example, in your `Program.cs`:
 
 ```csharp
 builder.Services
     .AddKubernetesOperator()
 #if DEBUG
-    .AddCrdInstaller(c =>
-    {
-        c.OverwriteExisting = true;
-        c.DeleteOnShutdown = true;
-    })
+    .AddCrdInstaller(c => c
+        .WithOverwriteExisting()
+        .WithDeleteOnShutdown())
 #endif
     .RegisterComponents();
 ```

docs/docs/operator/utilities.mdx

@@ -53,6 +53,7 @@ The CRD Installer is a powerful utility intended **only for development environm
 :::
 
 When developing operators, you may want to quickly install or update CustomResourceDefinitions (CRDs) in your cluster. The `CrdInstaller` service automates this process, making it easier to iterate on CRD changes during development.
+If the Kubernetes API server is temporarily unavailable when the operator starts, the installer logs the error and retries in the background with backoff instead of stopping the host startup.
 
 ### How to Add the CRD Installer
 
@@ -62,14 +63,12 @@ To enable the CRD installer, add the following to your operator's `Program.cs`:
 builder.Services
     .AddKubernetesOperator()
 #if DEBUG
-    .AddCrdInstaller(c =>
-    {
-        c.OverwriteExisting = true;
-        c.DeleteOnShutdown = true;
-    })
+    .AddCrdInstaller(c => c
+        .WithOverwriteExisting()
+        .WithDeleteOnShutdown())
 #endif
     .RegisterComponents();
 ```
 
-- `OverwriteExisting`: If `true`, existing CRDs with the same name will be **overwritten**. This is useful for development but can be destructive if used in production, as it may cause data loss.
-- `DeleteOnShutdown`: If `true`, all CRDs installed by the operator will be **deleted** when the operator shuts down. This is extremely destructive and should only be used in disposable development environments.
+- `WithOverwriteExisting()`: Existing CRDs with the same name will be **overwritten**. This is useful for development but can be destructive if used in production, as it may cause data loss.
+- `WithDeleteOnShutdown()`: All CRDs installed by the operator will be **deleted** when the operator shuts down. This is extremely destructive and should only be used in disposable development environments.

examples/Operator/Program.cs

@@ -14,11 +14,9 @@
 builder.Services
     .AddKubernetesOperator()
 #if DEBUG
-    .AddCrdInstaller(c =>
-    {
-        c.OverwriteExisting = true;
-        c.DeleteOnShutdown = true;
-    })
+    .AddCrdInstaller(c => c
+        .WithOverwriteExisting()
+        .WithDeleteOnShutdown())
 #endif
     .RegisterComponents();
 

src/Directory.Build.props

@@ -56,7 +56,7 @@
         <PackageReference Include="Roslynator.Analyzers"
                           Version="4.15.0"
                           PrivateAssets="All"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.203" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.300" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>

src/KubeOps.Abstractions/Builder/IOperatorBuilder.cs

@@ -93,10 +93,10 @@ IOperatorBuilder AddFinalizer<TImplementation, TEntity>(string identifier)
     /// This is intended for development purposes only.
     /// </summary>
     /// <param name="configure">
-    /// Configuration action for the <see cref="CrdInstallerSettings"/>.
+    /// Configuration action for the <see cref="CrdInstallerSettingsBuilder"/>.
     /// Determines the behavior of the CRD installer, such as whether existing CRDs
     /// should be overwritten or deleted on shutdown.
     /// </param>
     /// <returns>The builder for chaining.</returns>
-    IOperatorBuilder AddCrdInstaller(Action<CrdInstallerSettings>? configure = null);
+    IOperatorBuilder AddCrdInstaller(Action<CrdInstallerSettingsBuilder>? configure = null);
 }

src/KubeOps.Abstractions/Crds/CrdInstallerSettings.cs

@@ -5,20 +5,20 @@
 namespace KubeOps.Abstractions.Crds;
 
 /// <summary>
-/// Settings for the CRD installer.
+/// Immutable settings for the CRD installer. Created via <see cref="CrdInstallerSettingsBuilder.Build"/>.
 /// </summary>
-public sealed class CrdInstallerSettings
+public sealed record CrdInstallerSettings
 {
     /// <summary>
     /// Determines whether existing CRDs should be overwritten.
     /// This is useful for development purposes and should be used with caution.
     /// It is a destructive operation that may lead to data loss.
     /// </summary>
-    public bool OverwriteExisting { get; set; } = false;
+    public required bool OverwriteExisting { get; init; }
 
     /// <summary>
     /// Determines whether the installed CRDs should be deleted when the operator shuts down.
     /// This is a very destructive operation and should only be used in development environments.
     /// </summary>
-    public bool DeleteOnShutdown { get; set; } = false;
+    public required bool DeleteOnShutdown { get; init; }
 }

src/KubeOps.Abstractions/Crds/CrdInstallerSettingsBuilder.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+namespace KubeOps.Abstractions.Crds;
+
+/// <summary>
+/// Configures a <see cref="CrdInstallerSettings"/> instance.
+/// Set properties directly or use the fluent <c>With*</c> extension methods,
+/// then call <see cref="Build"/> to obtain the immutable <see cref="CrdInstallerSettings"/> record.
+/// </summary>
+public sealed class CrdInstallerSettingsBuilder
+{
+    /// <summary>
+    /// Determines whether existing CRDs should be overwritten.
+    /// This is useful for development purposes and should be used with caution.
+    /// It is a destructive operation that may lead to data loss.
+    /// </summary>
+    public bool OverwriteExisting { get; set; }
+
+    /// <summary>
+    /// Determines whether the installed CRDs should be deleted when the operator shuts down.
+    /// This is a very destructive operation and should only be used in development environments.
+    /// </summary>
+    public bool DeleteOnShutdown { get; set; }
+
+    /// <summary>
+    /// Produces an immutable <see cref="CrdInstallerSettings"/> record from the current configuration.
+    /// </summary>
+    /// <returns>A fully initialised <see cref="CrdInstallerSettings"/> record.</returns>
+    public CrdInstallerSettings Build() => new()
+    {
+        OverwriteExisting = OverwriteExisting,
+        DeleteOnShutdown = DeleteOnShutdown,
+    };
+}

src/KubeOps.Abstractions/Crds/CrdInstallerSettingsBuilderExtensions.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+namespace KubeOps.Abstractions.Crds;
+
+/// <summary>
+/// Fluent extension methods for <see cref="CrdInstallerSettingsBuilder"/>.
+/// Each method sets one property and returns the same builder instance for chaining.
+/// </summary>
+public static class CrdInstallerSettingsBuilderExtensions
+{
+    /// <summary>Sets whether existing CRDs should be overwritten.</summary>
+    /// <param name="builder">The builder to configure.</param>
+    /// <param name="value"><c>true</c> to overwrite existing CRDs; <c>false</c> otherwise.</param>
+    /// <returns>The same <paramref name="builder"/> instance for chaining.</returns>
+    public static CrdInstallerSettingsBuilder WithOverwriteExisting(
+        this CrdInstallerSettingsBuilder builder,
+        bool value = true)
+    {
+        builder.OverwriteExisting = value;
+        return builder;
+    }
+
+    /// <summary>Sets whether installed CRDs should be deleted when the operator shuts down.</summary>
+    /// <param name="builder">The builder to configure.</param>
+    /// <param name="value"><c>true</c> to delete installed CRDs on shutdown; <c>false</c> otherwise.</param>
+    /// <returns>The same <paramref name="builder"/> instance for chaining.</returns>
+    public static CrdInstallerSettingsBuilder WithDeleteOnShutdown(
+        this CrdInstallerSettingsBuilder builder,
+        bool value = true)
+    {
+        builder.DeleteOnShutdown = value;
+        return builder;
+    }
+}

src/KubeOps.Abstractions/KubeOps.Abstractions.csproj

@@ -16,7 +16,7 @@
     <ItemGroup>
         <PackageReference Include="JsonPatch.Net" Version="4.0.1" />
         <PackageReference Include="KubernetesClient" Version="19.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.6.0" />
     </ItemGroup>
 

src/KubeOps.Cli/KubeOps.Cli.csproj

@@ -30,7 +30,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.CommandLine" Version="2.0.7" />
+        <PackageReference Include="System.CommandLine" Version="2.0.8" />
     </ItemGroup>
 
     <ItemGroup>