Commit 778e83db authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Migra a nueva imagen y adapta despliegue 

La imagen usada ha quedado obsoleta, ya no provee nuevas versiones de
kafka-manager. Además, el proyecto original ha cambiado de nombre,
pasando a llamarse CMAK. Se mantiene el nombre de este proyecto por
compatibilidad.

Incluye auth en el propio servicio, ya que ahora lo soporta.
Asigna secreto para la aplicación.
Define nuevo volumen para configuración.
Refina chequeo de salud, hacia ruta dedicada.
Permite redefinir el puerto usado por defecto.
parent 7d8296e5

.dockerignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
*

.gitlab-ci.yml

+3 −6
Original line number Diff line number Diff line
@@ -6,12 +6,9 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: confluent



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: confluent

    DD_TRAEFIK_SUBDOMAIN: kafkamanager

  environment:

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

deploy/.env

+10 −2
Original line number Diff line number Diff line 
ZK_PORT=2181

KM_PORT=9000
 
HTTP_PORT=9000

ZK_HOSTS=zk-1:2181,zk-2:2181,zk-3:2181

APPLICATION_SECRET=changeme

KAFKA_MANAGER_AUTH_ENABLED=true

KAFKA_MANAGER_USERNAME=redmic

KAFKA_MANAGER_PASSWORD=changeme



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

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

deploy/docker-compose.tmpl.yml

+25 −9
Original line number Diff line number Diff line 
version: '3.5'



services:

  kafka-manager:

    image: ${IMAGE_NAME:-giabar/gb-kafkamanager}:${IMAGE_TAG:-latest}

  cmak:

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

    command:

      - -Dhttp.port=${HTTP_PORT}

      - -Djava.net.preferIPv4Stack=true

    environment:

      ZK_HOSTS: zk-1:${ZK_PORT},zk-2:${ZK_PORT},zk-3:${ZK_PORT}

      KM_ARGS: -Djava.net.preferIPv4Stack=true

      ZK_HOSTS:

      APPLICATION_SECRET:

      KAFKA_MANAGER_AUTH_ENABLED:

      KAFKA_MANAGER_USERNAME:

      KAFKA_MANAGER_PASSWORD:

    networks:

      kafka-net:

      traefik-net:

    volumes:

      - conf-vol:/cmak/conf

    healthcheck:

      test: wget --spider -S -t 1 http://localhost:${KM_PORT}

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

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-10s}

      retries: ${HEALTHCHECK_RETRIES:-3}
@@ -19,10 +27,9 @@ services: 
      mode: replicated

      replicas: ${REPLICAS:-1}

      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

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

        traefik.backend: kafka-manager

        traefik.port: '${KM_PORT}'

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

        traefik.backend: cmak

        traefik.port: '${HTTP_PORT}'

      restart_policy:

        delay: ${RESTART_DELAY:-30s}

      update_config:
@@ -45,3 +52,12 @@ networks: 
    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true



volumes:

  conf-vol:

    name: ${CONF_VOL_NAME:-cmak-conf-vol}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

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

      device: :/cmak-conf-vol/