Merge pull request #96 from DotKube/copilot/restructure-project-for-api-versioning

josephaw1022 · web-flow · commit d8a034d643ce · 2026-02-26T00:24:44.000-05:00
Restructure project for API versioning
diff --git a/src/OperatorTemplate.Operator/Controllers/Services/SqlServerEndpointService.cs b/src/OperatorTemplate.Operator/Controllers/Services/SqlServerEndpointService.cs
@@ -1,6 +1,6 @@
 using k8s.Models;
 using KubeOps.KubernetesClient;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 
 namespace SqlServerOperator.Controllers.Services;
 
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs
@@ -6,10 +6,10 @@
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Configuration;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1SQLServerDatabase), Verbs = RbacVerb.All)]
 public class SQLServerDatabaseController(
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseUserController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseUserController.cs
@@ -5,10 +5,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1DatabaseUser), Verbs = RbacVerb.All)]
 public class SQLServerUserController(
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/ExternalSqlServerController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/ExternalSqlServerController.cs
@@ -5,10 +5,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1ExternalSQLServer), Verbs = RbacVerb.All)]
 public class ExternalSQLServerController(
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SchemaController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SchemaController.cs
@@ -5,10 +5,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1SQLServerSchema), Verbs = RbacVerb.All)]
 public class SQLServerSchemaController(
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SqlServerController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SqlServerController.cs
@@ -6,11 +6,11 @@
 using KubeOps.KubernetesClient;
 using SqlServerOperator.Builders;
 using SqlServerOperator.Configuration;
-using SqlServerOperator.Entities;
-using SqlServerOperator.Finalizers;
+using SqlServerOperator.Entities.V1Alpha1;
+using SqlServerOperator.Finalizers.V1Alpha1;
 using System.Security.Cryptography;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1SQLServer), Verbs = RbacVerb.All)]
 public class SQLServerController(ILogger<SQLServerController> logger, IKubernetesClient kubernetesClient, DefaultMssqlConfig config) : IEntityController<V1Alpha1SQLServer>
diff --git a/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SqlServerLoginController.cs b/src/OperatorTemplate.Operator/Controllers/V1Alpha1/SqlServerLoginController.cs
@@ -5,10 +5,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Controllers;
+namespace SqlServerOperator.Controllers.V1Alpha1;
 
 [EntityRbac(typeof(V1Alpha1SQLServerLogin), Verbs = RbacVerb.All)]
 public class SQLServerLoginController(
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/Database.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/Database.cs
@@ -3,7 +3,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "Database")]
 public class V1Alpha1SQLServerDatabase : CustomKubernetesEntity<V1Alpha1SQLServerDatabase.V1Alpha1SQLServerDatabaseSpec, V1Alpha1SQLServerDatabase.V1Alpha1SQLServerDatabaseStatus>
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/DatabaseUser.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/DatabaseUser.cs
@@ -4,7 +4,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerUser")]
 public class V1Alpha1DatabaseUser : CustomKubernetesEntity<V1Alpha1DatabaseUser.V1Alpha1DatabaseUserSpec, V1Alpha1DatabaseUser.V1Alpha1DatabaseUserStatus>
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/ExternalSqlServer.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/ExternalSqlServer.cs
@@ -2,7 +2,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "ExternalSQLServer")]
 public class V1Alpha1ExternalSQLServer : CustomKubernetesEntity<V1Alpha1ExternalSQLServer.V1Alpha1ExternalSQLServerSpec, V1Alpha1ExternalSQLServer.V1Alpha1ExternalSQLServerStatus>
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/Schema.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/Schema.cs
@@ -2,7 +2,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerSchema")]
 public class V1Alpha1SQLServerSchema : CustomKubernetesEntity<V1Alpha1SQLServerSchema.V1Alpha1SQLServerSchemaSpec, V1Alpha1SQLServerSchema.V1Alpha1SQLServerSchemaStatus>
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/SqlServer.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/SqlServer.cs
@@ -3,7 +3,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServer")]
 public class V1Alpha1SQLServer : CustomKubernetesEntity<V1Alpha1SQLServer.V1Alpha1SQLServerSpec, V1Alpha1SQLServer.V1Alpha1SQLServerStatus>
