rebase issue

Signed-off-by: lakshmimsft <[email protected]>

deploy/images/ucpd/Dockerfile

@@ -10,6 +10,9 @@ WORKDIR /
 # Copy the application binary for the specified architecture
 COPY ./linux_${TARGETARCH:-amd64}/release/ucpd /
 
+# Copy manifests
+COPY deploy/manifest/built-in-providers /deploy/manifest/built-in-providers
+
 # Set the user to non-root (65532:65532 is the default non-root user in distroless)
 USER 65532:65532
 

pkg/ucp/server/server.go

@@ -24,6 +24,9 @@ import (
 	"time"
 
 	hostopts "github.com/radius-project/radius/pkg/armrpc/hostoptions"
+	"github.com/radius-project/radius/pkg/components/database/databaseprovider"
+	"github.com/radius-project/radius/pkg/components/queue/queueprovider"
+	"github.com/radius-project/radius/pkg/components/secret/secretprovider"
 	"github.com/radius-project/radius/pkg/kubeutil"
 	metricsprovider "github.com/radius-project/radius/pkg/metrics/provider"
 	metricsservice "github.com/radius-project/radius/pkg/metrics/service"
@@ -34,14 +37,11 @@ import (
 	"github.com/radius-project/radius/pkg/ucp/backend"
 	"github.com/radius-project/radius/pkg/ucp/config"
 	"github.com/radius-project/radius/pkg/ucp/data"
-	"github.com/radius-project/radius/pkg/ucp/databaseprovider"
 	"github.com/radius-project/radius/pkg/ucp/frontend/api"
 	"github.com/radius-project/radius/pkg/ucp/hosting"
 	"github.com/radius-project/radius/pkg/ucp/hostoptions"
 	"github.com/radius-project/radius/pkg/ucp/initializer"
-	"github.com/radius-project/radius/pkg/ucp/queue/queueprovider"
 	"github.com/radius-project/radius/pkg/ucp/rest"
-	"github.com/radius-project/radius/pkg/ucp/secret/secretprovider"
 	"github.com/radius-project/radius/pkg/ucp/ucplog"
 
 	kube_rest "k8s.io/client-go/rest"