From 6250de3f8503e12f34f4f622fb1cc26911fe0637 Mon Sep 17 00:00:00 2001 From: Dario Faccin <35623244+dariofaccin@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:40:11 +0200 Subject: [PATCH] feat: remove database integration for AMF (#43) --- modules/external/mongodb-k8s/README.md | 6 +++--- modules/sdcore-control-plane-k8s/README.md | 1 - modules/sdcore-control-plane-k8s/main.tf | 14 -------------- modules/sdcore-k8s/README.md | 1 - modules/sdcore-k8s/main.tf | 14 -------------- 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/modules/external/mongodb-k8s/README.md b/modules/external/mongodb-k8s/README.md index 42942e6..0adaac9 100644 --- a/modules/external/mongodb-k8s/README.md +++ b/modules/external/mongodb-k8s/README.md @@ -31,12 +31,12 @@ module "mongodb-operator" { Create the integrations, for instance: ```text -resource "juju_integration" "amf-db" { +resource "juju_integration" "nrf-db" { model = var.model_name application { - name = module.amf.app_name - endpoint = module.amf.database_endpoint + name = module.nrf.app_name + endpoint = module.nrf.database_endpoint } application { diff --git a/modules/sdcore-control-plane-k8s/README.md b/modules/sdcore-control-plane-k8s/README.md index 3c3a92d..7785600 100644 --- a/modules/sdcore-control-plane-k8s/README.md +++ b/modules/sdcore-control-plane-k8s/README.md @@ -146,7 +146,6 @@ Integration provider Requirer Interface amf:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular grafana-agent:logging-provider mongodb:logging loki_push_api regular grafana-agent:peers grafana-agent:peers grafana_agent_replica peer -mongodb:database amf:database mongodb_client regular mongodb:database nrf:database mongodb_client regular mongodb:database smf:database mongodb_client regular mongodb:database udr:database mongodb_client regular diff --git a/modules/sdcore-control-plane-k8s/main.tf b/modules/sdcore-control-plane-k8s/main.tf index 6644ab3..79c37aa 100644 --- a/modules/sdcore-control-plane-k8s/main.tf +++ b/modules/sdcore-control-plane-k8s/main.tf @@ -206,20 +206,6 @@ resource "juju_integration" "ausf-fiveg-nrf" { # Integrations for `database` endpoint -resource "juju_integration" "amf-database" { - model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name - - application { - name = module.amf.app_name - endpoint = module.amf.database_endpoint - } - - application { - name = module.mongodb.app_name - endpoint = module.mongodb.database_endpoint - } -} - resource "juju_integration" "udr-auth-database" { model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name diff --git a/modules/sdcore-k8s/README.md b/modules/sdcore-k8s/README.md index 3298bc8..5549211 100644 --- a/modules/sdcore-k8s/README.md +++ b/modules/sdcore-k8s/README.md @@ -149,7 +149,6 @@ Integration provider Requirer Interface amf:metrics-endpoint grafana-agent:metrics-endpoint prometheus_scrape regular grafana-agent:logging-provider mongodb:logging loki_push_api regular grafana-agent:peers grafana-agent:peers grafana_agent_replica peer -mongodb:database amf:database mongodb_client regular mongodb:database nrf:database mongodb_client regular mongodb:database smf:database mongodb_client regular mongodb:database udr:database mongodb_client regular diff --git a/modules/sdcore-k8s/main.tf b/modules/sdcore-k8s/main.tf index 1291731..f28afb5 100644 --- a/modules/sdcore-k8s/main.tf +++ b/modules/sdcore-k8s/main.tf @@ -213,20 +213,6 @@ resource "juju_integration" "ausf-fiveg-nrf" { # Integrations for `database` endpoint -resource "juju_integration" "amf-database" { - model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name - - application { - name = module.amf.app_name - endpoint = module.amf.database_endpoint - } - - application { - name = module.mongodb.app_name - endpoint = module.mongodb.database_endpoint - } -} - resource "juju_integration" "udr-auth-database" { model = var.create_model == true ? juju_model.sdcore[0].name : var.model_name