Commit 9854bd86 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

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

parents 8245e259 e0349474

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ include: 
  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

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

  # - local: '/src/opticalattackmanager/.gitlab-ci.yml'

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

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

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

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

.gitlab/issue_templates/new-feature-with-design.md

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ components deployed. 


## Impacted Components



List of impacted components: Context, Device, Service, PathComp, Slice, Monitoring, Automation, Policy, Compute, etc.

List of impacted components: Context, Device, Service, PathComp, Slice, Monitoring, ZTP, Policy, Compute, etc.

Just an enumeration, elaboration of impacts is done below.



## Component1 Impact

deploy/all.sh

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation monitoring pathcomp service slice compute webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice compute webui load_generator"}



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

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

deploy/component.sh

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    echo "  Building Docker image..."

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



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

    if [ "$COMPONENT" == "ztp" ] || [ "$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"

deploy/tfs.sh

+25 −9
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation monitoring pathcomp service slice compute webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice compute webui load_generator"}



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

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
@@ -183,6 +183,22 @@ REDIS_PASSWORD=`uuidgen` 
kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \

    --from-literal=REDIS_PASSWORD=$REDIS_PASSWORD

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

printf "\n"



DOCKER_BUILD="docker build"

DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)

if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then

    # If Docker version >= 23, build command was migrated to docker-buildx

    # In Ubuntu, in practice, means to install package docker-buildx together with docker.io

    # Check if docker-buildx plugin is installed

    docker buildx version 1>/dev/null 2>/dev/null

    if [[ $? -ne 0 ]]; then

        echo "Docker buildx command is not installed. Check: https://docs.docker.com/build/architecture/#install-buildx"

        echo "If you installed docker through APT package docker.io, consider installing also package docker-buildx"

        exit 1;

    fi

    DOCKER_BUILD="docker buildx build"

fi



for COMPONENT in $TFS_COMPONENTS; do

    echo "Processing '$COMPONENT' component..."
@@ -191,25 +207,25 @@ for COMPONENT in $TFS_COMPONENTS; do 
        echo "  Building Docker image..."

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



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

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

        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

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

            docker build -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . > "$BUILD_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"

            $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

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

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

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

        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"

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



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

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

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

        else

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

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

        fi



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