Commit abce48da authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

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

parents 7908c61b 3b02043c

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -162,3 +162,9 @@ cython_debug/ 


# TeraFlowSDN-generated files

tfs_runtime_env_vars.sh

delete_local_deployment.sh

local_docker_deployment.sh

local_k8s_deployment.sh



# Other logs

**/logs/*.log.*

deploy.sh

+46 −29
Original line number Diff line number Diff line
@@ -58,18 +58,6 @@ kubectl delete namespace $TFS_K8S_NAMESPACE 
kubectl create namespace $TFS_K8S_NAMESPACE

printf "\n"



if [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then

    echo "Creating secrets for InfluxDB..."

    #TODO: make sure to change this when having a production deployment

    kubectl create secret generic influxdb-secrets --namespace=$TFS_K8S_NAMESPACE \

        --from-literal=INFLUXDB_DB="monitoring" --from-literal=INFLUXDB_ADMIN_USER="teraflow" \

        --from-literal=INFLUXDB_ADMIN_PASSWORD="teraflow" --from-literal=INFLUXDB_HTTP_AUTH_ENABLED="True"

    kubectl create secret generic monitoring-secrets --namespace=$TFS_K8S_NAMESPACE \

        --from-literal=INFLUXDB_DATABASE="monitoring" --from-literal=INFLUXDB_USER="teraflow" \

        --from-literal=INFLUXDB_PASSWORD="teraflow" --from-literal=INFLUXDB_HOSTNAME="localhost"

    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
@@ -158,6 +146,8 @@ for COMPONENT in $TFS_COMPONENTS; do 
        fi

    fi



    # TODO: harmonize names of the monitoring component



    echo "  Deploying '$COMPONENT' component to Kubernetes..."

    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

    kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"
@@ -200,7 +190,17 @@ for EXTRA_MANIFEST in $TFS_EXTRA_MANIFESTS; do 
    printf "\n"

done



# By now, leave this control here. Some component dependencies are not well handled

# By now, leave these controls here. Some component dependencies are not well handled.



if [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then

    echo "Waiting for 'MonitoringDB' component..."

    # Kubernetes does not implement --for='condition=available' for statefulsets.

    # By now, we assume a single replica of monitoringdb. To be updated in future releases.

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for=jsonpath='{.status.readyReplicas}'=1 --timeout=300s statefulset/monitoringdb

    printf "\n"

fi



for COMPONENT in $TFS_COMPONENTS; do

    echo "Waiting for '$COMPONENT' component..."

    kubectl wait --namespace $TFS_K8S_NAMESPACE \
@@ -212,12 +212,12 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring" 
    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 3



    INFLUXDB_HOST="monitoringservice"

    INFLUXDB_PORT=$(kubectl --namespace $TFS_K8S_NAMESPACE get service/monitoringservice -o jsonpath='{.spec.ports[?(@.name=="influxdb")].port}')

    INFLUXDB_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}"

    INFLUXDB_USER=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_USER}' | base64 --decode)

    INFLUXDB_PASSWORD=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_PASSWORD}' | base64 --decode)

    INFLUXDB_DATABASE=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_DB}' | base64 --decode)

    # INFLUXDB_HOST="monitoringservice"

    # INFLUXDB_PORT=$(kubectl --namespace $TFS_K8S_NAMESPACE get service/monitoringservice -o jsonpath='{.spec.ports[?(@.name=="influxdb")].port}')

    # INFLUXDB_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}"

    # INFLUXDB_USER=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_USER}' | base64 --decode)

    # INFLUXDB_PASSWORD=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_ADMIN_PASSWORD}' | base64 --decode)

    # INFLUXDB_DATABASE=$(kubectl --namespace $TFS_K8S_NAMESPACE get secrets influxdb-secrets -o jsonpath='{.data.INFLUXDB_DB}' | base64 --decode)



    # Exposed through the ingress controller "tfs-ingress"

    GRAFANA_HOSTNAME="127.0.0.1"
@@ -234,6 +234,8 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring" 
    # Updated Grafana API URL

    GRAFANA_URL_UPDATED="http://${GRAFANA_USERNAME}:${TFS_GRAFANA_PASSWORD}@${GRAFANA_HOSTNAME}:${GRAFANA_PORT}${GRAFANA_BASEURL}"



    echo "export GRAFANA_URL_UPDATED=${GRAFANA_URL_UPDATED}" >> $ENV_VARS_SCRIPT



    echo "Connecting to grafana at URL: ${GRAFANA_URL_DEFAULT}..."



    # Configure Grafana Admin Password
@@ -245,25 +247,40 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring" 
    }' ${GRAFANA_URL_DEFAULT}/api/user/password

    echo



    # Create InfluxDB DataSource

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

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

        "type"     : "influxdb",

        "name"     : "InfluxDB",

        "url"      : "'"$INFLUXDB_URL"'",

    # TODO: replace user, password and database by variables to be saved

    echo "Creating a datasource..."

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

        "access"   : "proxy",

        "type"     : "postgres",

        "name"     : "monitoringdb",

        "url"      : "monitoringservice:8812",

        "database" : "monitoring",

        "user"     : "admin",

        "basicAuth": false,

        "user"     : "'"$INFLUXDB_USER"'",

        "password" : "'"$INFLUXDB_PASSWORD"'",

        "isDefault": true,

        "database" : "'"$INFLUXDB_DATABASE"'"

        "jsonData" : {

            "sslmode"               : "disable",

            "postgresVersion"       : 1100,

            "maxOpenConns"          : 0,

            "maxIdleConns"          : 2,

            "connMaxLifetime"       : 14400,

            "tlsAuth"               : false,

            "tlsAuthWithCACert"     : false,

            "timescaledb"           : false,

            "tlsConfigurationMethod": "file-path",

            "tlsSkipVerify"         : true

        },

        "secureJsonData": {

            "password": "quest"

        }

    }' ${GRAFANA_URL_UPDATED}/api/datasources

    echo



    # Create Monitoring Dashboard

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

    curl -X POST -H "Content-Type: application/json" \

    -d '@src/webui/grafana_dashboard.json' \

        -d '@src/webui/grafana_dashboard_psql.json' \

        ${GRAFANA_URL_UPDATED}/api/dashboards/db

    echo

deploy_component.sh

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

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# 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 URL of your local Docker registry where the images will be uploaded to.

# Leave it blank if you do not want to use any Docker registry.

export TFS_REGISTRY_IMAGE=${TFS_REGISTRY_IMAGE:-""}

#export TFS_REGISTRY_IMAGE="http://my-container-registry.local/"



TFS_COMPONENTS=$1



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}



# If not already set, set the name of the Kubernetes namespace to deploy to.

export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}



# If not already set, set additional manifest files to be applied after the deployment

export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}



# If not already set, set the neew Grafana admin password

export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}



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

# Automated steps start here

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



# Constants

GITLAB_REPO_URL="registry.gitlab.com/teraflow-h2020/controller"

TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"



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

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh



for COMPONENT in $TFS_COMPONENTS; do

    echo "Processing '$COMPONENT' component..."

    IMAGE_NAME="$COMPONENT:$TFS_IMAGE_TAG"

    IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$IMAGE_NAME" | sed 's,//,/,g' | sed 's,http:/,,g')



    echo "  Building Docker image..."

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



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

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

    elif [ "$COMPONENT" == "pathcomp" ]; 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"

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

        docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG-builder" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

    else

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG"

    fi



    if [ -n "$TFS_REGISTRY_IMAGE" ]; then

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



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

            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"

            docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL-frontend" > "$TAG_LOG"



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"

            docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL-backend" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"

            docker push "$IMAGE_URL-frontend" > "$PUSH_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"

            docker push "$IMAGE_URL-backend" > "$PUSH_LOG"

        else

            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log"

            docker tag "$IMAGE_NAME" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"

        fi

    fi



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

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

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



    if [ -n "$TFS_REGISTRY_IMAGE" ]; then

        # Registry is set

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

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

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



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

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



            sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"

        else

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

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

            sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"

        fi

    else

        # Registry is not set

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

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

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



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

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



            sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"

        else

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

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

            sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Never#g" "$MANIFEST"

        fi

    fi



    # TODO: harmonize names of the monitoring component



    echo "  Deploying '$COMPONENT' component to Kubernetes..."

    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

    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/\_/-/")

    kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"

    kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"



    echo "  Collecting env-vars for '$COMPONENT' component..."



    SERVICE_DATA=$(kubectl get service ${COMPONENT}service --namespace $TFS_K8S_NAMESPACE -o json)

    if [ -z "${SERVICE_DATA}" ]; then continue; fi



    # Env vars for service's host address

    SERVICE_HOST=$(echo ${SERVICE_DATA} | jq -r '.spec.clusterIP')

    if [ -z "${SERVICE_HOST}" ]; then continue; fi

    # TODO: remove previous value from file

    ENVVAR_HOST=$(echo "${COMPONENT}service_SERVICE_HOST" | tr '[:lower:]' '[:upper:]')

    echo "export ${ENVVAR_HOST}=${SERVICE_HOST}" >> $ENV_VARS_SCRIPT



    # Env vars for service's 'grpc' port (if any)

    SERVICE_PORT_GRPC=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="grpc") | .port')

    if [ -n "${SERVICE_PORT_GRPC}" ]; then

        ENVVAR_PORT_GRPC=$(echo "${COMPONENT}service_SERVICE_PORT_GRPC" | tr '[:lower:]' '[:upper:]')

        echo "export ${ENVVAR_PORT_GRPC}=${SERVICE_PORT_GRPC}" >> $ENV_VARS_SCRIPT

    fi



    # Env vars for service's 'http' port (if any)

    SERVICE_PORT_HTTP=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="http") | .port')

    if [ -n "${SERVICE_PORT_HTTP}" ]; then

        ENVVAR_PORT_HTTP=$(echo "${COMPONENT}service_SERVICE_PORT_HTTP" | tr '[:lower:]' '[:upper:]')

        echo "export ${ENVVAR_PORT_HTTP}=${SERVICE_PORT_HTTP}" >> $ENV_VARS_SCRIPT

    fi



    printf "\n"

done



# By now, leave this control here. Some component dependencies are not well handled

for COMPONENT in $TFS_COMPONENTS; do

    echo "Waiting for '$COMPONENT' component..."

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=300s deployment/${COMPONENT}service

    printf "\n"

done



./show_deploy.sh



echo "Done!"

ecoc22

0 → 120000
+1 −0
Original line number Diff line number Diff line 
src/tests/ecoc22/
 
 No newline at end of file

hackfest/commands.txt

0 → 100644
+266 −0

File added.

Preview size limit exceeded, changes collapsed.