Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjusted environment variables list for Middleware deployment #154

Merged
merged 3 commits into from
May 26, 2023
Merged

Adjusted environment variables list for Middleware deployment #154

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52d909d
Adjusted environment variables list for Middleware deployment
radu-popescu May 25, 2023
f138383
Adjusted PR requested changes
radu-popescu May 26, 2023
2bc0345
removed unnecessary values from appsettings.json
radu-popescu May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjusted PR requested changes
  • Loading branch information
@radu-popescu
radu-popescu committed May 26, 2023
commit f138383ca1e4e822021958a7d8b3bf8e6d995fb9
24 changes: 13 additions & 11 deletions docs/Administrator/Middleware_Installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,20 @@ The last step is to prepare the deployment script for the middleware. It can be
1. IMAGE_REGISTRY – contains the address of the registry in which the Middleware images are stored. By default this value is `ghcr.io/5g-era`
2. Middleware__Organization – the organization to which this middleware belongs. The organization is an artificial group of Middlewares that can cooperate.
3. Middleware__InstanceName – a **unique** name of the Middleware.
4. Middleware__InstanceType – Either Edge/Cloud
5. CustomLogger__LoggerName - Either Loki/Elasticsearch
6. CustomLogger__Url - The url of the logger
7. CustomLogger__User - The username for the logger
8. CustomLogger__Password - The password for the logger
9. Slice__Hostname - The hostname of the SliceManager API that allows integration of the 5G slices into the planning process of the Middleware
10. RabbitMQ__Address - The address of RabbitMQ
11. RabbitMQ__User - The user for RabbitMQ
12. RabbitMQ__Pass - The password for RabbitMQ
13. CENTRAL_API_HOSTNAME - Address of the CentralAPI that is responsible for authenticating the Middleware instances during the startup. For more information refer to the [CentralAPI documentation](CentralApi)
14. AWS_ACCESS_KEY_ID - Aws access key ID used to access the services in AWS like Secret Manager
4. Middleware__InstanceType – Either Edge/Cloud.
5. CustomLogger__LoggerName - Either Loki/Elasticsearch.
6. CustomLogger__Url - The url of the logger.
7. CustomLogger__User - The username for the logger.
8. CustomLogger__Password - The password for the logger.
9. Slice__Hostname - The hostname of the SliceManager API that allows integration of the 5G slices into the planning process of the Middleware.
10. RabbitMQ__Address - The address of RabbitMQ.
11. RabbitMQ__User - The user for RabbitMQ.
12. RabbitMQ__Pass - The password for RabbitMQ.
13. CENTRAL_API_HOSTNAME - Address of the CentralAPI that is responsible for authenticating the Middleware instances during the startup. For more information refer to the [CentralAPI documentation](CentralApi).
14. AWS_ACCESS_KEY_ID - Aws access key ID used to access the services in AWS like Secret Manager.
15. AWS_SECRET_ACCESS_KEY - Aws secret used to authenticate the access key.
16. Redis__ClusterHostname - The address of the redis backend.
17. Redis__Password - The password for the redis backend.

The most up-to-date Middleware version is `v0.4`.

Expand Down
4 changes: 4 additions & 0 deletions k8s/orchestrator/orchestrator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ spec:
value: my_aws_secret_key
- name: AWS_SECRET_ACCESS_KEY
value: my_aws_access_key
- name: Redis__ClusterHostname
value: redis.to.be.replaced.with.real.value # to be replaced with real value
- name: Redis__Password
value: mypassword # to be replaced with real value
2 changes: 1 addition & 1 deletion src/Orchestrator/Deployment/DeploymentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ public V1Deployment CreateStartupDeployment(string name, string tag)
if (name.Contains("redis") || name == "gateway")
{
envList.Add(new("Redis__HostName", _env.GetEnvVariable("Redis__HostName")));
envList.Add(new("Redis__Password", _env.GetEnvVariable("Redis__Password")));
envList.Add(new("Redis__ClusterHostname", _env.GetEnvVariable("Redis__ClusterHostname")));
envList.Add(new("Redis__Password", _env.GetEnvVariable("Redis__Password")));
}

var container = new V1Container
Expand Down
6 changes: 3 additions & 3 deletions src/Orchestrator/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Slice": {
"Hostname": "Slice__Hostname"
"Hostname": ""
},
"RabbitMQ": {
"Address": "RabbitMQ__Address",
Expand All @@ -9,8 +9,8 @@
},
"Redis": {
"HostName": "Redis__HostName",
"Password": "Redis__Password",
"ClusterHostname": "Redis__ClusterHostname"
"ClusterHostname": "Redis__ClusterHostname",
"Password": "Redis__Password"
},
"CustomLogger": {
"LoggerName": "CustomLogger__LoggerName",
Expand Down