fix: Resolve merge issues

Author: danielpanzella

docs/design/wandb_v2/struct_usage_mapping.md

@@ -47,12 +47,12 @@ This document maps struct definitions and their usage (reads/writes) across the
 
 ### MySQL Structs
 
-#### WBMySQLSpec
+#### MySQLSpec
 - 📝 **Defined**: `api/v2/weightsandbiases_types.go:84`
 - 📖 **Read by**:
   - `internal/controller/translator/v2/mysql.go` - BuildMySQLSpec(), BuildMySQLDefaults()
 - ✍️ **Written by**:
-  - `internal/controller/translator/v2/mysql.go` - Creates WBMySQLSpec{} literals with defaults
+  - `internal/controller/translator/v2/mysql.go` - Creates MySQLSpec{} literals with defaults
 
 #### WBMySQLConfig
 - 📝 **Defined**: `api/v2/weightsandbiases_types.go:95`

internal/controller/infra/minio/tenant/preserve.go

@@ -1,4 +1,4 @@
 package tenant
 
-// Preserve (for when WBRetentionPolicy's OnDelete == WBPreserveOnDelete) is
+// Preserve (for when RetentionPolicy's OnDelete == PreserveOnDelete) is
 // works out of the box with no extra WandB intervention required.

internal/controller/translator/v2/clickhouse.go

@@ -70,7 +70,7 @@ func ToClickHouseVendorSpec(
 	}
 
 	reclaimPolicy := v1.PVCReclaimPolicyUnspecified
-	if wandb.GetRetentionPolicy(wandb.Spec.ClickHouse.WBInfraSpec).OnDelete == apiv2.WBPurgeOnDelete {
+	if wandb.GetRetentionPolicy(wandb.Spec.ClickHouse.InfraSpec).OnDelete == apiv2.PurgeOnDelete {
 		reclaimPolicy = v1.PVCReclaimPolicyDelete
 	}
 
@@ -178,6 +178,6 @@ func BuildWandbClickhouseLabels(wandb *apiv2.WeightsAndBiases) map[string]string
 	return BuildWandbLabels(wandb, translator.ClickhouseModuleName)
 }
 
-func ToClickHouseOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.WBRetentionPolicy) translator.OnDeleteRule {
+func ToClickHouseOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.RetentionPolicy) translator.OnDeleteRule {
 	return ToOnDeleteRule(wandb, retentionPolicy, translator.ClickhouseModuleName)
 }

internal/controller/translator/v2/kafka.go

@@ -217,6 +217,6 @@ func BuildWandbKafkaLabels(wandb *apiv2.WeightsAndBiases) map[string]string {
 	return BuildWandbLabels(wandb, translator.KafkaModuleName)
 }
 
-func ToKafkaOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.WBRetentionPolicy) translator.OnDeleteRule {
+func ToKafkaOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.RetentionPolicy) translator.OnDeleteRule {
 	return ToOnDeleteRule(wandb, retentionPolicy, translator.KafkaModuleName)
 }

internal/controller/translator/v2/maria.go

@@ -60,7 +60,7 @@ exec /bin/mysqld_exporter --config.my-cnf=/tmp/.my.cnf
 
 func ToMariaDBMySQLVendorSpec(
 	ctx context.Context,
-	spec apiv2.WBMySQLSpec,
+	spec apiv2.MySQLSpec,
 	owner metav1.Object,
 	scheme *runtime.Scheme,
 ) (*v1alpha1.MariaDB, error) {

internal/controller/translator/v2/minio.go

@@ -147,6 +147,6 @@ func BuildWandbMinioLabels(wandb *apiv2.WeightsAndBiases) map[string]string {
 	return BuildWandbLabels(wandb, translator.MinioModuleName)
 }
 
-func ToMinioOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.WBRetentionPolicy) translator.OnDeleteRule {
+func ToMinioOnDeleteRule(wandb *apiv2.WeightsAndBiases, retentionPolicy apiv2.RetentionPolicy) translator.OnDeleteRule {
 	return ToOnDeleteRule(wandb, retentionPolicy, translator.MinioModuleName)
 }