Skip to content

Commit

Permalink
rebase issue
Browse files Browse the repository at this point in the history
Signed-off-by: lakshmimsft <ljavadekar@microsoft.com>
  • Loading branch information
lakshmimsft committed Dec 19, 2024
1 parent bfb3a8e commit 626eaa3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/ucpd/ucp-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ routing:

initialization:
# This is the directory location which contains manifests to be registered.
manifestDirectory: "deploy/manifest/built-in-providers"
manifestDirectory: ""

# Metrics configuration
# port is not the same as metrics configuration in radius-self-hosted.yaml
Expand Down
2 changes: 1 addition & 1 deletion deploy/Chart/templates/ucp/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ data:
defaultDownstreamEndpoint: "http://dynamic-rp.radius-sytem:8082"
initialization:
manifestDirectory: "deploy/manifest/built-in-providers"
manifestDirectory: ""
metricsProvider:
prometheus:
Expand Down
6 changes: 3 additions & 3 deletions pkg/ucp/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 626eaa3

Please sign in to comment.