Commit 52021db0 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Revert "Merge branch 'feat/context-service' into 'master'" 

This reverts merge request !3
parent a5a3da5d

.gitignore

+1 −5
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ coverage.xml 
*.py,cover

*.py,cover

.hypothesis/

.hypothesis/

.pytest_cache/

.pytest_cache/

.benchmarks/

cover/

cover/





# Translations

# Translations
@@ -86,7 +85,7 @@ ipython_config.py 
# pyenv

# pyenv

#   For a library or package, you might want to ignore these files since the code is

#   For a library or package, you might want to ignore these files since the code is

#   intended to run in multiple environments; otherwise, check them in:

#   intended to run in multiple environments; otherwise, check them in:

.python-version

# .python-version





# pipenv

# pipenv

#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.

#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -118,9 +117,6 @@ venv.bak/ 
.spyderproject

.spyderproject

.spyproject

.spyproject





# VSCode project settings

.vscode/



# Rope project settings

# Rope project settings

.ropeproject

.ropeproject

manifests/contextservice.yaml

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

kind: Deployment

metadata:

  name: contextservice

spec:

  selector:

    matchLabels:

      app: contextservice

  template:

    metadata:

      labels:

        app: contextservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: context_service:develop

        imagePullPolicy: Never

        ports:

        - containerPort: 7070

        env:

        - name: DB_ENGINE

          value: "redis"

        - name: REDISDB_DATABASE_ID

          value: "0"

        - name: LOG_LEVEL

          value: "DEBUG"

        readinessProbe:

          exec:

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

        livenessProbe:

          exec:

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

        resources:

          requests:

            cpu: 250m

            memory: 512Mi

          limits:

            cpu: 700m

            memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: contextservice

spec:

  type: ClusterIP

  selector:

    app: contextservice

  ports:

  - name: grpc

    port: 7070

    targetPort: 7070

manifests/redisdb.yaml

deleted100644 → 0
+0 −38
Original line number Original line Diff line number Diff line 
---

apiVersion: apps/v1

kind: Deployment

metadata:

  name: redisdb

spec:

  selector:

    matchLabels:

      app: redisdb

  replicas: 1

  template:

    metadata:

      labels:

        app: redisdb

        version: v1

    spec:

      containers:

      - name: redisdb

        image: redis:6.2

        ports:

        - containerPort: 6379

---

apiVersion: v1

kind: Service

metadata:

  name: redisdb

  labels:

    app: redisdb

spec:

  type: ClusterIP

  selector:

    app: redisdb

  ports:

  - name: redisdb

    protocol: TCP

    port: 6379

    targetPort: 6379

---

src/build.sh

+0 −10
Original line number Original line Diff line number Diff line 
#!/usr/bin/env bash

#!/usr/bin/env bash





# Make folder containing the script the root folder for its execution

cd $(dirname $0)



echo "BUILD context"

context/genproto.sh

docker build -t "context_service:develop" -f context/Dockerfile_develop --quiet .

docker build -t "context_service:test" -f context/Dockerfile_test --quiet .



cd monitoring

cd monitoring

./genproto.sh

./genproto.sh

cd ..

cd ..
@@ -15,5 +7,3 @@ cd .. 
echo "BUILD monitoring"

echo "BUILD monitoring"

docker build -t "monitoring:dockerfile" -f monitoring/Dockerfile .

docker build -t "monitoring:dockerfile" -f monitoring/Dockerfile .

echo "Prune unused images"

docker image prune --force

src/common/database/__init__.py

deleted100644 → 0
+0 −0

Empty file deleted.