Commit d1f4372d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/compute-component

parents 0d12a3f6 0d074d1a

.gitlab-ci.yml

+4 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ stages: 
include:

  - local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  #- local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/compute/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'
@@ -22,7 +21,7 @@ include: 
  - local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/tester_integration/.gitlab-ci.yml'

  #- local: '/src/tester_functional/.gitlab-ci.yml'

  #- local: '/src/automation/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
 
  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  - local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/l3_attackmitigator/.gitlab-ci.yml'

deploy_in_kubernetes.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ REGISTRY_IMAGE="" 
#REGISTRY_IMAGE="http://my-container-registry.local/"



# Set the list of components you want to build images for, and deploy.

COMPONENTS="context device automation policy service compute monitoring centralizedattackdetector dbscanserving opticalattackmitigator opticalcentralizedattackdetector" # TODO: include opticalcentralizedattackdetector

COMPONENTS="context device automation policy service compute monitoring dbscanserving opticalattackmitigator opticalcentralizedattackdetector"



# Set the tag you want to use for your images.

IMAGE_TAG="tf-dev"

install_development_dependencies.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ pip install --upgrade pip setuptools wheel pip-tools pylint pytest pytest-benchm 
echo "" > requirements.in



#TODO: include here your component

COMPONENTS="compute context device service monitoring centralizedattackdetector opticalcentralizedattackdetector opticalattackmitigator dbscanserving"

COMPONENTS="compute context device service monitoring opticalcentralizedattackdetector opticalattackmitigator dbscanserving"



# compiling dependencies from all components

for component in $COMPONENTS

manifests/centralizedattackdetectorservice.yaml

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

kind: Deployment

metadata:

  name: centralizedattackdetectorervice

spec:

  selector:

    matchLabels:

      app: centralizedattackdetectorervice

  template:

    metadata:

      labels:

        app: centralizedattackdetectorervice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: registry.gitlab.com/teraflow-h2020/controller/centralizedcybersecurity:latest

        imagePullPolicy: Always

        ports:

        - containerPort: 10000

        env:

        - name: DB_ENGINE

          value: "redis"

        - name: REDIS_DATABASE_ID

          value: "0"

        - name: LOG_LEVEL

          value: "DEBUG"

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:10000"]

        livenessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:10000"]

        resources:

          requests:

            cpu: 250m

            memory: 512Mi

          limits:

            cpu: 700m

            memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: centralizedattackdetectorervice

spec:

  type: ClusterIP

  selector:

    app: centralizedattackdetectorervice

  ports:

  - name: grpc

    port: 10000

    targetPort: 10000

---

apiVersion: v1

kind: Service

metadata:

  name: centralizedattackdetectorervice-public

  labels:

    app: centralizedattackdetectorervice

spec:

  type: NodePort

  selector:

    app: centralizedattackdetectorervice

  ports:

  - name: grpc

    protocol: TCP

    port: 10000

    targetPort: 10000

---

manifests/l3_attackmitigatorservice.yaml

+6 −6
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: attackmitigatorservice

  name: l3_attackmitigatorservice

spec:

  selector:

    matchLabels:

      app: attackmitigatorservice

      app: l3_attackmitigatorservice

  template:

    metadata:

      labels:

        app: attackmitigatorservice

        app: l3_attackmitigatorservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: registry.gitlab.com/teraflow-h2020/controller/attackmitigator:latest

        image: registry.gitlab.com/teraflow-h2020/controller/l3_attackmitigator:latest

        imagePullPolicy: Always

        ports:

        - containerPort: 10002
@@ -38,11 +38,11 @@ spec: 
apiVersion: v1

kind: Service

metadata:

  name: attackmitigatorservice

  name: l3_attackmitigatorservice

spec:

  type: ClusterIP

  selector:

    app: attackmitigatorservice

    app: l3_attackmitigatorservice

  ports:

  - name: grpc

    port: 10002