Commit b8249f37 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

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

parents c4b613b6 92c9cc24

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ stages: 
include:

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

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

  - local: '/src/compute/.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'

.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, ZTP, Policy, Compute, etc.

List of impacted components: Context, Device, Service, PathComp, Slice, Monitoring, ZTP, Policy, NBI, 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 ztp monitoring pathcomp service slice compute webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi 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/nats.sh

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ function nats_deploy_single() { 
    helm3 repo add nats https://nats-io.github.io/k8s/helm/charts/

    echo



    echo "Upgrade NATS Helm Chart"

    helm3 repo update nats

    echo



    echo "Install NATS (single-node)"

    echo ">>> Checking if NATS is deployed..."

    if kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; then
@@ -81,6 +85,10 @@ function nats_deploy_single() { 
    echo "NATS Port Mapping"

    echo ">>> Expose NATS Client port (4222->${NATS_EXT_PORT_CLIENT})"

    NATS_PORT_CLIENT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

    if [ -z "$NATS_PORT_CLIENT" ]; then

        # NATS charts updated and port name changed from "client" to "nats"; fix to support new name and enable backward compatibility

        NATS_PORT_CLIENT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="nats")].port}')

    fi

    PATCH='{"data": {"'${NATS_EXT_PORT_CLIENT}'": "'${NATS_NAMESPACE}'/'${NATS_NAMESPACE}':'${NATS_PORT_CLIENT}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"

deploy/tfs.sh

+11 −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 ztp monitoring pathcomp service slice compute webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi 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"}
@@ -148,6 +148,10 @@ printf "\n" 


echo "Create secret with NATS data"

NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

if [ -z "$NATS_CLIENT_PORT" ]; then

    # NATS charts updated and port name changed from "client" to "nats"; fix to support new name and enable backward compatibility

    NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="nats")].port}')

fi

kubectl create secret generic nats-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

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

    --from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT}
@@ -570,3 +574,9 @@ if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui" 


    printf "\n\n"

fi



if [ "$DOCKER_BUILD" == "docker buildx build" ]; then

    echo "Pruning Docker Buildx Cache..."

    docker buildx prune --force

    printf "\n\n"

fi