Commit 97e12731 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Omite espera de convergencia al reescalar connect

See merge request redmic-project/confluent/kafka-connector-loader!3
parents c1ec5969 d3e30fc4

.dockerignore

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

!script

.gitlab-ci.yml

+16 −4
Original line number Diff line number Diff line
@@ -78,8 +78,11 @@ deploy-supporting-branch-develop: 
  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

    CONNECT_SERVICE_NAME: ${DEV_CONNECT_SERVICE_NAME}

  script:

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

    - >

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

      CONNECT_SERVICE_NAME=${CONNECT_SERVICE_NAME}

  environment:

    name: dev

  only:
@@ -94,8 +97,11 @@ deploy-stable-branch-develop: 
  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

    CONNECT_SERVICE_NAME: ${DEV_CONNECT_SERVICE_NAME}

  script:

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

    - >

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

      CONNECT_SERVICE_NAME=${CONNECT_SERVICE_NAME}

  environment:

    name: dev

  only:
@@ -108,8 +114,11 @@ deploy-supporting-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

    CONNECT_SERVICE_NAME: ${PRO_CONNECT_SERVICE_NAME}

  script:

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

    - >

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

      CONNECT_SERVICE_NAME=${CONNECT_SERVICE_NAME}

  environment:

    name: pro

  only:
@@ -124,8 +133,11 @@ deploy-stable-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

    CONNECT_SERVICE_NAME: ${PRO_CONNECT_SERVICE_NAME}

  script:

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

    - >

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

      CONNECT_SERVICE_NAME=${CONNECT_SERVICE_NAME}

  environment:

    name: pro

  only:

Dockerfile

+5 −1
Original line number Diff line number Diff line
@@ -2,8 +2,12 @@ ARG KAFKA_CONNECT_ELASTICSEARCH_TAG=feature-redmicSupport-latest 


FROM registry.gitlab.com/redmic-project/confluent/kafka-connect-elasticsearch:${KAFKA_CONNECT_ELASTICSEARCH_TAG} AS kce



FROM alpine:3.8

FROM docker:18.09



LABEL maintainer="info@redmic.es"



COPY --from=kce /jar/ /jar



COPY script /



ENTRYPOINT ["/entrypoint.sh"]

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ ELASTICSEARCH_URL=http://elasticsearch:9200 
ELASTICSEARCH_USERNAME=user

ELASTICSEARCH_PASSWORD=pass

PORT=5601

CONNECT_SERVICE_NAME=confluent_connect

deploy/docker-compose.tmpl.yml

+3 −1
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ version: '3.5' 
services:

  kafka-connector-loader:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    command: sh -c "cp -a /jar/. /connect-jars && echo 'Connectors jars copied to Connect volume successfully'"

    environment:

      - CONNECT_SERVICE_NAME

    networks:

      - kafka-net

    volumes:

      - connect-jars-vol:/connect-jars

      - /var/run/docker.sock:/var/run/docker.sock

    deploy:

      mode: replicated

      replicas: 1