diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index fd49c975844e49b3ba88f51b046700feaf8edc27..f1c7d5a777924dcf12e07715ff851b6b4733bf5b 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -279,8 +279,8 @@ for COMPONENT in $TFS_COMPONENTS; do
echo " Adapting '$COMPONENT' manifest file..."
MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"
- # cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
- cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST"
+ cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"
+ #cat ./manifests/"${COMPONENT}"service.yaml | linkerd inject - --proxy-cpu-request "10m" --proxy-cpu-limit "1" --proxy-memory-request "64Mi" --proxy-memory-limit "256Mi" > "$MANIFEST"
if [ "$COMPONENT" == "pathcomp" ]; then
IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
diff --git a/ecoc24 b/ecoc24
new file mode 120000
index 0000000000000000000000000000000000000000..37c97d3a77727ec098303cc9a5e04d711a30fcec
--- /dev/null
+++ b/ecoc24
@@ -0,0 +1 @@
+src/tests/ecoc24/
\ No newline at end of file
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index c7dc59625289027e9881d99e1bf34ca2bdd622a9..1e11ae13502cb8da8c784f159b5cf085d9ecbe90 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -58,7 +58,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:1010"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -83,25 +83,25 @@ spec:
protocol: TCP
port: 9192
targetPort: 9192
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
- name: contextservice-hpa
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: contextservice
- minReplicas: 1
- maxReplicas: 20
- metrics:
- - type: Resource
- resource:
- name: cpu
- target:
- type: Utilization
- averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+#---
+#apiVersion: autoscaling/v2
+#kind: HorizontalPodAutoscaler
+#metadata:
+# name: contextservice-hpa
+#spec:
+# scaleTargetRef:
+# apiVersion: apps/v1
+# kind: Deployment
+# name: contextservice
+# minReplicas: 1
+# maxReplicas: 20
+# metrics:
+# - type: Resource
+# resource:
+# name: cpu
+# target:
+# type: Utilization
+# averageUtilization: 80
+# #behavior:
+# # scaleDown:
+# # stabilizationWindowSeconds: 30
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index fdc3cea028a181b7dafbcfa6f3ef4e798939438e..06d5070bf7a302e2c48c67105d77d176660c2f88 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -53,7 +53,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
diff --git a/manifests/e2e_orchestratorservice.yaml b/manifests/e2e_orchestratorservice.yaml
index 11d7dc398a042914ce8a1ed20c55557020d2c7fe..9763b7a56ed5b801b0c6f9494c263b8a95a66246 100644
--- a/manifests/e2e_orchestratorservice.yaml
+++ b/manifests/e2e_orchestratorservice.yaml
@@ -20,6 +20,7 @@ spec:
selector:
matchLabels:
app: e2e-orchestratorservice
+ replicas: 1
template:
metadata:
annotations:
@@ -48,7 +49,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:10050"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -74,25 +75,3 @@ spec:
- name: ws
port: 8765
targetPort: 8765
----
-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
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index f017e694085da963944194197c91f5b4e9bcf70c..98b7e9af9655589fbcc200003ad5cda40c31c5fe 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -47,7 +47,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:10020"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -100,25 +100,25 @@ spec:
protocol: TCP
port: 9192
targetPort: 9192
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
- name: pathcompservice-hpa
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: pathcompservice
- minReplicas: 1
- maxReplicas: 20
- metrics:
- - type: Resource
- resource:
- name: cpu
- target:
- type: Utilization
- averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+#---
+#apiVersion: autoscaling/v2
+#kind: HorizontalPodAutoscaler
+#metadata:
+# name: pathcompservice-hpa
+#spec:
+# scaleTargetRef:
+# apiVersion: apps/v1
+# kind: Deployment
+# name: pathcompservice
+# minReplicas: 1
+# maxReplicas: 20
+# metrics:
+# - type: Resource
+# resource:
+# name: cpu
+# target:
+# type: Utilization
+# averageUtilization: 80
+# #behavior:
+# # scaleDown:
+# # stabilizationWindowSeconds: 30
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index 2fb7ebb8756a48b0a909734b7b9a90a44d79b9ea..2f3e62332baddb5fd4f9006f66c9cdbfdcfd7a53 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -45,7 +45,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:3030"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -70,25 +70,25 @@ spec:
protocol: TCP
port: 9192
targetPort: 9192
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
- name: serviceservice-hpa
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: serviceservice
- minReplicas: 1
- maxReplicas: 20
- metrics:
- - type: Resource
- resource:
- name: cpu
- target:
- type: Utilization
- averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+#---
+#apiVersion: autoscaling/v2
+#kind: HorizontalPodAutoscaler
+#metadata:
+# name: serviceservice-hpa
+#spec:
+# scaleTargetRef:
+# apiVersion: apps/v1
+# kind: Deployment
+# name: serviceservice
+# minReplicas: 1
+# maxReplicas: 20
+# metrics:
+# - type: Resource
+# resource:
+# name: cpu
+# target:
+# type: Utilization
+# averageUtilization: 80
+# #behavior:
+# # scaleDown:
+# # stabilizationWindowSeconds: 30
diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml
index 0daa8e70f4965274be563a8e5f703855281fe698..cc3c33bcaaa9812fe01db702b7ce3261facbec43 100644
--- a/manifests/sliceservice.yaml
+++ b/manifests/sliceservice.yaml
@@ -50,7 +50,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:4040"]
resources:
requests:
- cpu: 250m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -75,25 +75,25 @@ spec:
protocol: TCP
port: 9192
targetPort: 9192
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
- name: sliceservice-hpa
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: sliceservice
- minReplicas: 1
- maxReplicas: 20
- metrics:
- - type: Resource
- resource:
- name: cpu
- target:
- type: Utilization
- averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+#---
+#apiVersion: autoscaling/v2
+#kind: HorizontalPodAutoscaler
+#metadata:
+# name: sliceservice-hpa
+#spec:
+# scaleTargetRef:
+# apiVersion: apps/v1
+# kind: Deployment
+# name: sliceservice
+# minReplicas: 1
+# maxReplicas: 20
+# metrics:
+# - type: Resource
+# resource:
+# name: cpu
+# target:
+# type: Utilization
+# averageUtilization: 80
+# #behavior:
+# # scaleDown:
+# # stabilizationWindowSeconds: 30
diff --git a/manifests/vnt_managerservice.yaml b/manifests/vnt_managerservice.yaml
index 95070564b2c74767e6af882186164b731eb60739..0aca3780677e4f7d56ad11fd39268c38ffebe5b2 100644
--- a/manifests/vnt_managerservice.yaml
+++ b/manifests/vnt_managerservice.yaml
@@ -20,8 +20,12 @@ spec:
selector:
matchLabels:
app: vnt-managerservice
+ replicas: 1
template:
metadata:
+ annotations:
+ config.linkerd.io/skip-outbound-ports: "8765"
+ config.linkerd.io/skip-inbound-ports: "8765"
labels:
app: vnt-managerservice
spec:
@@ -33,6 +37,7 @@ spec:
ports:
- containerPort: 10070
- containerPort: 9192
+ - containerPort: 8765
env:
- name: LOG_LEVEL
value: "INFO"
@@ -44,7 +49,7 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:10070"]
resources:
requests:
- cpu: 150m
+ cpu: 200m
memory: 128Mi
limits:
cpu: 1000m
@@ -67,25 +72,6 @@ spec:
- name: metrics
port: 9192
targetPort: 9192
----
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
- name: vnt-managerservice-hpa
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: vnt-managerservice
- minReplicas: 1
- maxReplicas: 20
- metrics:
- - type: Resource
- resource:
- name: cpu
- target:
- type: Utilization
- averageUtilization: 80
- #behavior:
- # scaleDown:
- # stabilizationWindowSeconds: 30
+ - name: ws
+ port: 8765
+ targetPort: 8765
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index bb2573c454a7bf59364a7526a1b5193111daf892..28cc42c78338a759679e3611f35c83a171477c8d 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -61,44 +61,44 @@ spec:
limits:
cpu: 1000m
memory: 1024Mi
- - name: grafana
- image: grafana/grafana:8.5.22
- imagePullPolicy: IfNotPresent
- ports:
- - containerPort: 3000
- name: http-grafana
- protocol: TCP
- env:
- - name: GF_SERVER_ROOT_URL
- value: "http://0.0.0.0:3000/grafana/"
- - name: GF_SERVER_SERVE_FROM_SUB_PATH
- value: "true"
- readinessProbe:
- failureThreshold: 60
- httpGet:
- #path: /robots.txt
- path: /login
- port: 3000
- scheme: HTTP
- initialDelaySeconds: 1
- periodSeconds: 1
- successThreshold: 1
- timeoutSeconds: 2
- livenessProbe:
- failureThreshold: 60
- initialDelaySeconds: 1
- periodSeconds: 1
- successThreshold: 1
- tcpSocket:
- port: 3000
- timeoutSeconds: 1
- resources:
- requests:
- cpu: 250m
- memory: 512Mi
- limits:
- cpu: 500m
- memory: 1024Mi
+# - name: grafana
+# image: grafana/grafana:8.5.22
+# imagePullPolicy: IfNotPresent
+# ports:
+# - containerPort: 3000
+# name: http-grafana
+# protocol: TCP
+# env:
+# - name: GF_SERVER_ROOT_URL
+# value: "http://0.0.0.0:3000/grafana/"
+# - name: GF_SERVER_SERVE_FROM_SUB_PATH
+# value: "true"
+# readinessProbe:
+# failureThreshold: 60
+# httpGet:
+# #path: /robots.txt
+# path: /login
+# port: 3000
+# scheme: HTTP
+# initialDelaySeconds: 1
+# periodSeconds: 1
+# successThreshold: 1
+# timeoutSeconds: 2
+# livenessProbe:
+# failureThreshold: 60
+# initialDelaySeconds: 1
+# periodSeconds: 1
+# successThreshold: 1
+# tcpSocket:
+# port: 3000
+# timeoutSeconds: 1
+# resources:
+# requests:
+# cpu: 250m
+# memory: 512Mi
+# limits:
+# cpu: 500m
+# memory: 1024Mi
---
apiVersion: v1
kind: Service
diff --git a/src/tests/ecoc24/deploy.sh b/src/tests/ecoc24/deploy.sh
index 153e98b1aa06475b6b2e637c0676dba5459802e1..10a31ebc35d0847326d00ed00e5a4583ad7b65d0 100755
--- a/src/tests/ecoc24/deploy.sh
+++ b/src/tests/ecoc24/deploy.sh
@@ -18,19 +18,19 @@
kubectl delete namespace tfs-e2e tfs-ip
# Delete secondary ingress controllers
-kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
-kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
+kubectl delete -f ./src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl delete -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml
# Create secondary ingress controllers
-kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
-kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
+kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml
# Deploy TFS for e2e
-source src/tests/ecoc24/deploy_specs_e2e.sh
+source ./src/tests/ecoc24/deploy_specs_e2e.sh
./deploy/all.sh
mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
# Deploy TFS for ip
-source src/tests/ecoc24/deploy_specs_ip.sh
+source ./src/tests/ecoc24/deploy_specs_ip.sh
./deploy/all.sh
mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
diff --git a/src/tests/ecoc24/deploy_specs_e2e.sh b/src/tests/ecoc24/deploy_specs_e2e.sh
index f919336941a71267f7381e7997db8530505b4697..383a6b72616106007e6618e4341257a063b591ca 100755
--- a/src/tests/ecoc24/deploy_specs_e2e.sh
+++ b/src/tests/ecoc24/deploy_specs_e2e.sh
@@ -21,7 +21,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
# Set the list of components, separated by spaces, you want to build images for, and deploy.
# export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
-export TFS_COMPONENTS="context device pathcomp service nbi webui"
+export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
# Uncomment to activate Monitoring
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -51,7 +51,7 @@ export TFS_K8S_NAMESPACE="tfs-e2e"
export TFS_EXTRA_MANIFESTS="src/tests/ecoc24/tfs-ingress-e2e.yaml"
# Uncomment to monitor performance of components
-export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
+#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
# Uncomment when deploying Optical CyberSecurity
#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/cachingservice.yaml"
diff --git a/src/tests/ecoc24/deploy_specs_ip.sh b/src/tests/ecoc24/deploy_specs_ip.sh
index 12c718330b851b42706b19fb679a64c9f2cf4a4b..36e298b659fe0a5b08f5f730a9916592a4bf7af3 100755
--- a/src/tests/ecoc24/deploy_specs_ip.sh
+++ b/src/tests/ecoc24/deploy_specs_ip.sh
@@ -21,8 +21,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
# Set the list of components, separated by spaces, you want to build images for, and deploy.
# export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
-export TFS_COMPONENTS="context device pathcomp service nbi webui"
-
+export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
# Uncomment to activate Monitoring
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -42,7 +41,6 @@ export TFS_COMPONENTS="context device pathcomp service nbi webui"
# Uncomment to activate VNT Manager
export TFS_COMPONENTS="${TFS_COMPONENTS} vnt_manager"
-
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -53,7 +51,7 @@ export TFS_K8S_NAMESPACE="tfs-ip"
export TFS_EXTRA_MANIFESTS="src/tests/ecoc24/tfs-ingress-ip.yaml"
# Uncomment to monitor performance of components
-export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
+#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
# Uncomment when deploying Optical CyberSecurity
#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/cachingservice.yaml"
@@ -62,7 +60,7 @@ export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yam
export TFS_GRAFANA_PASSWORD="admin123+"
# Disable skip-build flag to rebuild the Docker images.
-export TFS_SKIP_BUILD="YES"
+export TFS_SKIP_BUILD=""
# ----- CockroachDB ------------------------------------------------------------