Skip to content

Commit

Permalink
replace webui by NMS
Browse files Browse the repository at this point in the history
  • Loading branch information
@patriciareinoso
patriciareinoso committed Jul 30, 2024
1 parent 7f1e59d commit da77ed0
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 131 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This project contains 3 [Terraform][Terraform] modules to deploy the following S

The modules use the [Terraform Juju provider][Terraform Juju provider] to model the bundle deployment onto any Kubernetes environment managed by [Juju][Juju].

`sdcore-k8s` module deploys a standalone 5G core network. This module contains the 5G control plane functions, the UPF, Webui, Grafana Agent, Traefik, Self Signed Certificates and MongoDB.
`sdcore-k8s` module deploys a standalone 5G core network. This module contains the 5G control plane functions, the UPF, NMS, Grafana Agent, Traefik, Self Signed Certificates and MongoDB.

`sdcore-control-plane-k8s` module deploys the 5G control plane and the `sdcore-user-plane-k8s` module deploys only the 5G user plane. Hence, the SD-Core 5G core network deployment could be performed following the Control and User Plane Separation (CUPS) principles.

Expand Down
9 changes: 3 additions & 6 deletions modules/sdcore-control-plane-k8s/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ self-signed-certificates active 1 self-signed-certificates lat
smf active 1 sdcore-smf-k8s 1.5/edge 25 10.152.183.29 no
traefik 2.10.4 active 1 traefik-k8s latest/stable 166 10.0.0.10 no
udm active 1 sdcore-udm-k8s 1.5/edge 23 10.152.183.251 no
udr active 1 sdcore-udr-k8s 1.5/edge 23 10.152.183.26 no
webui active 1 sdcore-webui-k8s 1.5/edge 15 10.152.183.33 no
udr active 1 sdcore-udr-k8s 1.5/edge 23 10.152.183.26 no

Unit Workload Agent Address Ports Message
amf/0* active idle 10.1.146.71
Expand All @@ -139,8 +138,7 @@ self-signed-certificates/0* active idle 10.1.146.106
smf/0* active idle 10.1.146.76
traefik/0* active idle 10.1.146.109
udm/0* active idle 10.1.146.79
udr/0* active idle 10.1.146.124
webui/0* active idle 10.1.146.69
udr/0* active idle 10.1.146.124

