Commit 2a3ab909 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'fix/oeccpsc22-interdomain-tests' into 'develop' 

Partial fix OECC/PSC'22 test, InterDomain component, and other side improvements

See merge request !110
parents bcdf5225 4f22e477

deploy/crdb.sh

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ TMP_FOLDER="./tmp" 
CRDB_MANIFESTS_PATH="manifests/cockroachdb"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${CRDB_NAMESPACE}/manifests"

mkdir -p $TMP_MANIFESTS_FOLDER



function crdb_deploy_single() {

deploy/qdb.sh

+3 −1
Original line number Diff line number Diff line
@@ -64,12 +64,14 @@ TMP_FOLDER="./tmp" 
QDB_MANIFESTS_PATH="manifests/questdb"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${QDB_NAMESPACE}/manifests"

mkdir -p $TMP_MANIFESTS_FOLDER



function qdb_deploy() {

    echo "QuestDB Namespace"

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

    kubectl create namespace ${QDB_NAMESPACE}

    sleep 2

    echo



    echo "QuestDB"

deploy/tfs.sh

+3 −2
Original line number Diff line number Diff line
@@ -124,14 +124,15 @@ GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller" 
TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${TFS_K8S_NAMESPACE}/manifests"

mkdir -p $TMP_MANIFESTS_FOLDER

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"

TMP_LOGS_FOLDER="${TMP_FOLDER}/${TFS_K8S_NAMESPACE}/logs"

mkdir -p $TMP_LOGS_FOLDER



echo "Deleting and Creating a new namespace..."

kubectl delete namespace $TFS_K8S_NAMESPACE --ignore-not-found

kubectl create namespace $TFS_K8S_NAMESPACE

sleep 2

printf "\n"



echo "Create secret with CockroachDB data"

manifests/deviceservice.yaml

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ spec: 
  replicas: 1

  template:

    metadata:

      annotations:

        # Required for IETF L2VPN SBI when both parent and child run in same K8s cluster with Linkerd

        config.linkerd.io/skip-outbound-ports: "8002"

      labels:

        app: deviceservice

    spec:

manifests/interdomainservice.yaml

+3 −3
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ spec: 
            command: ["/bin/grpc_health_probe", "-addr=:10010"]

        resources:

          requests:

            cpu: 50m

            cpu: 250m

            memory: 64Mi

          limits:

            cpu: 500m

            memory: 512Mi

            cpu: 1000m

            memory: 1024Mi

---

apiVersion: v1

kind: Service