Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/tid-bgp-speaker (e55b1941) · Commits · TFS / controller

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -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

install_requirements.sh

+16 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,22 @@ ALL_COMPONENTS="${ALL_COMPONENTS} dbscanserving opticalattackmitigator opticalat
		ALL_COMPONENTS="${ALL_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector"
		TFS_COMPONENTS=${TFS_COMPONENTS:-$ALL_COMPONENTS}

		# Some components require libyang built from source code
		# - Ref: https://github.com/CESNET/libyang
		# - Ref: https://github.com/CESNET/libyang-python/
		echo "Installing libyang..."
		sudo apt-get --yes --quiet --quiet update
		sudo apt-get --yes --quiet --quiet install build-essential cmake libpcre2-dev python3-dev python3-cffi
		mkdir libyang
		git clone https://github.com/CESNET/libyang.git libyang
		mkdir libyang/build
		cd libyang/build
		cmake -D CMAKE_BUILD_TYPE:String="Release" ..
		make
		sudo make install
		sudo ldconfig
		cd ../..

		echo "Updating PIP, SetupTools and Wheel..."
		pip install --upgrade pip # ensure next packages get the latest versions
		pip install --upgrade setuptools wheel # bring basic tooling for other requirements

manifests/e2e_orchestratorservice.yaml

0 → 100644

+91 −0

Original line number	Diff line number	Diff line
		# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.

		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: e2e-orchestratorservice
		spec:
		selector:
		matchLabels:
		app: e2e-orchestratorservice
		template:
		metadata:
		labels:
		app: e2e-orchestratorservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: labs.etsi.org:5050/tfs/controller/e2e_orchestrator:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 10050
		- containerPort: 9192
		env:
		- name: LOG_LEVEL
		value: "INFO"
		readinessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:10050"]
		livenessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:10050"]
		resources:
		requests:
		cpu: 250m
		memory: 128Mi
		limits:
		cpu: 1000m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: e2e-orchestratorservice
		labels:
		app: e2e-orchestratorservice
		spec:
		type: ClusterIP
		selector:
		app: e2e-orchestratorservice
		ports:
		- name: grpc
		port: 10050
		targetPort: 10050
		- name: metrics
		port: 9192
		targetPort: 9192
		---
		apiVersion: autoscaling/v2
		kind: HorizontalPodAutoscaler
		metadata:
		name: e2e-orchestratorservice-hpa
		spec:
		scaleTargetRef:
		apiVersion: apps/v1
		kind: Deployment
		name: e2e-orchestratorservice
		minReplicas: 1
		maxReplicas: 20
		metrics:
		- type: Resource
		resource:
		name: cpu
		target:
		type: Utilization
		averageUtilization: 80
		#behavior:
		# scaleDown:
		# stabilizationWindowSeconds: 30

my_deploy.sh

+3 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,9 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
		# Uncomment to activate Forecaster
		#export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"

		# Uncomment to activate E2E Orchestrator
		#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"

		# Set the tag you want to use for your images.
		export TFS_IMAGE_TAG="dev"

Admin message