Commit 923cd4bd authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into...

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/310-cttc-implement-nbi-connector-to-interface-with-osm-client
parents 9b8f5a60 eddce1f8
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}


# ----- Telemetry Config ------------------------------------------------------

# Replace LOAD_BALANCER_IP
export LOAD_BALANCER_IP=${LOAD_BALANCER_IP:-""}

########################################################################################################################
# Automated steps start here
########################################################################################################################
@@ -215,6 +220,9 @@ else
fi
printf "\n"

# Before deployment change the telemetry LOAD_BALANCER_IP
sed -i "s|_LOAD_BALANCER_IP_|$LOAD_BALANCER_IP|g" manifests/telemetryservice.yaml

for COMPONENT in $TFS_COMPONENTS; do
    echo "Processing '$COMPONENT' component..."

@@ -597,6 +605,9 @@ if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui"
    printf "\n\n"
fi

# Revert _LOAD_BALANCER_IP_ for the next deployment
sed -i "s|$LOAD_BALANCER_IP|_LOAD_BALANCER_IP_|g" manifests/telemetryservice.yaml

echo "Pruning Docker Images..."
docker image prune --force
printf "\n\n"
+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ spec:
          env:
            - name: LOG_LEVEL
              value: "INFO"
            - name: CRDB_DATABASE
              value: "tfs_automation"
          envFrom:
            - secretRef:
                name: crdb-data
          startupProbe:
            exec:
              command: ["/bin/grpc_health_probe", "-addr=:30200"]
+1 −9
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ spec:
      restartPolicy: Always
      containers:
      - name: kafka
        image: bitnami/kafka:latest
        image: bitnamilegacy/kafka:latest
        imagePullPolicy: IfNotPresent
        ports:
        - name: clients
@@ -68,14 +68,6 @@ spec:
        - name: control-plane
          containerPort: 9093
        env:
          #- name: KAFKA_BROKER_ID
          #  value: "1"
          #- name: KAFKA_ZOOKEEPER_CONNECT
          #  value: zookeeper-service.<KAFKA_NAMESPACE>.svc.cluster.local:2181
          #- name: KAFKA_LISTENERS
          #  value: PLAINTEXT://:9092
          #- name: KAFKA_ADVERTISED_LISTENERS
          #  value: PLAINTEXT://kafka-service.<KAFKA_NAMESPACE>.svc.cluster.local:9092
          - name: KAFKA_CFG_NODE_ID
            value: "1"
          - name: KAFKA_CFG_PROCESS_ROLES

manifests/metallb.yaml

0 → 100644
+30 −0
Original line number Diff line number Diff line
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (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.

# Use this YAML to change configuration of MetalLB in real time.

apiVersion: metallb.io/v1beta1
kind: IPAddressPool
metadata:
  name: my-ip-pool
  namespace: metallb-system
spec:
  addresses:
    - 192.168.5.250-192.168.5.251  # <-- Change this to match your network
---
apiVersion: metallb.io/v1beta1
kind: L2Advertisement
metadata:
  name: l2-adv
  namespace: metallb-system
+7 −1
Original line number Diff line number Diff line
@@ -94,10 +94,16 @@ metadata:
  labels:
    app: telemetryservice
spec:
  type: ClusterIP
  type: LoadBalancer
  loadBalancerIP: _LOAD_BALANCER_IP_
  externalTrafficPolicy: Local
  selector:
    app: telemetryservice
  ports:
    - name: dnsudp
      protocol: UDP
      port: 12345
      targetPort: 12345
    - name: grpc
      protocol: TCP
      port: 30050
Loading