Commit 51a66b0c 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/174-tid-add-support-to-nbi-to-export-the-l3-inventory
parents f93d940f 9b17d6a6

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -176,3 +176,6 @@ libyang/ 


# Other logs

**/logs/*.log.*



# PySpark checkpoints

src/analytics/.spark/*

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -48,6 +48,6 @@ include: 
  - local: '/src/kpi_manager/.gitlab-ci.yml'

  - local: '/src/kpi_value_api/.gitlab-ci.yml'

  - local: '/src/kpi_value_writer/.gitlab-ci.yml'



  - local: '/src/telemetry/.gitlab-ci.yml'

  # This should be last one: end-to-end integration tests

  - local: '/src/tests/.gitlab-ci.yml'

deploy/all.sh

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n 
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"



# Uncomment to activate Monitoring Framework (new)

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api"

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api telemetry analytics"



# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
@@ -215,6 +215,9 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} 
# Deploy QuestDB

./deploy/qdb.sh



# Deploy Apache Kafka

./deploy/kafka.sh



# Expose Dashboard

./deploy/expose_dashboard.sh

deploy/kafka.sh

+53 −32
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
# If not already set, set the namespace where Apache Kafka will be deployed.

export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}



# If not already set, set the port Apache Kafka server will be exposed to.

export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}



# If not already set, if flag is YES, Apache Kafka will be redeployed and all topics will be lost.

export KFK_REDEPLOY=${KFK_REDEPLOY:-""}





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

# Automated steps start here
@@ -35,18 +41,19 @@ KFK_MANIFEST="02-kafka.yaml" 
    TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${KFK_NAMESPACE}/manifests"

    mkdir -p ${TMP_MANIFESTS_FOLDER}



function kafka_deploy() {

     # copy zookeeper and kafka manifest files to temporary manifest location

    cp "${KFK_MANIFESTS_PATH}/${KFK_ZOOKEEPER_MANIFEST}" "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"

    cp "${KFK_MANIFESTS_PATH}/${KFK_MANIFEST}" "${TMP_MANIFESTS_FOLDER}/${KFK_MANIFEST}"



echo "Apache Kafka Namespace"

    # echo "Apache Kafka Namespace"

    echo ">>> Delete Apache Kafka Namespace"

    kubectl delete namespace ${KFK_NAMESPACE} --ignore-not-found



    echo ">>> Create Apache Kafka Namespace"

    kubectl create namespace ${KFK_NAMESPACE}



echo ">>> Deplying Apache Kafka Zookeeper"

    # echo ">>> Deplying Apache Kafka Zookeeper"

    # Kafka zookeeper service should be deployed before the kafka service

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"
@@ -56,14 +63,28 @@ KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEE 
    # Kafka service should be deployed after the zookeeper service

    sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



echo ">>> Deploying Apache Kafka Broker"

    # echo ">>> Deploying Apache Kafka Broker"

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



echo ">>> Verifing Apache Kafka deployment"

sleep 10

KFK_PODS_STATUS=$(kubectl --namespace ${KFK_NAMESPACE} get pods)

if echo "$KFK_PODS_STATUS" | grep -qEv 'STATUS|Running'; then

    echo "Deployment Error: \n $KFK_PODS_STATUS"

    # echo ">>> Verifing Apache Kafka deployment"

    sleep 5

    # KFK_PODS_STATUS=$(kubectl --namespace ${KFK_NAMESPACE} get pods)

    # if echo "$KFK_PODS_STATUS" | grep -qEv 'STATUS|Running'; then

    #     echo "Deployment Error: \n $KFK_PODS_STATUS"

    # else

    #     echo "$KFK_PODS_STATUS"

    # fi

}



echo "Apache Kafka"

echo ">>> Checking if Apache Kafka is deployed ... "

if [ "$KFK_REDEPLOY" == "YES" ]; then

    echo ">>> Redeploying kafka namespace"

    kafka_deploy

elif kubectl get namespace "${KFK_NAMESPACE}" &> /dev/null; then

    echo ">>> Apache Kafka already present; skipping step." 

else

    echo "$KFK_PODS_STATUS"

    echo ">>> Kafka namespace doesn't exists. Deploying kafka namespace"

    kafka_deploy

fi

echo

deploy/tfs.sh

+66 −7
Original line number Diff line number Diff line
@@ -115,6 +115,17 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}





# ----- Apache Kafka ------------------------------------------------------



# If not already set, set the namespace where Apache Kafka will be deployed.

export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}



# If not already set, set the port Apache Kafka server will be exposed to.

export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}



# If not already set, if flag is YES, Apache Kafka will be redeployed and topic will be lost.

export KFK_REDEPLOY=${KFK_REDEPLOY:-""}



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

# Automated steps start here

########################################################################################################################
@@ -147,7 +158,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type= 
    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with CockroachDB data for KPI Management"

echo "Create secret with CockroachDB data for KPI Management microservices"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_KPI_MGMT="tfs_kpi_mgmt"  # TODO: change by specific configurable environment variable

kubectl create secret generic crdb-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
@@ -159,6 +170,37 @@ kubectl create secret generic crdb-kpi-data --namespace ${TFS_K8S_NAMESPACE} --t 
    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with CockroachDB data for Telemetry microservices"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_TELEMETRY="tfs_telemetry"  # TODO: change by specific configurable environment variable

kubectl create secret generic crdb-telemetry --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE_TELEMETRY} \

    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \

    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \

    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with CockroachDB data for Analytics microservices"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_ANALYTICS="tfs_analytics"  # TODO: change by specific configurable environment variable

kubectl create secret generic crdb-analytics --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE_ANALYTICS} \

    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \

    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \

    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with Apache Kafka data for KPI, Telemetry and Analytics microservices"

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')

kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \

    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}

printf "\n"



echo "Create secret with NATS data"

NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

if [ -z "$NATS_CLIENT_PORT" ]; then
@@ -187,6 +229,21 @@ kubectl create secret generic qdb-data --namespace ${TFS_K8S_NAMESPACE} --type=' 
    --from-literal=METRICSDB_PASSWORD=${QDB_PASSWORD}

printf "\n"



# Check if "dlt" is in the list of components

if [[ " ${TFS_COMPONENTS[@]} " =~ " dlt " ]]; then

  echo "Create secret for HLF keystore"

  kubectl create secret generic dlt-keystone --namespace ${TFS_K8S_NAMESPACE} --from-file=keystore=${KEY_DIRECTORY_PATH}

  printf "\n"



  echo "Create secret for HLF signcerts"

  kubectl create secret generic dlt-signcerts --namespace ${TFS_K8S_NAMESPACE} --from-file=signcerts.pem=${CERT_DIRECTORY_PATH}

  printf "\n"



  echo "Create secret for HLF ca.crt"

  kubectl create secret generic dlt-ca-crt --namespace ${TFS_K8S_NAMESPACE} --from-file=ca.crt=${TLS_CERT_PATH}

  printf "\n"

fi



echo "Deploying components and collecting environment variables..."

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh

echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT
@@ -234,15 +291,17 @@ for COMPONENT in $TFS_COMPONENTS; do 


        if [ "$COMPONENT" == "ztp" ] || [ "$COMPONENT" == "policy" ]; then

            $DOCKER_BUILD -t "$COMPONENT:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

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

        elif [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

            BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"

            $DOCKER_BUILD -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . > "$BUILD_LOG"



            BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log"

            $DOCKER_BUILD -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . > "$BUILD_LOG"

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

                # next command is redundant, but helpful to keep cache updated between rebuilds

                IMAGE_NAME="$COMPONENT-backend:$TFS_IMAGE_TAG-builder"

                $DOCKER_BUILD -t "$IMAGE_NAME" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

            fi

        elif [ "$COMPONENT" == "dlt" ]; then

            BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-connector.log"

            $DOCKER_BUILD -t "$COMPONENT-connector:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/connector/Dockerfile . > "$BUILD_LOG"
@@ -255,7 +314,7 @@ for COMPONENT in $TFS_COMPONENTS; do 


        echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGES'..."



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

        if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ] ; then

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
@@ -306,7 +365,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
        cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"

    fi



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

    if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')

        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f4)

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"