Commit ee90d96c authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia ksql-client por UI 

De esta manera, se puede utilizar la interfaz de usuario para realizar
consultas y desplegar el docker del ksql-cli solo cuando sea necesario,
sin necesidad de crear un servicio para ello
parent 9d0a476c

.gitlab-ci.yml

+36 −20
Original line number Diff line number Diff line
@@ -74,66 +74,82 @@ deploy-ksql-server-stable-branch-production: 
    - master

  when: manual



deploy-ksql-client-supporting-branch-develop:

deploy-ksql-ui-supporting-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: confluent_ksql-client

    SERVICES_TO_CHECK: confluent_ksql-ui

    IMAGE_TAG: ${DEV_CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.ksql-client.tmpl.yml:docker-compose.ksql-client.dev.yml

    COMPOSE_FILE: docker-compose.ksql-ui.tmpl.yml:docker-compose.ksql-ui.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/ksql-client

    name: dev/ksql-ui

  only:

    - branches

  except:

    - master

  when: manual



deploy-ksql-client-stable-branch-develop:

deploy-ksql-ui-stable-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: confluent_ksql-client

    SERVICES_TO_CHECK: confluent_ksql-ui

    IMAGE_TAG: ${DEV_CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.ksql-client.tmpl.yml:docker-compose.ksql-client.dev.yml

    COMPOSE_FILE: docker-compose.ksql-ui.tmpl.yml:docker-compose.ksql-ui.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

     - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/ksql-client

    name: dev/ksql-ui

  only:

    - master

  when: manual



deploy-ksql-client-supporting-branch-production:

deploy-ksql-ui-supporting-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: confluent_ksql-client

    SERVICES_TO_CHECK: confluent_ksql-ui

    IMAGE_TAG: ${PRO_CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.ksql-client.tmpl.yml:docker-compose.ksql-client.prod.yml

    COMPOSE_FILE: docker-compose.ksql-ui.tmpl.yml:docker-compose.ksql-ui.prod.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

     - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/ksql-client

    name: pro/ksql-ui

  only:

    - branches

  except:

    - master

  when: manual



deploy-ksql-client-stable-branch-production:

deploy-ksql-ui-stable-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: confluent_ksql-client

    SERVICES_TO_CHECK: confluent_ksql-ui

    IMAGE_TAG: ${PRO_CONFLUENT_VERSION}

    COMPOSE_FILE: docker-compose.ksql-client.tmpl.yml:docker-compose.ksql-client.prod.yml

    COMPOSE_FILE: docker-compose.ksql-ui.tmpl.yml:docker-compose.ksql-ui.prod.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

     - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/ksql-client

    name: pro/ksql-ui

  only:

    - master

  when: manual

deploy/docker-compose.ksql-client.prod.yml→deploy/docker-compose.ksql-ui.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'



services:

  ksql-client:

  ksql-ui:

    deploy:

      placement:

        constraints:

deploy/docker-compose.ksql-client.tmpl.yml→deploy/docker-compose.ksql-ui.tmpl.yml

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



services:

  ksql-client:

    image: confluentinc/cp-ksql-cli:${IMAGE_TAG:-latest}

  ksql-ui:

    image: ${IMAGE_NAME:-matsumana/tsujun}:${IMAGE_TAG:-latest}

    environment:

      KSQL_KSQL_SERVICE_ID: ksql-client

      KSQL_BOOTSTRAP_SERVERS: kf-1:${KF_PORT},kf-2:${KF_PORT},kf-3:${KF_PORT}

      KSQL_LISTENERS: http://0.0.0.0:${KSQL_PORT}

      KSQL_SERVER: http://ksql-server:${KSQL_PORT}

    networks:

      - kafka-net

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1

      labels:

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

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

        traefik.backend: ksql-ui

        traefik.port: "${KSQL_UI_PORT:-8080}"

      restart_policy:

        delay: 30s

        window: 2m
@@ -26,3 +30,7 @@ networks: 
  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true