Commit fc5fdff5 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
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/xr_service_handler_fix_for_single_layer_services
parents f00ccfaf fb817b87

deploy/all.sh

+12 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ export QDB_DROP_TABLES_IF_EXIST=${QDB_DROP_TABLES_IF_EXIST:-""} 
export QDB_REDEPLOY=${QDB_REDEPLOY:-""}





# ----- K8s Observability ------------------------------------------------------



# If not already set, set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.

export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"}



# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}





########################################################################################################################

# Automated steps start here

########################################################################################################################
@@ -160,6 +169,9 @@ export QDB_REDEPLOY=${QDB_REDEPLOY:-""} 
# Deploy QuestDB

./deploy/qdb.sh



# Expose Dashboard

./deploy/expose_dashboard.sh



# Deploy TeraFlowSDN

./deploy/tfs.sh

deploy/crdb.sh

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ function crdb_drop_database_single() { 
}



function crdb_deploy_cluster() {

    echo "CockroachDB Operator Namespace"

    echo ">>> Create CockroachDB Operator Namespace (if missing)"

    kubectl apply -f "${CRDB_MANIFESTS_PATH}/pre_operator.yaml"

    echo



    echo "Cockroach Operator CRDs"

    echo ">>> Apply Cockroach Operator CRDs (if they are missing)"

    cp "${CRDB_MANIFESTS_PATH}/crds.yaml" "${TMP_MANIFESTS_FOLDER}/crdb_crds.yaml"

deploy/expose_dashboard.sh

0 → 100755
+58 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





########################################################################################################################

# Read deployment settings

########################################################################################################################



# If not already set, set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.

export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"}



# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}





########################################################################################################################

# Automated steps start here

########################################################################################################################



function expose_dashboard() {

    echo "Prometheus Port Mapping"

    echo ">>> Expose Prometheus HTTP Mgmt GUI port (9090->${PROM_EXT_PORT_HTTP})"

    PROM_PORT_HTTP=$(kubectl --namespace monitoring get service prometheus-k8s -o 'jsonpath={.spec.ports[?(@.name=="web")].port}')

    PATCH='{"data": {"'${PROM_EXT_PORT_HTTP}'": "monitoring/prometheus-k8s:'${PROM_PORT_HTTP}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



    PORT_MAP='{"containerPort": '${PROM_EXT_PORT_HTTP}', "hostPort": '${PROM_EXT_PORT_HTTP}'}'

    CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'

    PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'

    kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"

    echo



    echo "Grafana Port Mapping"

    echo ">>> Expose Grafana HTTP Mgmt GUI port (3000->${GRAF_EXT_PORT_HTTP})"

    GRAF_PORT_HTTP=$(kubectl --namespace monitoring get service grafana -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    PATCH='{"data": {"'${GRAF_EXT_PORT_HTTP}'": "monitoring/grafana:'${GRAF_PORT_HTTP}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



    PORT_MAP='{"containerPort": '${GRAF_EXT_PORT_HTTP}', "hostPort": '${GRAF_EXT_PORT_HTTP}'}'

    CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'

    PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'

    kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"

    echo

}



expose_dashboard

deploy/nats.sh

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ function nats_deploy_single() { 
        echo ">>> NATS is present; skipping step."

    else

        echo ">>> Deploy NATS"

        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image.tag=2.9-alpine

        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine



        echo ">>> Waiting NATS statefulset to be created..."

        while ! kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; do

deploy/tfs.sh

+26 −2
Original line number Diff line number Diff line
@@ -106,6 +106,15 @@ export QDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS:-"tfs_monitoring_kp 
export QDB_TABLE_SLICE_GROUPS=${QDB_TABLE_SLICE_GROUPS:-"tfs_slice_groups"}





# ----- K8s Observability ------------------------------------------------------



# If not already set, set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.

export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"}



# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}





########################################################################################################################

# Automated steps start here

########################################################################################################################
@@ -241,7 +250,8 @@ for COMPONENT in $TFS_COMPONENTS; do 


    echo "  Adapting '$COMPONENT' manifest file..."

    MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"

    cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"

    # cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"

    cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST"



    if [ "$COMPONENT" == "pathcomp" ]; then

        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
@@ -335,7 +345,7 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then 
    # Exposed through the ingress controller "tfs-ingress"

    GRAFANA_URL="127.0.0.1:${EXT_HTTP_PORT}/grafana"



    # Default Grafana credentials

    # Default Grafana credentials when installed with the `monitoring` addon

    GRAFANA_USERNAME="admin"

    GRAFANA_PASSWORD="admin"
@@ -414,6 +424,20 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then 
    }' ${GRAFANA_URL_UPDATED}/api/datasources

    printf "\n\n"



    # adding the datasource of the metrics collection framework

    curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{

        "access"   : "proxy",

        "type"     : "prometheus",

        "name"     : "Prometheus",

        "url"      : "http://prometheus-k8s.monitoring.svc:9090",

        "basicAuth": false,

        "isDefault": false,

        "jsonData" : {

            "httpMethod"               : "POST"

        }

    }' ${GRAFANA_URL_UPDATED}/api/datasources

    printf "\n\n"



    echo ">> Creating dashboards..."

    # Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/

    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_mon_kpis_psql.json' \