Commit 5b9e9640 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

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

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/microk8s-deployment
parents a70f6f9b 47e4a51d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ include: 
  - local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'

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

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

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

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

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

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

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

common_requirements.in

0 → 100644
+8 −0
Original line number Diff line number Diff line 
coverage==6.3

grpcio==1.47.*

grpcio-health-checking==1.47.*

grpcio-tools==1.47.*

prometheus-client==0.13.0

protobuf==3.20.*

pytest==6.2.5

pytest-benchmark==3.4.1

data/.gitignore

+1 −0
Original line number Diff line number Diff line 
!.gitkeep

*.dot

*.xml

manifests/webuiservice.yaml

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ spec: 
        env:

        - name: LOG_LEVEL

          value: "DEBUG"

        - name: WEBUI_APPLICATION_ROOT

          value: /webui

        - name: WEBUISERVICE_SERVICE_BASEURL_HTTP

          value: "/webui"

        readinessProbe:

          httpGet:

            path: /healthz/ready

proto/src/java/.gitignore

+1 −4
Original line number Diff line number Diff line 
*



# used to prevent breaking symbolic links from source code folders

!.gitignore

!__init__.py
 
!.gitkeep