Commit 7fcf1407 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Readme, Manifests and Deploy scripts: 

- updated old gitlab.com URLs by new labs.etsi.org URLs.
- updated Context to use secrets generated by CockroachDB and NATS
parent bfa7d1ee

README.md

+5 −4
Original line number Diff line number Diff line 
# TeraFlowSDN Controller



[Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows

[ETSI OpenSource Group for TeraFlowSDN](https://tfs.etsi.org/)

Former, [Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows



Branch "master" : [![pipeline status](https://gitlab.com/teraflow-h2020/controller/badges/master/pipeline.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/master) [![coverage report](https://gitlab.com/teraflow-h2020/controller/badges/master/coverage.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/master)

Branch "master" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/master/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/master/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master)



Branch "develop" : [![pipeline status](https://gitlab.com/teraflow-h2020/controller/badges/develop/pipeline.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/develop) [![coverage report](https://gitlab.com/teraflow-h2020/controller/badges/develop/coverage.svg)](https://gitlab.com/teraflow-h2020/controller/-/commits/develop)

Branch "develop" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/develop/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/develop/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop)



# Installation Instructions

For devel and upcoming release 2.0, we have prepared the following tutorial: [TeraFlowSDN tutorial](https://gitlab.com/teraflow-h2020/controller/-/tree/develop/tutorial).
 
For devel and upcoming release 2.0, check the Wiki pages: [TeraFlowSDN Wiki](https://labs.etsi.org/rep/tfs/controller/-/wikis/home).

deploy/component.sh

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} 
########################################################################################################################



# Constants

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

GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"

TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

deploy/crdb.sh

+14 −14
Original line number Diff line number Diff line
@@ -141,13 +141,13 @@ function crdb_deploy_single() { 


    echo "Create secret with CockroachDB data"

    kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \

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

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

        --from-literal=gui_port=${CRDB_GUI_PORT} \

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

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

        --from-literal=password="'"${CRDB_PASSWORD}"'" \

        --from-literal=sslmode=require

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

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

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

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

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

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

        --from-literal=CRDB_SSLMODE=require



    kubectl get all --all-namespaces

}
@@ -310,13 +310,13 @@ function crdb_deploy_cluster() { 


    echo "Create secret with CockroachDB data"

    kubectl create secret generic ${CRDB_SECRET_NAME} --namespace ${CRDB_SECRET_NAMESPACE} --type='Opaque' \

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

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

        --from-literal=gui_port=${CRDB_GUI_PORT} \

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

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

        --from-literal=password="'"${CRDB_PASSWORD}"'" \

        --from-literal=sslmode=require

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

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

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

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

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

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

        --from-literal=CRDB_SSLMODE=require



    kubectl get all --all-namespaces

}

deploy/mock_blockchain.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ COMPONENT="mock_blockchain" 
########################################################################################################################



# Constants

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

GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"

TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

deploy/nats.sh

+3 −3
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ function nats_deploy_single() { 


    echo "Create secret with NATS data"

    kubectl create secret generic ${NATS_SECRET_NAME} --namespace ${NATS_SECRET_NAMESPACE} --type='Opaque' \

        --from-literal=namespace=${NATS_NAMESPACE} \

        --from-literal=client_port=${NATS_CLIENT_PORT} \

        --from-literal=gui_port=${NATS_GUI_PORT}

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

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

        --from-literal=NATS_GUI_PORT=${NATS_GUI_PORT}



    kubectl get all --all-namespaces

}