Commit 123b0113 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige paso de credenciales para UIs

See merge request redmic-project/confluent/confluent-platform!20
parents 466c6ad8 047274fe

.gitlab-ci.yml

+8 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ deploy-kafka-manager-dev: 
    SERVICES_TO_CHECK: confluent_kafka-manager

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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -313,6 +314,7 @@ deploy-kafka-manager-pro: 
    SERVICES_TO_CHECK: confluent_kafka-manager

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

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -333,6 +335,7 @@ deploy-kafka-topics-ui-dev: 
    SERVICES_TO_CHECK: confluent_kafka-topics-ui

    COMPOSE_FILE: docker-compose.kafka-topics-ui.tmpl.yml:docker-compose.kafka-topics-ui.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -355,6 +358,7 @@ deploy-kafka-topics-ui-pro: 
    SERVICES_TO_CHECK: confluent_kafka-topics-ui

    COMPOSE_FILE: docker-compose.kafka-topics-ui.tmpl.yml:docker-compose.kafka-topics-ui.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -375,6 +379,7 @@ deploy-kafka-connect-ui-dev: 
    SERVICES_TO_CHECK: confluent_kafka-connect-ui

    COMPOSE_FILE: docker-compose.kafka-connect-ui.tmpl.yml:docker-compose.kafka-connect-ui.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -397,6 +402,7 @@ deploy-kafka-connect-ui-pro: 
    SERVICES_TO_CHECK: confluent_kafka-connect-ui

    COMPOSE_FILE: docker-compose.kafka-connect-ui.tmpl.yml:docker-compose.kafka-connect-ui.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -417,6 +423,7 @@ deploy-schema-registry-ui-dev: 
    SERVICES_TO_CHECK: confluent_schema-registry-ui

    COMPOSE_FILE: docker-compose.schema-registry-ui.tmpl.yml:docker-compose.schema-registry-ui.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -439,6 +446,7 @@ deploy-schema-registry-ui-pro: 
    SERVICES_TO_CHECK: confluent_schema-registry-ui

    COMPOSE_FILE: docker-compose.schema-registry-ui.tmpl.yml:docker-compose.schema-registry-ui.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${UI_AUTH}

  script:

    - >

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

workers/docker-compose.connect.dev.yml

+4 −0
Original line number Diff line number Diff line
@@ -20,3 +20,7 @@ services: 
          memory: 1G

        reservations:

          memory: 820M



volumes:

  secrets-vol:

    name: connect-secrets-vol

workers/docker-compose.connect.prod.yml

+4 −0
Original line number Diff line number Diff line
@@ -19,3 +19,7 @@ services: 
          memory: 1G

        reservations:

          memory: 820M



volumes:

  secrets-vol:

    name: connect-secrets-vol

workers/docker-compose.connect.tmpl.yml

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ services: 
        aliases:

          - connect

      postgres-net:

    volumes:

      - secrets-vol:/etc/kafka/secrets

    healthcheck:

      test: curl -X GET http://localhost:${CN_PORT}/connectors

      interval: 30s