Rewritten

.github/workflows/build-publish.yml

@@ -35,7 +35,11 @@ jobs:
         run: dotnet build -c Release
 
       - name: Test
-        run: dotnet test -c Release
+        run: |
+          for project in test/*/*.csproj; do
+            echo "Running tests for $project..."
+            dotnet run --project "$project" -c Release
+          done
 
       - name: DotNet Pack
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/security-analysis.yml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: csharp
 
@@ -41,4 +41,4 @@ jobs:
         run: dotnet build --configuration Release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

K8sOperator.NET.slnx

@@ -0,0 +1,12 @@
+<Solution>
+  <Folder Name="/examples/">
+    <Project Path="examples/SimpleOperator/SimpleOperator.csproj" Id="ed579abf-9eb5-4f74-95e3-8f4ac03f760a" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/K8sOperator.NET/K8sOperator.NET.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/K8sOperator.NET.Target.Tests/K8sOperator.NET.Target.Tests.csproj" />
+    <Project Path="test/K8sOperator.NET.Tests/K8sOperator.NET.Tests.csproj" />
+  </Folder>
+</Solution>

examples/Directory.Build.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Import the parent Directory.Build.props if it exists -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" 
+          Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))"/>
+
+  <!-- For example projects that reference K8sOperator.NET as a project reference -->
+  <Import Project="$(MSBuildThisFileDirectory)..\src\K8sOperator.NET\Operator.targets" 
+          Condition="Exists('$(MSBuildThisFileDirectory)..\src\K8sOperator.NET\Operator.targets')" />
+</Project>

examples/SimpleOperator/.dockerignore

@@ -0,0 +1,48 @@
+# Git
+.git
+.gitignore
+.gitattributes
+
+# Build results
+bin/
+obj/
+[Bb]uild/
+[Dd]ebug/
+[Rr]elease/
+
+# Visual Studio
+.vs/
+.vscode/
+*.user
+*.suo
+*.userosscache
+*.sln.docstates
+
+# Test results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+TestResults/
+
+# NuGet
+*.nupkg
+*.snupkg
+packages/
+
+# Docker
+Dockerfile
+.dockerignore
+
+# Kubernetes
+*.yaml
+*.yml
+
+# Documentation
+*.md
+README*
+LICENSE
+
+# IDE
+.idea/
+*.swp
+*.swo
+*~

examples/SimpleOperator/Controllers/TodoController.cs

@@ -0,0 +1,89 @@
+using K8sOperator.NET;
+using SimpleOperator.Resources;
+
+namespace SimpleOperator.Controllers;
+
+public class TodoController : OperatorController<TodoItem>
+{
+    private readonly ILogger<TodoController> _logger;
+
+    public TodoController(ILogger<TodoController> logger)
+    {
+        _logger = logger;
+    }
+
+    public override async Task AddOrModifyAsync(TodoItem resource, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation(
+            "Processing TodoItem: {Name} - Title: {Title}, Priority: {Priority}",
+            resource.Metadata.Name,
+            resource.Spec.Title,
+            resource.Spec.Priority);
+
+        // Initialize status if needed
+        if (resource.Status == null)
+        {
+            resource.Status = new TodoItem.TodoStatus();
+        }
+
+        // Update reconciliation count
+        resource.Status.ReconciliationCount++;
+
+        // Business logic: Auto-complete if due date is passed
+        if (resource.Spec.DueDate.HasValue &&
+            resource.Spec.DueDate.Value < DateTime.UtcNow &&
+            resource.Status.State != "completed")
+        {
+            resource.Status.State = "overdue";
+            resource.Status.Message = $"Task is overdue by {(DateTime.UtcNow - resource.Spec.DueDate.Value).Days} days";
+            _logger.LogWarning("TodoItem {Name} is overdue!", resource.Metadata.Name);
+        }
+        else if (resource.Status.State == "pending")
+        {
+            resource.Status.State = "in-progress";
+            resource.Status.Message = "Task is being processed";
+            _logger.LogInformation("TodoItem {Name} moved to in-progress", resource.Metadata.Name);
+        }
+
+        // Simulate some async work
+        await Task.Delay(100, cancellationToken);
+    }
+
+    public override async Task DeleteAsync(TodoItem resource, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation(
+            "Deleting TodoItem: {Name}. Final state was: {State}",
+            resource.Metadata.Name,
+            resource.Status?.State ?? "unknown");
+
+        // Cleanup logic here (e.g., remove external resources)
+        await Task.CompletedTask;
+    }
+
+    public override async Task FinalizeAsync(TodoItem resource, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation(
+            "Finalizing TodoItem: {Name}",
+            resource.Metadata.Name);
+
+        // Perform cleanup before resource is completely deleted
+        // For example: remove related resources, notify external systems, etc.
+
+        await Task.CompletedTask;
+    }
+
+    public override async Task ErrorAsync(TodoItem resource, CancellationToken cancellationToken)
+    {
+        _logger.LogError(
+            "Error occurred for TodoItem: {Name}",
+            resource.Metadata.Name);
+
+        if (resource.Status != null)
+        {
+            resource.Status.State = "error";
+            resource.Status.Message = "An error occurred during reconciliation";
+        }
+
+        await Task.CompletedTask;
+    }
+}

examples/SimpleOperator/Dockerfile

@@ -0,0 +1,44 @@
+# Build stage
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+# Copy project file and restore dependencies
+COPY ["SimpleOperator.csproj", "./"]
+RUN dotnet restore
+
+# Copy source code and build
+COPY . .
+RUN dotnet build -c Release -o /app/build
+
+# Publish stage
+FROM build AS publish
+RUN dotnet publish -c Release -o /app/publish /p:UseAppHost=false
+
+# Runtime stage
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
+WORKDIR /app
+
+# Create non-root user
+RUN groupadd -r operator && useradd -r -g operator operator
+
+# Copy published app
+COPY --from=publish /app/publish .
+
+# Set ownership
+RUN chown -R operator:operator /app
+
+# Switch to non-root user
+USER operator
+
+# Set environment variables
+ENV ASPNETCORE_ENVIRONMENT=Production \
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    DOTNET_EnableDiagnostics=0
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+  CMD dotnet SimpleOperator.dll version || exit 1
+
+# Entrypoint
+ENTRYPOINT ["dotnet", "SimpleOperator.dll"]
+CMD ["operator"]

examples/SimpleOperator/Program.cs

@@ -1,21 +1,12 @@
 using K8sOperator.NET;
-using K8sOperator.NET.Extensions;
-using K8sOperator.NET.Generators;
-using SimpleOperator.Projects;
+using SimpleOperator.Controllers;
 
+var builder = WebApplication.CreateBuilder(args);
 
-var builder = OperatorHost.CreateOperatorApplicationBuilder(args)
-    //.WithName("simple-operator")
-    .WithNamespace("simple-ops-system");
-
-builder.AddController<TestItemController>()
-    .WithFinalizer("testitem.local.finalizer"); 
-
-builder.AddController<ProjectController>()
-    .WithFinalizer("project.local.finalizer");
+builder.Services.AddOperator();
 
 var app = builder.Build();
 
-app.AddInstall();
+app.MapController<TodoController>();
 
-await app.RunAsync();
+await app.RunOperatorAsync();