Changed e2eorchestrator to e2e_orchestrator (e22bc817) · Commits · TFS / controller

manifests/e2eorchestratorservice.yaml→manifests/e2e_orchestratorservice.yaml

+9 −9

Original line number	Diff line number	Diff line
		@@ -15,20 +15,20 @@
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: e2eorchestratorservice
		name: e2e-orchestratorservice
		spec:
		selector:
		matchLabels:
		app: e2eorchestratorservice
		app: e2e-orchestratorservice
		template:
		metadata:
		labels:
		app: e2eorchestratorservice
		app: e2e-orchestratorservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: labs.etsi.org:5050/tfs/controller/e2eorchestrator:latest
		image: labs.etsi.org:5050/tfs/controller/e2e_orchestrator:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 10050
		@@ -58,13 +58,13 @@ spec:
		apiVersion: v1
		kind: Service
		metadata:
		name: e2eorchestratorservice
		name: e2e-orchestratorservice
		labels:
		app: e2eorchestratorservice
		app: e2e-orchestratorservice
		spec:
		type: ClusterIP
		selector:
		app: e2eorchestratorservice
		app: e2e-orchestratorservice
		ports:
		- name: grpc
		port: 10050
		@@ -76,12 +76,12 @@ spec:
		apiVersion: autoscaling/v2
		kind: HorizontalPodAutoscaler
		metadata:
		name: e2eorchestratorservice-hpa
		name: e2e-orchestratorservice-hpa
		spec:
		scaleTargetRef:
		apiVersion: apps/v1
		kind: Deployment
		name: e2eorchestratorservice
		name: e2e-orchestratorservice
		minReplicas: 1
		maxReplicas: 20
		metrics:

+3 −3

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
		#export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"

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

		# Set the tag you want to use for your images.
		export TFS_IMAGE_TAG="dev"
		@@ -93,7 +93,7 @@ export CRDB_DATABASE="tfs"
		export CRDB_DEPLOY_MODE="single"

		# Disable flag for dropping database, if it exists.
		export CRDB_DROP_DATABASE_IF_EXISTS="YES"
		export CRDB_DROP_DATABASE_IF_EXISTS=""

		# Disable flag for re-deploying CockroachDB from scratch.
		export CRDB_REDEPLOY=""
		@@ -141,7 +141,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
		export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"

		# Disable flag for dropping tables if they exist.
		export QDB_DROP_TABLES_IF_EXIST="YES"
		export QDB_DROP_TABLES_IF_EXIST=""

		# Disable flag for re-deploying QuestDB from scratch.
		export QDB_REDEPLOY=""

+0 −0

File moved.

+0 −0

File moved.

+6 −6

Original line number	Diff line number	Diff line
		@@ -67,18 +67,18 @@ RUN rm *.proto
		RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;

		# Create module sub-folders
		RUN mkdir -p /home/teraflow/controller/e2eorchestrator
		RUN mkdir -p /home/teraflow/controller/e2e_orchestrator
		WORKDIR /home/teraflow/controller

		# Get Python packages per module
		COPY --chown=teraflow:teraflow ./src/e2eorchestrator/requirements.in e2eorchestrator/requirements.in
		COPY --chown=teraflow:teraflow ./src/e2e_orchestrator/requirements.in e2e_orchestrator/requirements.in
		# consider common and specific requirements to avoid inconsistencies with dependencies
		RUN pip-compile --quiet --output-file=e2eorchestrator/requirements.txt e2eorchestrator/requirements.in common_requirements.in
		RUN python3 -m pip install -r e2eorchestrator/requirements.txt
		RUN pip-compile --quiet --output-file=e2e_orchestrator/requirements.txt e2e_orchestrator/requirements.in common_requirements.in
		RUN python3 -m pip install -r e2e_orchestrator/requirements.txt

		# Add component files into working directory
		COPY --chown=teraflow:teraflow ./src/context/. context
		COPY --chown=teraflow:teraflow ./src/e2eorchestrator/. e2eorchestrator
		COPY --chown=teraflow:teraflow ./src/e2e_orchestrator/. e2e_orchestrator

		# Start the service
		ENTRYPOINT ["python", "-m", "e2eorchestrator.service"]
		ENTRYPOINT ["python", "-m", "e2e_orchestrator.service"]