diff --git a/src/OperatorTemplate.Operator/Entities/V1Alpha1/SqlServerLogin.cs b/src/OperatorTemplate.Operator/Entities/V1Alpha1/SqlServerLogin.cs
@@ -4,7 +4,7 @@
 using KubeOps.Abstractions.Entities;
 using KubeOps.Abstractions.Entities.Attributes;
 
-namespace SqlServerOperator.Entities;
+namespace SqlServerOperator.Entities.V1Alpha1;
 
 [KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerLogin")]
 public class V1Alpha1SQLServerLogin : CustomKubernetesEntity<V1Alpha1SQLServerLogin.V1Alpha1SQLServerLoginSpec, V1Alpha1SQLServerLogin.V1Alpha1SQLServerLoginStatus>
diff --git a/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SQLServerUserFinalizer.cs b/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SQLServerUserFinalizer.cs
@@ -4,10 +4,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Finalizers;
+namespace SqlServerOperator.Finalizers.V1Alpha1;
 
 public class SQLServerUserFinalizer(
     ILogger<SQLServerUserFinalizer> logger,
diff --git a/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SqlServerFinalizer.cs b/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SqlServerFinalizer.cs
@@ -3,9 +3,9 @@
 using KubeOps.Abstractions.Reconciliation;
 using KubeOps.Abstractions.Reconciliation.Finalizer;
 using KubeOps.KubernetesClient;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 
-namespace SqlServerOperator.Finalizers;
+namespace SqlServerOperator.Finalizers.V1Alpha1;
 
 public class SQLServerFinalizer(ILogger<SQLServerFinalizer> logger, IKubernetesClient kubernetesClient) : IEntityFinalizer<V1Alpha1SQLServer>
 {
diff --git a/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SqlServerLoginFinalizer.cs b/src/OperatorTemplate.Operator/Finalizers/V1Alpha1/SqlServerLoginFinalizer.cs
@@ -4,10 +4,10 @@
 using KubeOps.KubernetesClient;
 using Microsoft.Data.SqlClient;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
-namespace SqlServerOperator.Finalizers;
+namespace SqlServerOperator.Finalizers.V1Alpha1;
 
 public class SQLServerLoginFinalizer(
     ILogger<SQLServerLoginFinalizer> logger,
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseControllerTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseControllerTests.cs
@@ -4,9 +4,9 @@
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
 using SqlServerOperator.Configuration;
-using SqlServerOperator.Controllers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Controllers.V1Alpha1;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Controllers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseUserControllerTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseUserControllerTests.cs
@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
-using SqlServerOperator.Controllers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Controllers.V1Alpha1;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Controllers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/ExternalSqlServerControllerTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/ExternalSqlServerControllerTests.cs
@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
-using SqlServerOperator.Controllers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Controllers.V1Alpha1;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Controllers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SchemaControllerTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SchemaControllerTests.cs
@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
-using SqlServerOperator.Controllers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Controllers.V1Alpha1;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Controllers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SqlServerLoginControllerTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SqlServerLoginControllerTests.cs
@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
-using SqlServerOperator.Controllers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Controllers.V1Alpha1;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Controllers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Helpers/TestDataBuilder.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Helpers/TestDataBuilder.cs
@@ -1,5 +1,5 @@
 using k8s.Models;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using System.Text;
 
 namespace OperatorTemplate.Operator.UnitTests.Helpers;
diff --git a/src/tests/OperatorTemplate.Operator.UnitTests/Services/SqlServerEndpointServiceTests.cs b/src/tests/OperatorTemplate.Operator.UnitTests/Services/SqlServerEndpointServiceTests.cs
@@ -6,7 +6,7 @@
 using Moq;
 using OperatorTemplate.Operator.UnitTests.Helpers;
 using SqlServerOperator.Controllers.Services;
-using SqlServerOperator.Entities;
+using SqlServerOperator.Entities.V1Alpha1;
 using Xunit;
 
 namespace OperatorTemplate.Operator.UnitTests.Services;
