Commit 9cc44b30 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/context-service' into 'develop' 

Several improvements

See merge request teraflow-h2020/controller!11
parents e8ec7e2b 3c3b2dfa

.gitlab-ci.yml

+5 −1
Original line number Diff line number Diff line
@@ -2,10 +2,14 @@ 
stages:

  - build

  - test

  - dependencies

  - deploy

  - integration_test



# include the individual .gitlab-ci.yml of each micro-service

include: 

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

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

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

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

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

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

manifests/.gitlab-ci.yml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# Deployment of the dependency services in Kubernetes Cluster



dependencies all:

  stage: dependencies

  script:

    - kubectl version

    - kubectl get all

    - kubectl apply -f "manifests/prometheus.yaml"

    - kubectl apply -f "manifests/redis.yaml"

    - kubectl get all

manifests/contextservice.yaml

+3 −3
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ spec: 
      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: context_service:develop

        imagePullPolicy: Never

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

        imagePullPolicy: Always

        ports:

        - containerPort: 1010

        env:

        - name: DB_ENGINE

          value: "redis"

        - name: REDISDB_DATABASE_ID

        - name: REDIS_DATABASE_ID

          value: "0"

        - name: LOG_LEVEL

          value: "DEBUG"

manifests/deviceservice.yaml

+3 −3
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ spec: 
      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: device:dockerfile

        imagePullPolicy: Never

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

        imagePullPolicy: Always

        ports:

        - containerPort: 2020

        env:

        - name: DB_ENGINE

          value: "redis"

        - name: REDISDB_DATABASE_ID

        - name: REDIS_DATABASE_ID

          value: "0"

        - name: LOG_LEVEL

          value: "DEBUG"

manifests/prometheus.yaml

+4 −4
Original line number Diff line number Diff line
@@ -15,19 +15,19 @@ data: 
      - role: pod

        namespaces:

          names:

          - teraflow-development

          - gitlab-ci

    - job_name: 'teraflow-metrics-service'

      kubernetes_sd_configs:

      - role: service

        namespaces:

          names:

          - teraflow-development

          - gitlab-ci

    - job_name: 'teraflow-metrics-endpoints'

      kubernetes_sd_configs:

      - role: endpoints

        namespaces:

          names:

          - teraflow-development

          - gitlab-ci

---

apiVersion: apps/v1

kind: Deployment
@@ -71,7 +71,7 @@ spec: 
  selector:

    app: prometheus

  ports:

  - name: prometheus-http

  - name: http

    protocol: TCP

    port: 9090

    targetPort: 9090