Commit 6ea8d3b3 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into...

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/416-tid-new-put-call-for-ipowdm-nbi
parents 6c033acf b3cc3550
Loading
Loading
Loading
Loading
+3 −0
Changes for .gitlab-ci.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ include:
  #- local: '/manifests/.gitlab-ci.yml'
  - local: '/src/monitoring/.gitlab-ci.yml'
  - local: '/src/nbi/.gitlab-ci.yml'
  - local: '/src/mcp_server/.gitlab-ci.yml'
  - local: '/src/agentic/.gitlab-ci.yml'
  - local: '/src/context/.gitlab-ci.yml'
  - local: '/src/device/.gitlab-ci.yml'
  - local: '/src/service/.gitlab-ci.yml'
@@ -72,6 +74,7 @@ include:
  - local: '/src/osm_client/.gitlab-ci.yml'
  - local: '/src/simap_connector/.gitlab-ci.yml'
  - local: '/src/pluggables/.gitlab-ci.yml'
  - local: '/src/logical_resources/.gitlab-ci.yml'

  # This should be last one: end-to-end integration tests
  - local: '/src/tests/.gitlab-ci.yml'

deploy/README.md

0 → 100644
+40 −0
Changes for deploy/README.md: 40 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Optional Monitoring Infrastructure

QuestDB and the bundled Grafana instance are deployed only when
`TFS_COMPONENTS` includes the complete token `monitoring` or `slice`.
Both are legacy components. Selecting only core, optical, MCP or Agentic
components does not deploy this infrastructure.
The fallback component list in `deploy/all.sh` still includes `slice` for
compatibility; select an explicit component list without `slice` or
`monitoring` for a lightweight deployment, as the ECOC demo specs do.

`manifests/webuiservice.yaml` contains only the WebUI.
`manifests/grafanaservice.yaml` contains a separate Grafana Deployment,
Service, PVC and ingress at `/grafana/`. The deployment script enables the
WebUI navigation link through `TFS_GRAFANA_ENABLED=YES` only in the legacy
monitoring mode, and configures datasources through the Grafana Service.

The `qdb-data` Secret and dashboard exposure/configuration are skipped when
neither legacy consumer is selected. Shared Kubernetes observability
installations are not automatically removed or disabled.
Explicit calls to `deploy/qdb.sh` still deploy QuestDB for operators who need
to manage that infrastructure separately.

Existing QuestDB namespaces/storage and previously deployed Grafana resources
are not pruned automatically. Back up any required data and clean up obsolete
resources explicitly when migrating. Direct manifest users must apply the
new Grafana manifest separately and enable its WebUI link if desired.

For the ECOC demo, the branch-only root `redeploy.sh` delegates to
`src/tests/ecoc26-hyr-agentic-optical/redeploy-all.sh`.
Run `./redeploy.sh --help` before the first reset. This convenience wrapper
is not intended for the upstream merge.

Offline deployment checks:

```bash
python -m unittest discover -s deploy/tests -v
```

These repository-level checks require PyYAML and stay separate from component
unit tests, whose container images do not contain deployment manifests.
+15 −0
Changes for deploy/all.sh: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -72,6 +72,14 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n
# Uncomment to activate Pluggables Component
#export TFS_COMPONENTS="${TFS_COMPONENTS} pluggables"

# Uncomment to activate MCP Server.
# Keep it near the end so it is deployed after optional components it can expose.
#export TFS_COMPONENTS="${TFS_COMPONENTS} mcp_server"

# Uncomment to activate Agentic Module.
# Keep it after MCP Server so it can discover the local TFS MCP tool catalogue.
#export TFS_COMPONENTS="${TFS_COMPONENTS} agentic"

# If not already set, set the tag you want to use for your images.
export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}

@@ -249,6 +257,7 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
########################################################################################################################

bash scripts/dockerhub_login.sh
source deploy/monitoring_dependencies.sh

# Deploy CockroachDB
./deploy/crdb.sh
@@ -257,7 +266,11 @@ bash scripts/dockerhub_login.sh
./deploy/nats.sh

# Deploy QuestDB
if uses_legacy_monitoring; then
    ./deploy/qdb.sh
else
    echo "Skipping QuestDB: neither monitoring nor slice is selected."
fi

# Deploy Apache Kafka
./deploy/kafka.sh
@@ -266,7 +279,9 @@ bash scripts/dockerhub_login.sh
# ./deploy/monitoring.sh

# Expose Dashboard
if uses_legacy_monitoring; then
    ./deploy/expose_dashboard.sh
fi

# Deploy TeraFlowSDN
./deploy/tfs.sh
+8 −0
Changes for deploy/component.sh: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -161,6 +161,14 @@ for COMPONENT in $TFS_COMPONENTS; do

    echo "  Deploying '$COMPONENT' component to Kubernetes..."
    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
    if [ "$COMPONENT" == "agentic" ]; then
        kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \
            tfs-ingress-agentic --ignore-not-found >> "$DEPLOY_LOG"
        kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \
            tfs-ingress-agentic-api --ignore-not-found >> "$DEPLOY_LOG"
        kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \
            tfs-ingress-agentic-web --ignore-not-found >> "$DEPLOY_LOG"
    fi
    kubectl --namespace $TFS_K8S_NAMESPACE delete -f "$MANIFEST" > "$DEPLOY_LOG"
    kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"
    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
+5 −0
Changes for deploy/expose_dashboard.sh: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
########################################################################################################################

MONITORING_NAMESPACE="monitoring"
source "$(dirname "${BASH_SOURCE[0]}")/monitoring_dependencies.sh"
if ! uses_legacy_monitoring; then
    echo "Skipping dashboard exposure: monitoring/slice not selected."
    exit 0
fi

function expose_dashboard() {
    echo "Prometheus Port Mapping"
Loading