Commit 3d5a54c8 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Merge remote-tracking branch 'origin/develop' into feat/webui

parents 93af7f2a 9cf94be4

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ include: 
  - local: '/src/tester_functional/.gitlab-ci.yml'

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

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

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

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

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

data/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.xml

manifests/contextservice.yaml

+0 −4
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ spec: 
  selector:

    app: contextservice

  ports:

  - name: grpc

    protocol: TCP

    port: 1010

    targetPort: 1010

  - name: http

    protocol: TCP

    port: 8080

manifests/deviceservice.yaml

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ spec: 
        ports:

        - containerPort: 2020

        env:

        - name: DB_ENGINE

          value: "redis"

        - name: REDIS_DATABASE_ID

          value: "0"

        - name: LOG_LEVEL

          value: "DEBUG"

        readinessProbe:

manifests/l3_attackmitigatorservice.yaml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: attackmitigatorservice

spec:

  selector:

    matchLabels:

      app: attackmitigatorservice

  template:

    metadata:

      labels:

        app: attackmitigatorservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

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

        imagePullPolicy: Always

        ports:

        - containerPort: 10002

        env:

        - name: LOG_LEVEL

          value: "DEBUG"

        readinessProbe:

          exec:

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

        livenessProbe:

          exec:

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

        resources:

          requests:

            cpu: 250m

            memory: 512Mi

          limits:

            cpu: 700m

            memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: attackmitigatorservice

spec:

  type: ClusterIP

  selector:

    app: attackmitigatorservice

  ports:

  - name: grpc

    port: 10002

    targetPort: 10002