diff --git a/.vscode/launch.json b/.vscode/launch.json index 699f357cff..537b43c271 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,8 +14,6 @@ "args": [ "--config-file", "${workspaceFolder}/cmd/applications-rp/radius-self-hosted.yaml", - "--portableresource-config", - "${workspaceFolder}/cmd/applications-rp/portableresource-self-hosted.yaml", ], "env": { "RADIUS_ENV": "self-hosted" diff --git a/cmd/applications-rp/main.go b/cmd/applications-rp/main.go index a742a1cb30..fd7a1231db 100644 --- a/cmd/applications-rp/main.go +++ b/cmd/applications-rp/main.go @@ -55,11 +55,6 @@ func main() { if configFile == "" { log.Fatal("config-file is empty.") //nolint:forbidigo // this is OK inside the main function. } - - var portableResourceConfigFile string - defaultPortableRsConfig := fmt.Sprintf("portableresource-%s.yaml", hostoptions.Environment()) - pflag.StringVar(&portableResourceConfigFile, "portableresource-config", defaultPortableRsConfig, "The service configuration file for portable resource providers.") - pflag.Parse() options, err := hostoptions.NewHostOptionsFromEnvironment(configFile) @@ -89,12 +84,6 @@ func main() { // Must set the logger before using controller-runtime. runtimelog.SetLogger(logger) - // Load portable resource config. - prOptions, err := hostoptions.NewHostOptionsFromEnvironment(portableResourceConfigFile) - if err != nil { - log.Fatal(err) //nolint:forbidigo // this is OK inside the main function. - } - if options.Config.StorageProvider.Provider == dataprovider.TypeETCD && options.Config.StorageProvider.ETCD.InMemory { // For in-memory etcd we need to register another service to manage its lifecycle. @@ -105,10 +94,6 @@ func main() { options.Config.StorageProvider.ETCD.Client = client options.Config.SecretProvider.ETCD.Client = client - // Portable resource options - prOptions.Config.StorageProvider.ETCD.Client = client - prOptions.Config.SecretProvider.ETCD.Client = client - hostingSvc = append(hostingSvc, data.NewEmbeddedETCDService(data.EmbeddedETCDServiceOptions{ClientConfigSink: client})) } diff --git a/cmd/applications-rp/portableresource-dev.yaml b/cmd/applications-rp/portableresource-dev.yaml deleted file mode 100644 index 42d12ab030..0000000000 --- a/cmd/applications-rp/portableresource-dev.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# This is an example of configuration file. -environment: - name: Dev - roleLocation: "global" -storageProvider: - provider: "etcd" - etcd: - inmemory: true -queueProvider: - provider: inmemory - name: radiusportable -profilerProvider: - enabled: true - port: 6060 -secretProvider: - provider: etcd - etcd: - inmemory: true -metricsProvider: - prometheus: - enabled: true - path: "/metrics" - port: 9090 -featureFlags: - - "PLACEHOLDER" -server: - host: "0.0.0.0" - port: 8081 - enableArmAuth: false -workerServer: - maxOperationConcurrency: 10 - maxOperationRetryCount: 2 -ucp: - kind: kubernetes -logging: - level: "info" - json: false -bicep: - deleteRetryCount: 20 - deleteRetryDelaySeconds: 60 -terraform: - path: "/terraform" diff --git a/cmd/applications-rp/portableresource-self-hosted.yaml b/cmd/applications-rp/portableresource-self-hosted.yaml deleted file mode 100644 index 80c2e958ea..0000000000 --- a/cmd/applications-rp/portableresource-self-hosted.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# This configuration file is used in development when launching from VS Code. -# -# This configures the Portable Resources' Providers to... -# -# - Use Kubernetes (namespace: radius-testing) for storage and secrets -# - Listen on port 8081 -# - Talk to UCP on port 9000 -# - Disables metrics and profiler -# -environment: - name: Dev - roleLocation: "global" -storageProvider: - provider: "apiserver" - apiserver: - context: '' - namespace: 'radius-testing' -queueProvider: - provider: "apiserver" - name: radiusportable - apiserver: - context: '' - namespace: 'radius-testing' -profilerProvider: - enabled: false - port: 6060 -secretProvider: - provider: "kubernetes" -metricsProvider: - prometheus: - enabled: false - path: "/metrics" - port: 9090 -featureFlags: - - "PLACEHOLDER" -server: - host: "0.0.0.0" - port: 8081 - enableArmAuth: false -workerServer: - maxOperationConcurrency: 10 - maxOperationRetryCount: 2 -ucp: - kind: direct - direct: - endpoint: "http://localhost:9000/apis/api.ucp.dev/v1alpha3" -logging: - level: "info" - json: false -bicep: - deleteRetryCount: 20 - deleteRetryDelaySeconds: 60 -terraform: - path: "/tmp" \ No newline at end of file diff --git a/deploy/Chart/templates/rp/configmaps.yaml b/deploy/Chart/templates/rp/configmaps.yaml index b8131d5909..e444f31999 100644 --- a/deploy/Chart/templates/rp/configmaps.yaml +++ b/deploy/Chart/templates/rp/configmaps.yaml @@ -56,53 +56,3 @@ data: deleteRetryDelaySeconds: 60 terraform: path: "/terraform" - - portableresource-self-host.yaml: |- - # Radius configuration file. - # See https://github.com/radius-project/radius/blob/main/docs/contributing/contributing-code/contributing-code-control-plane/configSettings.md for more information. - environment: - name: self-hosted - roleLocation: "global" - storageProvider: - provider: "apiserver" - apiserver: - context: "" - namespace: "radius-system" - queueProvider: - provider: "apiserver" - name: "radiusportable" - apiserver: - context: "" - namespace: "radius-system" - secretProvider: - provider: kubernetes - metricsProvider: - prometheus: - enabled: true - path: "/metrics" - port: 9090 - profilerProvider: - enabled: true - port: 6060 - server: - host: "0.0.0.0" - port: 5444 - workerServer: - maxOperationConcurrency: 10 - maxOperationRetryCount: 2 - ucp: - kind: kubernetes - logging: - level: "info" - json: true - {{- if and .Values.global.zipkin .Values.global.zipkin.url }} - tracerProvider: - serviceName: "applications.datastores" - zipkin: - url: {{ .Values.global.zipkin.url }} - {{- end }} - bicep: - deleteRetryCount: 20 - deleteRetryDelaySeconds: 60 - terraform: - path: "/terraform" diff --git a/deploy/Chart/templates/rp/deployment.yaml b/deploy/Chart/templates/rp/deployment.yaml index d3ee662bd9..221f347fbf 100644 --- a/deploy/Chart/templates/rp/deployment.yaml +++ b/deploy/Chart/templates/rp/deployment.yaml @@ -32,7 +32,6 @@ spec: image: "{{ .Values.rp.image }}:{{ .Values.rp.tag | default $appversion }}" args: - --config-file=/etc/config/radius-self-host.yaml - - --portableresource-config=/etc/config/portableresource-self-host.yaml env: - name: SKIP_ARM value: 'false' diff --git a/docs/contributing/contributing-code/contributing-code-control-plane/running-controlplane-locally.md b/docs/contributing/contributing-code/contributing-code-control-plane/running-controlplane-locally.md index 6bc8553bff..e8b96354b3 100644 --- a/docs/contributing/contributing-code/contributing-code-control-plane/running-controlplane-locally.md +++ b/docs/contributing/contributing-code/contributing-code-control-plane/running-controlplane-locally.md @@ -21,8 +21,7 @@ The easiest way to get started is to launch Radius using VS Code. This will give If you need to manually test APIs you can reach them at the following endpoints after following these instructions: - UCP: port 9000 -- AppCore Namespace: port 8080 -- AppPortableResource Namespace: port 8081 (Applications.Datastores, Applications.Dapr and Applications.Messaging are hosted) +- Applications.Core RP / Portable Resources' Providers (applications-rp): port 8080 - Deployment Engine: port 5017 ## Prerequisites