Commit 1be8149c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Migra a nueva imagen por obsolescencia

See merge request redmic-project/confluent/kafka-manager!5
parents fbcb7a76 8e19a11b

.gitlab-ci.yml

+1 −4
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy
@@ -9,6 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: confluent
 
    DD_TRAEFIK_SUBDOMAIN: kafkamanager

  environment:

    url: https://${DD_TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}

deploy/.env

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ KAFKA_MANAGER_AUTH_ENABLED=true 
KAFKA_MANAGER_USERNAME=redmic

KAFKA_MANAGER_PASSWORD=changeme



VOL_DRIVER=local

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14



CONF_VOL_NAME=cmak-conf-vol

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+8 −0
Original line number Diff line number Diff line 
version: '3.5'



volumes:

  conf-vol:

    name: ${CONF_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/cmak-conf-vol/
 
      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${CONF_VOL_DEVICE:-:/cmak-conf-vol/}

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  cmak:

    deploy:

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+10 −14
Original line number Diff line number Diff line 
version: '3.5'



services:

  cmak:

    image: ${IMAGE_NAME:-hlebalbau/kafka-manager}:${IMAGE_TAG:-stable}

    image: ${IMAGE_NAME:-ghcr.io/eshepelyuk/dckr/cmak-3.0.0.6}:${IMAGE_TAG:-latest}

    command:

      - -Dhttp.port=${HTTP_PORT}

      - -Djava.net.preferIPv4Stack=true
@@ -16,24 +14,22 @@ services: 
      kafka-net:

      traefik-net:

    volumes:

      - conf-vol:/kafka-manager/conf

    healthcheck:

      test: wget --spider -nv -t 1 http://localhost:${HTTP_PORT}/api/health

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-10s}

      retries: ${HEALTHCHECK_RETRIES:-3}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

      - conf-vol:/cmak/conf

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      labels:

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN:-kafkamanager}.${PUBLIC_HOSTNAME}

        traefik.backend: cmak

        traefik.port: '${HTTP_PORT}'

      restart_policy:

        delay: ${RESTART_DELAY:-30s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.cmak.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.cmak.rule: Host(`${TRAEFIK_SUBDOMAIN:-kafkamanager}.${PUBLIC_HOSTNAME}`)

        traefik.http.services.cmak.loadbalancer.server.port: ${HTTP_PORT}

        traefik.http.services.cmak.loadbalancer.healthcheck.path: ${TRAEFIK_HEALTHCHECK_PATH:-/api/health}

        traefik.http.services.cmak.loadbalancer.healthcheck.interval: ${TRAEFIK_HEALTHCHECK_INTERVAL:-30s}

        traefik.http.services.cmak.loadbalancer.healthcheck.timeout: ${TRAEFIK_HEALTHCHECK_TIMEOUT:-10s}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'