Commit c0d04da6 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code cleanup

parent 4aae26be

deploy/all.sh

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"alto context device ztp monitoring pathcomp service slice nbi webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi webui load_generator"}



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
@@ -155,8 +155,6 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}



#If not already set, set the external port ALTO will be exposed to.

export ALTO_EXT_PORT_HTTP=${ALTO_EXT_PORT_HTTP:-"5000"}





########################################################################################################################

deploy/expose_dashboard.sh

+0 −15
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}



# If not already set, set the external port ALTO HTTP Dashboards will be exposed to.

# export ALTO_EXT_PORT_HTTP=${ALTO_EXT_PORT_HTTP:-"5000"}



########################################################################################################################

# Automated steps start here
@@ -57,19 +55,6 @@ function expose_dashboard() { 
    PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'

    kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"

    echo



    # echo "ALTO Port Mapping"

    # echo ">>> Expose ALTO HTTP Mgmt GUI port (5000->${ALTO_EXT_PORT_HTTP})"

    # ALTO_PORT_HTTP=$(kubectl --namespace ${MONITORING_NAMESPACE} get service alto -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    # PATCH='{"data": {"'${ALTO_EXT_PORT_HTTP}'": "'${MONITORING_NAMESPACE}'/alto:'${ALTO_PORT_HTTP}'"}}'

    # kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



    # PORT_MAP='{"containerPort": '${ALTO_EXT_PORT_HTTP}', "hostPort": '${ALTO_EXT_PORT_HTTP}'}'

    # CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'

    # PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'

    # kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"

    # echo



}



if kubectl get namespace ${MONITORING_NAMESPACE} &> /dev/null; then

deploy/tfs.sh

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi webui load_generator alto"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device ztp monitoring pathcomp service slice nbi webui load_generator"}



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
@@ -114,8 +114,6 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}



# If not already set, set the external port ALTO HTTP Dashboards will be exposed to.

# export ALTO_EXT_PORT_HTTP=${ALTO_EXT_PORT_HTTP:-"5000"}



########################################################################################################################

# Automated steps start here

manifests/altoservice.yaml

deleted100644 → 0
+0 −127
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: altoservice

spec:

 replicas: 1

 selector:

    matchLabels:

      app: altoservice

 template:

    metadata:

      labels:

        app: altoservice

    spec:

      containers:

      - name: altoservice

        image: localhost:32000/tfs/alto:dev #alto_light:lastets

        ports:

        - containerPort: 5000

---

apiVersion: v1

kind: Service

metadata:

  name: altoserviceforwarding

spec:

  selector:

    app: altoservice

  type: ClusterIP

  ports:

    - protocol: TCP

      name: "maps"

      port: 5000

      targetPort: 5000

      

      

 # type: LoadBalancer







# apiVersion: apps/v1

# kind: Deployment

# metadata:

#   name: altoservice

# spec:

#   selector:

#     matchLabels:

#       app: altoservice

#   # replicas: 1

#   template:

#     metadata:

#       labels:

#         app: altoservice

#     spec:

#       terminationGracePeriodSeconds: 5

#       containers:

#       - name: server

#         image: alto_light:latest   #localhost:32000/tfs/alto

#         ports:

#         - containerPort: 5000

#         - 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: 50m

#             memory: 64Mi

#           limits:

#             cpu: 500m

#             memory: 512Mi

# ---

# apiVersion: v1

# kind: Service

# metadata:

#   name: altoservice

#   labels:

#     app: altoservice

# spec:

#   type: ClusterIP

#   selector:

#     app: altoservice

#   ports:

#   - name: http

#     protocol: TCP

#     port: 5000

#     targetPort: 5000

#   - name: grpc

#     protocol: TCP

#     port: 10050

#     targetPort: 10050

#   - name: metrics

#     protocol: TCP

#     port: 9192

#     targetPort: 9192





# version: '3.1'



# services:

#  docker_alto:

#     image: docker_alto

#     container_name: docker_alto

#     ports:

#             - "5000:5000"

#     restart: unless-stopped

src/alto/00-alto-light.yaml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

 name: alto-light

spec:

 replicas: 1

 selector:

    matchLabels:

      app: alto-light

 template:

    metadata:

      labels:

        app: alto-light

    spec:

      containers:

      - name: alto-light

        image: docker.io/library/alto_light:latest

        imagePullPolicy: IfNotPresent

        ports:

        - containerPort: 5000

---

apiVersion: v1

kind: Service

metadata:

 name: alto-light

spec:

 selector:

    app: alto-light

 ports:

    - protocol: TCP

      port: 5000

      targetPort: 5000

 type: LoadBalancer