diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml index 138191e2a619a3b7c67d2fbdcbebaa284e00fbc8..679552e2fbaf14ceb7e1a190f11adb6877efa386 100644 --- a/manifests/pathcompservice.yaml +++ b/manifests/pathcompservice.yaml @@ -51,27 +51,18 @@ spec: - name: backend image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-backend:latest imagePullPolicy: Always - # not working; to be investigated - #readinessProbe: - # exec: - # command: - # - curl -X POST -0 - # - -H 'Expect:' - # - -H 'Content-Type:\ application/json' - # - -d '{}' - # - http://127.0.0.1:8081/pathComp/api/v1/compRoute - # initialDelaySeconds: 5 - # timeoutSeconds: 5 - #livenessProbe: - # exec: - # command: - # - curl -X POST -0 - # - -H 'Expect:' - # - -H 'Content-Type:\ application/json' - # - -d '{}' - # - http://127.0.0.1:8081/pathComp/api/v1/compRoute - # initialDelaySeconds: 5 - # timeoutSeconds: 5 + readinessProbe: + httpGet: + path: /health + port: 8081 + initialDelaySeconds: 5 + timeoutSeconds: 5 + livenessProbe: + httpGet: + path: /health + port: 8081 + initialDelaySeconds: 5 + timeoutSeconds: 5 resources: requests: cpu: 250m diff --git a/src/pathcomp/.gitignore b/src/pathcomp/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..48a680bf0f45eb556108c349bc45be896f4219aa --- /dev/null +++ b/src/pathcomp/.gitignore @@ -0,0 +1 @@ +backend/wireshark diff --git a/src/pathcomp/.gitlab-ci.yml b/src/pathcomp/.gitlab-ci.yml index d8ab40fda138723a3e7771005125b0dccce71b1f..aaed7f8fee849e5015b585b2e979eda09b9d1073 100644 --- a/src/pathcomp/.gitlab-ci.yml +++ b/src/pathcomp/.gitlab-ci.yml @@ -62,6 +62,9 @@ build pathcomp-frontend: - src/common/**/*.py - proto/*.proto - src/$IMAGE_NAME/.gitlab-ci.yml + - src/$IMAGE_NAME/backend/**/*.{c,h,conf} + - src/$IMAGE_NAME/backend/Makefile + - src/$IMAGE_NAME/backend/Dockerfile - src/$IMAGE_NAME/frontend/**/*.{py,in,yml} - src/$IMAGE_NAME/frontend/Dockerfile - src/$IMAGE_NAME/frontend/tests/*.py diff --git a/src/pathcomp/backend/Dockerfile b/src/pathcomp/backend/Dockerfile index c7c8d796512ec4bb5ff59d3d48ae62d86df761af..128085f902df61acad7493ae6c085031a7aac568 100644 --- a/src/pathcomp/backend/Dockerfile +++ b/src/pathcomp/backend/Dockerfile @@ -71,4 +71,4 @@ COPY --from=builder /var/teraflow/config/pathcomp.conf ./config COPY --from=builder /var/teraflow/tests/. ./tests # release entrypoint: -ENTRYPOINT [ "./pathComp", "config/pathcomp.conf", "pathcomp.log" ] +ENTRYPOINT [ "./pathComp", "config/pathcomp.conf", "screen_only" ] diff --git a/src/pathcomp/backend/Dockerfile-gdb b/src/pathcomp/backend/Dockerfile-gdb index 13af33006504095204878b465bdee7f84f549d20..dcf2dbd2fefb22618677b746d1a6cc82a5412e13 100644 --- a/src/pathcomp/backend/Dockerfile-gdb +++ b/src/pathcomp/backend/Dockerfile-gdb @@ -34,4 +34,4 @@ RUN make EXPOSE 8081 -ENTRYPOINT [ "gdb", "--args", "./pathComp", "config/pathcomp.conf", "pathcomp.log" ] +ENTRYPOINT [ "gdb", "--args", "./pathComp", "config/pathcomp.conf", "screen_only" ] diff --git a/src/pathcomp/backend/wireshark/restAPI_20220727.pcap b/src/pathcomp/backend/wireshark/restAPI_20220727.pcap deleted file mode 100644 index e5e4ece2d4b1b2588961b47f16761b71749ac8f4..0000000000000000000000000000000000000000 Binary files a/src/pathcomp/backend/wireshark/restAPI_20220727.pcap and /dev/null differ