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

Merge branch... 

Merge branch 'feat/406-cttc-optional-dockerhub-login-to-prevent-429-too-many-requests' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/294-cttc-correct-ci-cd-descriptors
parents ae291123 8af7c492

.gitlab-ci.yml

+38 −38
Original line number Diff line number Diff line
@@ -28,44 +28,44 @@ workflow: 


# include the individual .gitlab-ci.yml of each micro-service and tests

include:

  #- local: '/manifests/.gitlab-ci.yml'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  - 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'

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

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

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

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

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

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

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

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

#  #- local: '/manifests/.gitlab-ci.yml'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#  - 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'

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

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

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

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

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

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

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

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



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

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

deploy/all.sh

+7 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} 
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.

export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}



# Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images.

# If either variable is empty, Docker Hub is used anonymously.

export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""}

export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""}





# ----- CockroachDB ------------------------------------------------------------
@@ -243,6 +248,8 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} 
# Automated steps start here

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



bash scripts/dockerhub_login.sh



# Deploy CockroachDB

./deploy/crdb.sh

deploy/build-only.sh

+7 −0
Original line number Diff line number Diff line
@@ -32,11 +32,18 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n 
# If not already set, set the tag you want to use for your images.

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



# Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images.

# If either variable is empty, Docker Hub is used anonymously.

export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""}

export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""}





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

# Automated steps start here

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



bash scripts/dockerhub_login.sh



# Create a tmp folder for files modified during the deployment

TMP_LOGS_FOLDER="./tmp/build"

mkdir -p $TMP_LOGS_FOLDER

deploy/component.sh

+9 −0
Original line number Diff line number Diff line
@@ -36,10 +36,17 @@ 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+"}



# Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images.

# If either variable is empty, Docker Hub is used anonymously.

export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""}

export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""}



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

# Automated steps start here

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



bash scripts/dockerhub_login.sh



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
@@ -63,6 +70,8 @@ TMP_FOLDER="./tmp" 
TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"



bash scripts/dockerhub_k8s_secret.sh "$TFS_K8S_NAMESPACE"



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

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh

deploy/crdb.sh

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ export CRDB_DROP_DATABASE_IF_EXISTS=${CRDB_DROP_DATABASE_IF_EXISTS:-""} 
# If CRDB_REDEPLOY is "YES", the database will be dropped while checking/deploying CockroachDB.

export CRDB_REDEPLOY=${CRDB_REDEPLOY:-""}



# Optionally set Docker Hub credentials to avoid anonymous Kubernetes image pull rate limits.

# If either variable is empty, Kubernetes uses anonymous Docker Hub image pulls.

export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""}

export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""}





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

# Automated steps start here
@@ -72,6 +77,7 @@ function crdb_deploy_single() { 
    echo "CockroachDB Namespace"

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

    kubectl create namespace ${CRDB_NAMESPACE}

    bash scripts/dockerhub_k8s_secret.sh "${CRDB_NAMESPACE}"

    echo



    echo "CockroachDB (single-mode)"
@@ -185,6 +191,7 @@ function crdb_deploy_cluster() { 
    echo "CockroachDB Operator Namespace"

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

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

    bash scripts/dockerhub_k8s_secret.sh "cockroach-operator-system"

    echo



    echo "Cockroach Operator CRDs"
@@ -226,6 +233,7 @@ function crdb_deploy_cluster() { 
    echo "CockroachDB Namespace"

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

    kubectl create namespace ${CRDB_NAMESPACE}

    bash scripts/dockerhub_k8s_secret.sh "${CRDB_NAMESPACE}"

    echo



    echo "CockroachDB (cluster-mode)"