feat: Backport fiveg-core-gnb interface to 1.5/stable (#430)

Signed-off-by: Guillaume Belanger <[email protected]> Signed-off-by: Dario Faccin <[email protected]> Co-authored-by: Bartlomiej Gmerek <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: telcobot <[email protected]> Co-authored-by: Guillaume Belanger <[email protected]> Co-authored-by: Dario Faccin <[email protected]> Co-authored-by: Gulsum Atici <[email protected]> Co-authored-by: Patricia Reinoso <[email protected]>
canonical · Jan 10, 2025 · fbf3127 · fbf3127
1 parent 8513a9c
commit fbf3127
Show file tree

Hide file tree

Showing 27 changed files with 2,218 additions and 1,184 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -7,40 +7,41 @@ on:
   push:
     branches:
       - v1.5
+
 jobs:
   codeql:
     name: CodeQL Analysis
-    uses: canonical/sdcore-github-workflows/.github/workflows/codeql-analysis.yml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/codeql-analysis.yml@v2.3.1
 
   lint-report:
-    uses: canonical/sdcore-github-workflows/.github/workflows/lint-report.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/lint-report.yaml@v2.3.1
 
   terraform-check:
-    uses: canonical/sdcore-github-workflows/.github/workflows/terraform.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/terraform.yaml@v2.3.1
 
   static-analysis:
-    uses: canonical/sdcore-github-workflows/.github/workflows/static-analysis.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/static-analysis.yaml@v2.3.1
 
   check-libraries:
-    uses: canonical/sdcore-github-workflows/.github/workflows/check-libraries.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/check-libraries.yaml@v2.3.1
     secrets:
       CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
 
   unit-tests-with-coverage:
-    uses: canonical/sdcore-github-workflows/.github/workflows/unit-test.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/unit-test.yaml@v2.3.1
 
   build:
     needs:
       - lint-report
       - static-analysis
       - unit-tests-with-coverage
-    uses: canonical/sdcore-github-workflows/.github/workflows/build.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/build.yaml@v2.3.1
     secrets: inherit
 
   integration-test:
     needs:
       - build
-    uses: canonical/sdcore-github-workflows/.github/workflows/integration-test-with-multus.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/integration-test-with-multus.yaml@v2.3.1
 
   publish-charm:
     name: Publish Charm
@@ -50,7 +51,7 @@ jobs:
       - unit-tests-with-coverage
       - integration-test
     if: ${{ github.ref_name == 'v1.5' }}
-    uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v2.2.0
+    uses: canonical/sdcore-github-workflows/.github/workflows/publish-charm.yaml@v2.3.1
     with:
       track-name: 1.5
     secrets:

diff --git a/README.md b/README.md
@@ -6,17 +6,17 @@ Charmed Operator for the Aether SD-Core Network Management System (NMS) for K8s.
 ## Usage
 
 ```bash
-juju deploy sdcore-nms-k8s --channel=1.5/edge
+juju deploy sdcore-nms-k8s --channel=1.5/stable
 ```
 
 ## Integrate
 
 ```bash
 juju deploy traefik-k8s --trust --config external_hostname=<your hostname> --config routing_mode=subdomain
 juju deploy self-signed-certificates
-juju deploy sdcore-upf-k8s --channel=1.5/edge --trust
+juju deploy sdcore-upf-k8s --channel=1.5/stable --trust
 juju deploy mongodb-k8s --trust --channel=6/stable
-juju deploy sdcore-gnbsim-k8s --trust --channel=1.5/edge
+juju deploy sdcore-gnbsim-k8s --trust --channel=1.5/stable
 juju deploy grafana-agent-k8s --trust --channel=latest/stable
 juju integrate sdcore-nms-k8s:certificates self-signed-certificates:certificates
 juju integrate traefik-k8s:certificates self-signed-certificates:certificates
@@ -25,7 +25,7 @@ juju integrate sdcore-nms-k8s:auth_database mongodb-k8s
 juju integrate sdcore-nms-k8s:webui_database mongodb-k8s
 juju integrate sdcore-nms-k8s:ingress traefik-k8s:ingress
 juju integrate sdcore-nms-k8s:fiveg_n4 sdcore-upf-k8s:fiveg_n4
-juju integrate sdcore-nms-k8s:fiveg_gnb_identity sdcore-gnbsim-k8s:fiveg_gnb_identity
+juju integrate sdcore-nms-k8s:fiveg_core_gnb sdcore-gnbsim-k8s:fiveg_core_gnb
 juju integrate sdcore-nms-k8s:logging grafana-agent-k8s
 ```
 

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -23,7 +23,7 @@ resources:
   nms-image:
     type: oci-image
     description: OCI image for SD-Core NMS
-    upstream-source: ghcr.io/canonical/sdcore-nms:1.0.0
+    upstream-source: ghcr.io/canonical/sdcore-nms:1.1.0
 
 assumes:
   - k8s-api
@@ -47,8 +47,6 @@ requires:
     interface: mongodb_client
   webui_database:
     interface: mongodb_client
-  fiveg_gnb_identity:
-    interface: fiveg_gnb_identity
   fiveg_n4:
     interface: fiveg_n4
   logging:
@@ -57,6 +55,8 @@ requires:
     interface: tls-certificates
 
 provides:
+  fiveg_core_gnb:
+    interface: fiveg_core_gnb
   sdcore_config:
     interface: sdcore_config
 
@@ -83,3 +83,10 @@ parts:
       rustup default stable
       uv export --frozen --no-dev -o requirements.txt
       craftctl default
+
+config:
+  options:
+    log-level:
+      type: string
+      default: info
+      description: Log level for the NMS. One of `debug`, `info`, `warn`, `error`, `fatal`, `panic`.