Commit 0d158725 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

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

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/xr_driver_ipm_error_subscription_and_reporting
parents d3131c44 f8cbab70
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ spec:
  selector:
    matchLabels:
      app: computeservice
  replicas: 1
  template:
    metadata:
      labels:
@@ -44,16 +45,18 @@ spec:
            command: ["/bin/grpc_health_probe", "-addr=:9090"]
        resources:
          requests:
            cpu: 250m
            memory: 512Mi
            cpu: 50m
            memory: 64Mi
          limits:
            cpu: 700m
            memory: 1024Mi
            cpu: 500m
            memory: 512Mi
---
apiVersion: v1
kind: Service
metadata:
  name: computeservice
  labels:
    app: computeservice
spec:
  type: ClusterIP
  selector:
+10 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ spec:
  selector:
    matchLabels:
      app: webuiservice
  replicas: 1
  template:
    metadata:
      labels:
@@ -55,11 +56,11 @@ spec:
          timeoutSeconds: 1
        resources:
          requests:
            cpu: 100m
            memory: 512Mi
            cpu: 50m
            memory: 64Mi
          limits:
            cpu: 700m
            memory: 1024Mi
            cpu: 500m
            memory: 512Mi
      - name: grafana
        image: grafana/grafana:8.5.11
        imagePullPolicy: IfNotPresent
@@ -92,16 +93,18 @@ spec:
          timeoutSeconds: 1
        resources:
          requests:
            cpu: 250m
            memory: 750Mi
            cpu: 150m
            memory: 512Mi
          limits:
            cpu: 700m
            cpu: 500m
            memory: 1024Mi
---
apiVersion: v1
kind: Service
metadata:
  name: webuiservice
  labels:
    app: webuiservice
spec:
  type: ClusterIP
  selector:

ofc23

0 → 120000
+1 −0
Original line number Diff line number Diff line
src/tests/ofc23/
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ enum DeviceDriverEnum {
  DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;
  DEVICEDRIVER_ONF_TR_352 = 5;
  DEVICEDRIVER_XR = 6;
  DEVICEDRIVER_IETF_L2VPN = 7;
}

enum DeviceOperationalStatusEnum {
+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
# Automated steps start here
########################################################################################################################

kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/computeservice
kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/computeservice -c server
Loading