Revert "feat: remove database integration for AMF (#43)"

This reverts commit 6250de3.
canonical · Jun 17, 2024 · a441752 · a441752
1 parent 6250de3
commit a441752
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git 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" "nrf-db" {
+resource "juju_integration" "amf-db" {
   model = var.model_name
 
   application {
-    name     = module.nrf.app_name
-    endpoint = module.nrf.database_endpoint
+    name     = module.amf.app_name
+    endpoint = module.amf.database_endpoint
   }
 
   application {

diff --git a/modules/sdcore-control-plane-k8s/README.md b/modules/sdcore-control-plane-k8s/README.md
@@ -146,6 +146,7 @@ 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
@@ -206,6 +206,20 @@ 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
@@ -149,6 +149,7 @@ 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
@@ -213,6 +213,20 @@ 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