Merge branch 'main' into TELCO-835-replacing-juju-bundle-with-terrafo…

…rm-module-in-mastering-tutorial
canonical · Mar 1, 2024 · a801914 · a801914
2 parents fc63bb7 + d03d3f2
commit a801914
Show file tree

Hide file tree

Showing 12 changed files with 293 additions and 92 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    commit-message:
+      prefix: "chore: "
diff --git a/docs/how-to/deploy_sdcore_cups.md b/docs/how-to/deploy_sdcore_cups.md
@@ -4,7 +4,7 @@ This guide covers how to install a SD-Core 5G core network with Control Plane an
 
 ## Requirements
 
-- Juju >= 3.1
+- Juju >= 3.4
 - A Juju controller has been bootstrapped, and is externally reachable
 - A Control Plane Kubernetes cluster configured with
   - 1 available IP address for the Access and Mobility Management Function (AMF)

diff --git a/docs/how-to/deploy_sdcore_gnbsim.md b/docs/how-to/deploy_sdcore_gnbsim.md
@@ -4,7 +4,7 @@ This guide covers how to install and configure the SD-Core gNB Simulator.
 
 ## Requirements
 
-- Juju >= 3.1
+- Juju >= 3.4
 - A Juju controller has been bootstrapped
 - A Kubernetes cluster configured with Multus
 - 1 Juju cloud for the Kubernetes cluster has been added

diff --git a/docs/how-to/deploy_sdcore_standalone.md b/docs/how-to/deploy_sdcore_standalone.md
@@ -6,7 +6,7 @@ This guide covers how to install a standalone SD-Core 5G core network, suitable
 
 You will need a Kubernetes cluster installed and configured with Multus.
 
-- Juju >= 3.1
+- Juju >= 3.4
 - Kubernetes >= 1.25
 - A `LoadBalancer` Service for Kubernetes
 - Multus

diff --git a/docs/how-to/deploy_sdcore_user_plane_with_hugepages.md b/docs/how-to/deploy_sdcore_user_plane_with_hugepages.md
@@ -9,7 +9,7 @@ the `sdcore-user-plane` Juju bundle.
   - CPU that supports AVX2, RDRAND and PDPE1GB instructions (Intel Haswell, AMD Excavator or equivalent)
   - LoadBalancer with 1 available address for the UPF
   - Multus CNI enabled
-- Juju >= 3.1/stable
+- Juju >= 3.4/stable
 - A Juju controller bootstrapped onto the Kubernetes host
 - Juju model created, named `user-plane`
 

diff --git a/docs/images/nms_network_slice.png b/docs/images/nms_network_slice.png
diff --git a/docs/reference/deployment_options.md b/docs/reference/deployment_options.md
@@ -4,9 +4,9 @@
     
 ````{tab-item} Single site deployment
 
-Use the `sdcore-k8s` bundle to deploy a standalone 5G core network.
-This bundle contains the 5G control plane functions, the UPF, Webui, Grafana Agent, Self Signed 
-Certificates and MongoDB.
+Use the [sdcore-k8s][sdcore-k8s-terraform] Terraform module to deploy a standalone 5G core network.
+This module contains the 5G control plane functions, the UPF, the NMS (Network Management System), 
+Grafana Agent, Self Signed Certificates and MongoDB.
 
 ```{image} ../images/sdcore_single_site.png
 :alt: Single site deployment
@@ -18,8 +18,9 @@ Certificates and MongoDB.
 
 ````{tab-item} Edge deployment
 
-Use the `sdcore-control-plane-k8s` to deploy the 5G control plane in a central place and the 
-`sdcore-user-plane-k8s` bundle to deploy the 5G user plane in edge sites.
+Use the [sdcore-control-plane-k8s][sdcore-control-plane-k8s] Terraform module to deploy 
+the 5G control plane in a central place and the [sdcore-user-plane-k8s][sdcore-user-plane-k8s] 
+Terraform module to deploy the 5G user plane in edge sites.
 
 ```{image} ../images/sdcore_edge.png
 :alt: Edge deployment
@@ -30,3 +31,7 @@ Use the `sdcore-control-plane-k8s` to deploy the 5G control plane in a central p
 ````
 
 `````
+
+[sdcore-k8s-terraform]: https://github.com/canonical/terraform-juju-sdcore-k8s/tree/main/modules/sdcore-k8s
+[sdcore-control-plane-k8s]: https://github.com/canonical/terraform-juju-sdcore-k8s/tree/main/modules/sdcore-control-plane-k8s
+[sdcore-user-plane-k8s]: https://github.com/canonical/terraform-juju-sdcore-k8s/tree/main/modules/sdcore-user-plane-k8s