Commit 82fe73c8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Unifica variables y actualiza valores por defecto

See merge request redmic-project/gis/geoserver!73
parents 63f14962 cbf0602b

deploy/.env

+12 −21
Original line number Diff line number Diff line
@@ -34,28 +34,19 @@ POSTGRES_USER=geowebcache 
POSTGRES_PASS=changeme

POSTGRES_DB=gwc



DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1G

DEV_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_MASTER_RESOURCES_LIMITS_MEMORY=2G

DEV_NODE_INITIAL_MEMORY=1G

DEV_NODE_MAXIMUM_MEMORY=1G

DEV_NODE_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_NODE_RESOURCES_LIMITS_MEMORY=2G

DEV_INITIAL_MEMORY=300M

DEV_MAXIMUM_MEMORY=1G

DEV_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_RESOURCES_LIMITS_MEMORY=2500M

DEV_RESOURCES_LIMITS_CPUS=1

DEV_RESOURCES_RESERVATIONS_CPUS=0.1



PRO_MASTER_INITIAL_MEMORY=1G

PRO_MASTER_MAXIMUM_MEMORY=1G

PRO_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

PRO_MASTER_RESOURCES_LIMITS_MEMORY=2500M

PRO_NODE_INITIAL_MEMORY=1500M

PRO_NODE_MAXIMUM_MEMORY=1500M

PRO_NODE_RESOURCES_RESERVATIONS_MEMORY=2G

PRO_NODE_RESOURCES_LIMITS_MEMORY=3G



MASTER_RESOURCES_LIMITS_CPUS=1

MASTER_RESOURCES_RESERVATIONS_CPUS=0.1

NODE_RESOURCES_LIMITS_CPUS=1

NODE_RESOURCES_RESERVATIONS_CPUS=0.1

PRO_INITIAL_MEMORY=512M

PRO_MAXIMUM_MEMORY=1500M

PRO_RESOURCES_RESERVATIONS_MEMORY=2500M

PRO_RESOURCES_LIMITS_MEMORY=4G

PRO_RESOURCES_LIMITS_CPUS=2

PRO_RESOURCES_RESERVATIONS_CPUS=0.1



DEV_VOL_DRIVER=local

VOL_TYPE=nfs

deploy/compose.dev.yaml

+12 −12
Original line number Diff line number Diff line 
services:

  geoserver-master:

    environment:

      INITIAL_MEMORY: ${DEV_MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_MASTER_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${DEV_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_MAXIMUM_MEMORY}

    deploy:

      resources:

        limits:

          cpus: '${MASTER_RESOURCES_LIMITS_CPUS}'

          memory: ${DEV_MASTER_RESOURCES_LIMITS_MEMORY}

          cpus: '${DEV_RESOURCES_LIMITS_CPUS}'

          memory: ${DEV_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${MASTER_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${DEV_MASTER_RESOURCES_RESERVATIONS_MEMORY}

          cpus: '${DEV_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${DEV_RESOURCES_RESERVATIONS_MEMORY}



  geoserver-node:

    environment:

      INITIAL_MEMORY: ${DEV_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_NODE_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${DEV_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${DEV_MAXIMUM_MEMORY}

    deploy:

      resources:

        limits:

          cpus: '${NODE_RESOURCES_LIMITS_CPUS}'

          memory: ${DEV_NODE_RESOURCES_LIMITS_MEMORY}

          cpus: '${DEV_RESOURCES_LIMITS_CPUS}'

          memory: ${DEV_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${NODE_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${DEV_NODE_RESOURCES_RESERVATIONS_MEMORY}

          cpus: '${DEV_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${DEV_RESOURCES_RESERVATIONS_MEMORY}



volumes:

  data-vol:

deploy/compose.prod.yaml

+12 −12
Original line number Diff line number Diff line 
services:

  geoserver-master:

    environment:

      INITIAL_MEMORY: ${PRO_MASTER_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_MASTER_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${PRO_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_MAXIMUM_MEMORY}

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${MASTER_RESOURCES_LIMITS_CPUS}'

          memory: ${PRO_MASTER_RESOURCES_LIMITS_MEMORY}

          cpus: '${PRO_RESOURCES_LIMITS_CPUS}'

          memory: ${PRO_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${MASTER_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${PRO_MASTER_RESOURCES_RESERVATIONS_MEMORY}

          cpus: '${PRO_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${PRO_RESOURCES_RESERVATIONS_MEMORY}



  geoserver-node:

    environment:

      INITIAL_MEMORY: ${PRO_NODE_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_NODE_MAXIMUM_MEMORY}

      INITIAL_MEMORY: ${PRO_INITIAL_MEMORY}

      MAXIMUM_MEMORY: ${PRO_MAXIMUM_MEMORY}

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${NODE_RESOURCES_LIMITS_CPUS}'

          memory: ${PRO_NODE_RESOURCES_LIMITS_MEMORY}

          cpus: '${PRO_RESOURCES_LIMITS_CPUS}'

          memory: ${PRO_RESOURCES_LIMITS_MEMORY}

        reservations:

          cpus: '${NODE_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${PRO_NODE_RESOURCES_RESERVATIONS_MEMORY}

          cpus: '${PRO_RESOURCES_RESERVATIONS_CPUS}'

          memory: ${PRO_RESOURCES_RESERVATIONS_MEMORY}



volumes:

  data-vol:

deploy/compose.tmpl.yaml

+0 −6
Original line number Diff line number Diff line
@@ -72,12 +72,6 @@ x-geoserver-traefik-common-service-labels: &geoserver-traefik-common-service-lab 
  traefik.http.routers.geoserver.service: geoserver

  traefik.http.services.geoserver.loadbalancer.server.port: ${GEOSERVER_PORT}



  traefik.http.services.geoserver.loadbalancer.sticky.cookie: ${TRAEFIK_STICKY_COOKIE:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.name: ${TRAEFIK_STICKY_COOKIE_NAME:-traefik-geoserver}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.httponly: ${TRAEFIK_STICKY_COOKIE_HTTPONLY:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.secure: ${TRAEFIK_STICKY_COOKIE_SECURE:-true}

  traefik.http.services.geoserver.loadbalancer.sticky.cookie.samesite: ${TRAEFIK_STICKY_COOKIE_SAMESITE:-lax}



  traefik.http.services.geoserver.loadbalancer.healthcheck.path: ${GEOSERVER_HEALTH_PATH}

  traefik.http.services.geoserver.loadbalancer.healthcheck.headers.authorization: ${TRAEFIK_HEALTH_AUTH}