Merge branch 'yugabyte:master' into master

Author: avoidik

managed/build.sbt

@@ -242,6 +242,7 @@ libraryDependencies ++= Seq(
   "io.fabric8" % "kubernetes-client" % "6.8.0",
   "io.fabric8" % "kubernetes-client-api" % "6.8.0",
   "io.fabric8" % "kubernetes-model" % "6.8.0",
+  "io.fabric8" % "kubernetes-server-mock" % "6.8.0",
   "org.modelmapper" % "modelmapper" % "2.4.4",
   "com.datadoghq" % "datadog-api-client" % "2.25.0" classifier "shaded-jar",
   "javax.xml.bind" % "jaxb-api" % "2.3.1",
@@ -468,7 +469,7 @@ generateCrdObjects / fileInputs += baseDirectory.value.toGlob /
 generateCrdObjects := {
   if (generateCrdObjects.inputFileChanges.hasChanges) {
     ybLog("Generating crd classes...")
-    val generatedSourcesDirectory = baseDirectory.value / "target/scala-2.13/"
+    val generatedSourcesDirectory = baseDirectory.value / "target/operatorCRD/"
     val command = s"mvn generate-sources -DoutputDirectory=$generatedSourcesDirectory"
     val status = Process(command, baseDirectory.value / "src/main/java/com/yugabyte/yw/common/operator/").!
     status
@@ -477,6 +478,7 @@ generateCrdObjects := {
     0
   }
 }
+Compile / unmanagedSourceDirectories += baseDirectory.value / "target/operatorCRD/"
 
 downloadThirdPartyDeps := {
   ybLog("Downloading third-party dependencies...")

managed/node-agent/app/task/install_otel_collector.go

@@ -87,8 +87,13 @@ func (h *InstallOtelCollector) Handle(ctx context.Context) (*pb.DescribeTaskResp
 		return nil, err
 	}
 
-	// 4) stop the systemd-unit if it's running.
-	if err := module.StopSystemdService(ctx, h.username, OtelCollectorService, h.logOut); err != nil {
+	// 4) Stop and disable the systemd service
+	if err := module.DisableSystemdService(
+		ctx,
+		h.username,
+		OtelCollectorService,
+		"", // Don't remove the unit file - we need it for re-enabling later
+		h.logOut); err != nil {
 		return nil, err
 	}
 
@@ -99,9 +104,14 @@ func (h *InstallOtelCollector) Handle(ctx context.Context) (*pb.DescribeTaskResp
 		return nil, err
 	}
 
-	// 6) Start and enable the otel-collector service.
-	if err = module.StartSystemdService(ctx, h.username, OtelCollectorService, h.logOut); err != nil {
-		return nil, err
+	// 6) Start and enable the service only if config file exists
+	if h.param.GetOtelColConfigFile() != "" {
+		if err = module.StartSystemdService(ctx, h.username, OtelCollectorService, h.logOut); err != nil {
+			return nil, err
+		}
+		if err = module.EnableSystemdService(ctx, h.username, OtelCollectorService, h.logOut); err != nil {
+			return nil, err
+		}
 	}
 	return nil, nil
 }

managed/src/main/java/MainModule.java

@@ -84,7 +84,9 @@
 import com.yugabyte.yw.common.operator.OperatorStatusUpdaterFactory;
 import com.yugabyte.yw.common.operator.YBInformerFactory;
 import com.yugabyte.yw.common.operator.YBReconcilerFactory;
+import com.yugabyte.yw.common.operator.utils.KubernetesClientFactory;
 import com.yugabyte.yw.common.operator.utils.OperatorUtils;
+import com.yugabyte.yw.common.operator.utils.UniverseImporter;
 import com.yugabyte.yw.common.rbac.PermissionUtil;
 import com.yugabyte.yw.common.rbac.RoleBindingUtil;
 import com.yugabyte.yw.common.rbac.RoleUtil;
@@ -94,7 +96,6 @@
 import com.yugabyte.yw.common.ybflyway.YBFlywayInit;
 import com.yugabyte.yw.controllers.MetricGrafanaController;
 import com.yugabyte.yw.controllers.PlatformHttpActionAdapter;
-import com.yugabyte.yw.controllers.handlers.OperatorResourceMigrateHandler;
 import com.yugabyte.yw.metrics.MetricQueryHelper;
 import com.yugabyte.yw.models.CertificateInfo;
 import com.yugabyte.yw.models.HealthCheck;
@@ -303,7 +304,8 @@ public void configure() {
     bind(ReleasesUtils.class).asEagerSingleton();
     bind(ReleaseContainerFactory.class).asEagerSingleton();
     bind(SoftwareUpgradeHelper.class).asEagerSingleton();
-    bind(OperatorResourceMigrateHandler.class).asEagerSingleton();
+    bind(KubernetesClientFactory.class).asEagerSingleton();
+    bind(UniverseImporter.class).asEagerSingleton();
 
     // Destroy current session on SSO logout.
     final LogoutController logoutController = new LogoutController();

managed/src/main/java/api/v2/controllers/UniverseApiControllerImp.java

@@ -18,6 +18,7 @@
 import api.v2.models.UniverseEditGFlags;
 import api.v2.models.UniverseEditKubernetesOverrides;
 import api.v2.models.UniverseEditSpec;
+import api.v2.models.UniverseOperatorImportReq;
 import api.v2.models.UniverseQueryLogsExport;
 import api.v2.models.UniverseResourceDetails;
 import api.v2.models.UniverseRestart;
@@ -220,4 +221,16 @@ public YBATask configureMetricsExport(
       Request request, UUID cUUID, UUID uniUUID, ConfigureMetricsExportSpec req) throws Exception {
     return universeUpgradeHandler.configureMetricsExport(request, cUUID, uniUUID, req);
   }
+
+  @Override
+  public YBATask operatorImportUniverse(
+      Request request, UUID cUUID, UUID uniUUID, UniverseOperatorImportReq req) throws Exception {
+    return universeHandler.operatorImportUniverse(request, cUUID, uniUUID, req);
+  }
+
+  @Override
+  public void operatorImportUniversePrecheck(
+      Request request, UUID cUUID, UUID uniUUID, UniverseOperatorImportReq req) throws Exception {
+    universeHandler.precheckOperatorImportUniverse(request, cUUID, uniUUID, req);
+  }
 }

managed/src/main/java/api/v2/handlers/UniverseManagementHandler.java

@@ -19,6 +19,7 @@
 import api.v2.models.UniverseCreateSpec;
 import api.v2.models.UniverseDeleteSpec;
 import api.v2.models.UniverseEditSpec;
+import api.v2.models.UniverseOperatorImportReq;
 import api.v2.models.UniverseSpec;
 import api.v2.models.YBATask;
 import api.v2.utils.ApiControllerUtils;
@@ -709,4 +710,76 @@ public api.v2.models.UniverseResourceDetails getUniverseResources(
     }
     return v2Response;
   }
+
+  public void precheckOperatorImportUniverse(
+      Request request, UUID cUUID, UUID uniUUID, UniverseOperatorImportReq req) {
+    Customer customer = Customer.getOrBadRequest(cUUID);
+    Universe universe = Universe.getOrBadRequest(uniUUID, customer);
+
+    // validate the universe is kubernetes
+    if (!Util.isKubernetesBasedUniverse(universe)) {
+      log.error(
+          "Universe {} is not a Kubernetes universe, cannot migrate to operator",
+          universe.getName());
+      throw new PlatformServiceException(BAD_REQUEST, "Universe is not a Kubernetes universe");
+    }
+    if (!confGetter.getGlobalConf(GlobalConfKeys.KubernetesOperatorEnabled)) {
+      log.error("Operator is not enabled, cannot migrate universe {}", universe.getName());
+      throw new PlatformServiceException(
+          BAD_REQUEST,
+          "Operator is not enabled. Please enable the runtime config"
+              + " 'yb.kubernetes.operator.enabled' and restart YBA");
+    }
+
+    // Check if the namespace is the same as the operator namespace if it is set
+    boolean migrateNamespaceSet = req.getNamespace() != null && !req.getNamespace().isEmpty();
+    String operatorNamespace = confGetter.getGlobalConf(GlobalConfKeys.KubernetesOperatorNamespace);
+    boolean operatorNamespaceSet = operatorNamespace != null && !operatorNamespace.isEmpty();
+    if (migrateNamespaceSet
+        && operatorNamespaceSet
+        && !req.getNamespace().equals(operatorNamespace)) {
+      log.error(
+          "Namespace {} is not the same as the operator namespace {}",
+          req.getNamespace(),
+          operatorNamespace);
+      throw new PlatformServiceException(
+          BAD_REQUEST,
+          "Namespace is not the same as the operator namespace. Please set the namespace to the"
+              + " same as the operator namespace");
+    }
+
+    // Read Replicas clusters are not supported
+    if (universe.getUniverseDetails().clusters.size() > 1) {
+      log.error(
+          "Universe {} has read-only clusters, cannot migrate to operator", universe.getName());
+      throw new PlatformServiceException(BAD_REQUEST, "Universe has read-only clusters");
+    }
+
+    // XCluster is not supported by operator
+    if (!XClusterConfig.getByUniverseUuid(universe.getUniverseUUID()).isEmpty()) {
+      log.error("Universe {} has xClusterInfo set, cannot migrate to operator", universe.getName());
+      throw new PlatformServiceException(
+          BAD_REQUEST, "Cannot migrate universes in an xcluster setup.");
+    }
+
+    // AZ Level overrides are not supported by operator
+    Map<String, String> azOverrides =
+        universe.getUniverseDetails().getPrimaryCluster().userIntent.azOverrides;
+    if (azOverrides != null && azOverrides.size() > 0) {
+      log.error(
+          "Universe {} has AZ level overrides set, cannot migrate to operator", universe.getName());
+      throw new PlatformServiceException(
+          BAD_REQUEST, "Cannot migrate universes with AZ level overrides.");
+    }
+  }
+
+  public YBATask operatorImportUniverse(
+      Request request, UUID cUUID, UUID uniUUID, UniverseOperatorImportReq req) {
+    Customer customer = Customer.getOrBadRequest(cUUID);
+    Universe universe = Universe.getOrBadRequest(uniUUID, customer);
+    // TODO: Implement the migration logic
+    UUID taskUuid = UUID.randomUUID();
+    YBATask ybaTask = new YBATask().taskUuid(taskUuid).resourceUuid(universe.getUniverseUUID());
+    return ybaTask;
+  }
 }