Integration provider Requirer Interface Type Message
amf:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
Expand All @@ -151,7 +149,7 @@ mongodb:database amf:database mongodb_c
mongodb:database nrf:database mongodb_client regular
mongodb:database smf:database mongodb_client regular
mongodb:database udr:database mongodb_client regular
mongodb:database webui:database mongodb_client regular
mongodb:database nms:database mongodb_client regular
mongodb:database-peers mongodb:database-peers mongodb-peers peer
mongodb:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
nrf:fiveg_nrf amf:fiveg_nrf fiveg_nrf regular
Expand All @@ -177,7 +175,6 @@ traefik:ingress nms:ingress ingress
traefik:peers traefik:peers traefik_peers peer
udm:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
udr:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
webui:sdcore-management nms:sdcore-management sdcore_management regular
```

### Cleaning up
Expand Down
82 changes: 23 additions & 59 deletions modules/sdcore-control-plane-k8s/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ module "udr" {
channel = var.sdcore_channel
}

module "webui" {
source = "git::https://github.com/canonical/sdcore-webui-k8s-operator//terraform"
model_name = var.create_model == true ? juju_model.sdcore[0].name : var.model_name
channel = var.sdcore_channel
}

module "mongodb" {
source = "../external/mongodb-k8s"
model_name = var.create_model == true ? juju_model.sdcore[0].name : var.model_name
Expand Down Expand Up @@ -276,12 +270,12 @@ resource "juju_integration" "nrf-database" {
}
}

resource "juju_integration" "webui-auth-database" {
resource "juju_integration" "nms-auth-database" {
model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name

application {
name = module.webui.app_name
endpoint = module.webui.auth_database_endpoint
name = module.nms.app_name
endpoint = module.nms.auth_database_endpoint
}

application {
Expand All @@ -290,12 +284,12 @@ resource "juju_integration" "webui-auth-database" {
}
}

resource "juju_integration" "webui-common-database" {
resource "juju_integration" "nms-common-database" {
model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name

application {
name = module.webui.app_name
endpoint = module.webui.common_database_endpoint
name = module.nms.app_name
endpoint = module.nms.common_database_endpoint
}

application {
Expand All @@ -304,7 +298,7 @@ resource "juju_integration" "webui-common-database" {
}
}

# Integrations for `sdcore-config` endpoint
# Integrations for `sdcore_config` endpoint

resource "juju_integration" "amf-sdcore-config" {
model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name
Expand All @@ -315,8 +309,8 @@ resource "juju_integration" "amf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -329,8 +323,8 @@ resource "juju_integration" "ausf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -343,8 +337,8 @@ resource "juju_integration" "nrf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -357,8 +351,8 @@ resource "juju_integration" "nssf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -371,8 +365,8 @@ resource "juju_integration" "pcf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -385,8 +379,8 @@ resource "juju_integration" "smf-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -399,8 +393,8 @@ resource "juju_integration" "udm-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand All @@ -413,8 +407,8 @@ resource "juju_integration" "udr-sdcore-config" {
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_config_endpoint
name = module.nms.app_name
endpoint = module.nms.sdcore_config_endpoint
}
}

Expand Down Expand Up @@ -676,22 +670,6 @@ resource "juju_integration" "nms-ingress" {
}
}

# Integrations for `sdcore-management` endpoint

resource "juju_integration" "nms-sdcore-management" {
model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name

application {
name = module.nms.app_name
endpoint = module.nms.sdcore_management_endpoint
}

application {
name = module.webui.app_name
endpoint = module.webui.sdcore_management_endpoint
}
}

# Integrations for `logging` endpoint

resource "juju_integration" "mongodb-logging" {
Expand Down Expand Up @@ -834,20 +812,6 @@ resource "juju_integration" "nms-logging" {
}
}

resource "juju_integration" "webui-logging" {
model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name

application {
name = module.webui.app_name
endpoint = module.webui.logging_endpoint
}

application {
name = module.grafana-agent.app_name
endpoint = module.grafana-agent.logging_provider_endpoint
}
}

# Cross-model integrations

resource "juju_offer" "prometheus-remote-write" {
Expand Down
9 changes: 3 additions & 6 deletions modules/sdcore-k8s/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ smf active 1 sdcore-smf-k8s 1.5
traefik 2.10.4 active 1 traefik-k8s latest/stable 166 10.0.0.14 no
udm active 1 sdcore-udm-k8s 1.5/edge 23 10.152.183.165 no
udr active 1 sdcore-udr-k8s 1.5/edge 23 10.152.183.166 no
upf active 1 sdcore-upf-k8s 1.5/edge 31 10.152.183.91 no
webui active 1 sdcore-webui-k8s 1.5/edge 15 10.152.183.208 no
upf active 1 sdcore-upf-k8s 1.5/edge 31 10.152.183.91 no

Unit Workload Agent Address Ports Message
amf/0* active idle 10.1.146.108
Expand All @@ -142,8 +141,7 @@ smf/0* active idle 10.1.146.111
traefik/0* active idle 10.1.146.74
udm/0* active idle 10.1.146.81
udr/0* active idle 10.1.146.105
upf/0* active idle 10.1.146.103
webui/0* active idle 10.1.146.65
upf/0* active idle 10.1.146.103

Integration provider Requirer Interface Type Message
amf:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
Expand All @@ -154,7 +152,7 @@ mongodb:database amf:database mongodb_c
mongodb:database nrf:database mongodb_client regular
mongodb:database smf:database mongodb_client regular
mongodb:database udr:database mongodb_client regular
mongodb:database webui:database mongodb_client regular
mongodb:database nms:database mongodb_client regular
mongodb:database-peers mongodb:database-peers mongodb-peers peer
mongodb:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
nrf:fiveg_nrf amf:fiveg_nrf fiveg_nrf regular
Expand All @@ -181,7 +179,6 @@ traefik:peers traefik:peers traefik_p
udm:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
udr:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
upf:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular
webui:sdcore-management nms:sdcore-management sdcore_management regular
```

### Cleaning up
Expand Down
Loading

0 comments on commit da77ed0

Please sign in to comment.