Commit acac4a3d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Reorganiza paso de variables y revisa deploy 

Modifica el paso de variables al formato estándar (mayúsculas separadas
por '_'), y se asignan al valor que espera elasticsearch en el último
paso de despliegue.
Simplifica check de salud y omite mapeo de puerto al host de desarrollo.
parent cfa40378

.gitlab-ci.yml

+18 −18
Original line number Diff line number Diff line
@@ -110,12 +110,12 @@ deploy-es6-1-supporting-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:
@@ -134,12 +134,12 @@ deploy-es6-2-supporting-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:
@@ -158,12 +158,12 @@ deploy-es6-3-supporting-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:
@@ -182,12 +182,12 @@ deploy-es6-1-stable-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:
@@ -204,12 +204,12 @@ deploy-es6-2-stable-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:
@@ -226,12 +226,12 @@ deploy-es6-3-stable-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    cloud.aws.s3.access_key: ${PRO_AWS_ACCESS_KEY_ID}

    cloud.aws.s3.secret_key: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_CLOUD_AWS_S3_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY_ID}

    ES_CLOUD_AWS_S3_SECRET_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

  script:

    - >

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

      cloud.aws.s3.access_key=${cloud.aws.s3.access_key} cloud.aws.s3.secret_key=${cloud.aws.s3.secret_key}

      ES_CLOUD_AWS_S3_ACCESS_KEY=${ES_CLOUD_AWS_S3_ACCESS_KEY} ES_CLOUD_AWS_S3_SECRET_KEY=${ES_CLOUD_AWS_S3_SECRET_KEY}

  environment:

    name: pro

  only:

Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ ENV ES_PATH="${ES_PATH}" \ 
	node.ingest="true" \

	path.data="${ES_PATH}/data" \

	network.host="0.0.0.0" \

	bootstrap.memory_lock="true" \

	indices.query.bool.max_clause_count="30000"

	bootstrap.memory_lock="true"



RUN ulimit -n 65536 \

	${ES_PATH}/bin/elasticsearch-plugin install --batch repository-s3

deploy/.env

+1 −1
Original line number Diff line number Diff line 
ES_PATH=/usr/share/elasticsearch

ES_PATH_DATA=/usr/share/elasticsearch/data

PORT=9200

AWS_REGION=region

deploy/docker-compose.es6-1.dev.yml

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

  es6-1:

    environment:

      - cluster.name=es_dev

      - discovery.zen.minimum_master_nodes=1

    ports:

      - target: ${PORT}

        published: ${PORT}

        mode: host

      - cluster.name=${ES_CLUSTER_NAME:-es_dev}

      - discovery.zen.minimum_master_nodes=${ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES:-1}



volumes:

  es-vol:

    name: es6-1-vol
 
    name: "${VOLUME_NAME:-es6-1-vol}"

deploy/docker-compose.es6-1.prod.yml

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

  es6-1:

    environment:

      - cluster.name=es_pro

      - discovery.zen.minimum_master_nodes=2

      - discovery.zen.ping.unicast.hosts=['es6-2', 'es6-3']

      - cloud.aws.s3.access_key

      - cloud.aws.s3.secret_key

      - cluster.name=${ES_CLUSTER_NAME:-es_pro}

      - discovery.zen.minimum_master_nodes=${ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES:-2}

      - discovery.zen.ping.unicast.hosts=${ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS:-['es6-2', 'es6-3']}

      - cloud.aws.s3.access_key=${ES_CLOUD_AWS_S3_ACCESS_KEY}

      - cloud.aws.s3.secret_key=${ES_CLOUD_AWS_S3_SECRET_KEY}

    deploy:

      placement:

        constraints:
@@ -16,7 +16,7 @@ services: 


volumes:

  es-vol:

    name: "es6-1-vol"

    name: "${VOLUME_NAME:-es6-1-vol}"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable