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

Omite seguridad en prod e instala plugin para S3 

Es necesario deshabilitar la seguridad en producción para poder hacer
snapshots. En este entorno no se expone el servicio al exterior, por lo
que no debería haber inconveniente. Se mantiene la seguridad en el
entorno de desarrollo porque sí expone el servicio.

Corrige paso de variable con los plugins a instalar.
parent 2e611122

.gitlab-ci.yml

+5 −36
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ services: 


variables:

  DOCKER_DRIVER: overlay2

  AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY}

  AWS_SECRET_ACCESS_KEY: ${S3_SECRET_KEY}

  ES_PLUGINS: repository-s3



docker-build-commit-non-master-branches:

  stage: package
@@ -71,36 +74,9 @@ container-scanning: 
  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: elastic

    SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}-1

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-1.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-1.dev.yml

    OLD_ELASTIC_ADMIN_PASS: ${DEV_OLD_ELASTIC_ADMIN_PASS}

    ELASTIC_ADMIN_PASS: ${DEV_ELASTIC_ADMIN_PASS}

    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_USER_PASS: ${DEV_ELASTIC_USER_PASS}

    ELASTIC_USER_ROLE: ${DEV_ELASTIC_USER_ROLE}

  script:

    - create-nets.sh elastic-net

    - >

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

      OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS} ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}

  environment:

    name: dev

  only:

    - dev

  when: manual



deploy-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: elastic
@@ -113,9 +89,6 @@ deploy-supporting-branch: 
    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_USER_PASS: ${DEV_ELASTIC_USER_PASS}

    ELASTIC_USER_ROLE: ${DEV_ELASTIC_USER_ROLE}

    AWS_ACCESS_KEY_ID: ${DEV_AWS_ACCESS_KEY_ID}

    AWS_SECRET_ACCESS_KEY: ${DEV_AWS_SECRET_ACCESS_KEY}

    ES_PLUGINS: ${DEV_ES_PLUGINS}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -129,12 +102,11 @@ deploy-supporting-branch: 
    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: elastic
@@ -145,9 +117,6 @@ deploy-pro: 
    ELASTIC_USER: ${PRO_ELASTIC_USER}

    ELASTIC_USER_PASS: ${PRO_ELASTIC_USER_PASS}

    ELASTIC_USER_ROLE: ${PRO_ELASTIC_USER_ROLE}

    AWS_ACCESS_KEY_ID: ${PRO_AWS_ACCESS_KEY_ID}

    AWS_SECRET_ACCESS_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}

    ES_PLUGINS: ${PRO_ES_PLUGINS}

  script:

    - create-nets.sh elastic-net

    - >

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ PORT2=9300 
ELASTIC_USER=user

ELASTIC_USER_PASS=pass

ES_PLUGINS=repository-s3

ES_XPACK_SECURITY_ENABLED=false

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ services: 
      - ES_NODE_NAME=node-1

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=elasticsearch-1

      - ES_XPACK_SECURITY_ENABLED=false

    ports:

      - target: ${PORT1}

        published: ${PORT1}

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

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ services: 
      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['elasticsearch-1', 'elasticsearch-2', 'elasticsearch-3']

      - USER_MANAGEMENT_DELAY=200

      - ES_XPACK_SECURITY_ENABLED

    healthcheck:

      test: curl --silent localhost:${PORT}/_cluster/health

      timeout: 10s

      retries: 3

      start_period: 2m

    deploy:

      placement:

        constraints:

deploy/docker-compose.elasticsearch-1.tmpl.yml

+0 −7
Original line number Diff line number Diff line
@@ -32,13 +32,6 @@ services: 
          memory: 1G

        reservations:

          memory: 820M

    #healthcheck:

      #test: >

        #status=$$(curl --write-out %{http_code} --silent --output /dev/null -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" localhost:${PORT1}/_cluster/health);

        #[ "$${status}" -eq "200" ] || [ "$${status}" -eq "401" ]

      #timeout: 10s

      #retries: 3

      #start_period: 2m



networks:

  elastic-net: