From 168db305dc090ef64ed80e350786c8b9614842e7 Mon Sep 17 00:00:00 2001 From: "Michael W. Estrin" Date: Tue, 10 Dec 2019 09:51:59 -0600 Subject: [PATCH] Remove Export Services for Geneva Release Related to: https://github.com/edgexfoundry/edgex-go/issues/2218 Signed-off-by: Michael W. Estrin --- .gitignore | 2 - MODULES | 2 +- README.md | 4 +- clean_mongo.js | 2 - create-containers.sh | 4 +- init_mongo.js | 10 ----- project-metrics/fetch_repos.sh | 4 -- .../docker-compose-nexus-no-secty.yml | 42 ------------------ .../docker-compose-nexus-redis-no-secty.yml | 42 ------------------ .../compose-files/docker-compose-nexus.yml | 44 ------------------- run-it.sh | 4 -- 11 files changed, 5 insertions(+), 155 deletions(-) diff --git a/.gitignore b/.gitignore index c54001b..f16b18e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,8 +75,6 @@ docker-core-config-seed/ docker-core-consul/ docker-edgex-mongo/ docker-edgex-volume/ -export-client/ -export-distro/ export-domain/ export-test/ support-domain/ diff --git a/MODULES b/MODULES index bc02dbc..cb0da5f 100755 --- a/MODULES +++ b/MODULES @@ -16,5 +16,5 @@ # # Author: chencho -export MODULES=(core-data-client core-domain core-exception core-test export-distro export-domain export-test support-domain support-logging-client export-client support-notifications-client core-data core-metadata-client support-scheduler) +export MODULES=(core-data-client core-domain core-exception core-test export-domain export-test support-domain support-logging-client support-notifications-client core-data core-metadata-client support-scheduler) diff --git a/README.md b/README.md index 359b9b9..03d1cd2 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ This script will: **prepare-environment.sh**, this script will clone the set of modules you need. You can pass a list of valid modules. ->MODULES: core-data-client core-domain core-exception core-test export-distro ->export-domain export-test support-domain support-logging-client export-client +>MODULES: core-data-client core-domain core-exception core-test +>export-domain export-test support-domain support-logging-client >support-notifications-client core-data core-metadata-client **Note**, if you run the script without parameters, you can manually choose which modules you want to be installed. diff --git a/clean_mongo.js b/clean_mongo.js index 25c7012..3bb3034 100644 --- a/clean_mongo.js +++ b/clean_mongo.js @@ -46,5 +46,3 @@ db.auth('notifications','password'); db.notification.remove({}); db.subscription.remove({}); db.transmission.remove({}); -db=db.getSiblingDB('exportclient') -db.exportConfiguration.remove({}); diff --git a/create-containers.sh b/create-containers.sh index 8732486..016ad0a 100755 --- a/create-containers.sh +++ b/create-containers.sh @@ -19,8 +19,8 @@ set -e DOCKERS=( docker-edgex-volume docker-core-consul core-config-seed docker-edgex-mongo support-logging \ - support-notifications core-metadata core-data core-command support-scheduler export-client \ - export-distro support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp) + support-notifications core-metadata core-data core-command support-scheduler \ + support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp) DOCKERFILE=$1 diff --git a/init_mongo.js b/init_mongo.js index b87189e..7e8e0c5 100644 --- a/init_mongo.js +++ b/init_mongo.js @@ -32,7 +32,6 @@ db.serviceMapping.insert( { serviceName: "command", serviceUrl: "http://localhos db.serviceMapping.insert( { serviceName: "rules", serviceUrl: "http://localhost:48084/" }); db.serviceMapping.insert( { serviceName: "notifications", serviceUrl: "http://localhost:48060/" }); db.serviceMapping.insert( { serviceName: "logging", serviceUrl: "http://localhost:48061/" }); -db.serviceMapping.insert( { serviceName: "exportclient", serviceUrl: "http://localhost:48071/" }); db=db.getSiblingDB('admin') db.system.users.remove({}); @@ -126,12 +125,3 @@ db.createCollection("interval"); db.createCollection("intervalAction"); db.interval.createIndex({name: 1}, {unique: true}); db.intervalAction.createIndex({name: 1}, {unique: true}); - -db=db.getSiblingDB('exportclient') -db.createUser({ user: "exportclient", - pwd: "password", - roles: [ - { role: "readWrite", db: "exportclient" } - ] -}); -db.createCollection("exportConfiguration"); diff --git a/project-metrics/fetch_repos.sh b/project-metrics/fetch_repos.sh index 8f4f867..881e0df 100755 --- a/project-metrics/fetch_repos.sh +++ b/project-metrics/fetch_repos.sh @@ -23,14 +23,10 @@ docker-device-virtual docker-edgex-mongo docker-edgex-mongo-seed docker-edgex-volume -docker-export-client -docker-export-distro docker-support-logging docker-support-notifications docker-support-rulesengine docker-support-scheduler -export-client -export-distro export-domain export-test edgex-ui-go diff --git a/releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml b/releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml index 2ae2bb4..2d05710 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml @@ -227,48 +227,6 @@ services: depends_on: - app-service-rules - # export-client: - # image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master - # ports: - # - "48071:48071" - # container_name: edgex-export-client - # hostname: edgex-export-client - # networks: - # - edgex-network - # environment: - # <<: *common-variables - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # depends_on: - # - data - # - # export-distro: - # image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master - # ports: - # - "48070:48070" - # - "5566:5566" - # container_name: edgex-export-distro - # hostname: edgex-export-distro - # networks: - # - edgex-network - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # depends_on: - # - export-client - # environment: - # <<: *common-variables - # EXPORT_DISTRO_CLIENT_HOST: export-client - # EXPORT_DISTRO_DATA_HOST: edgex-core-data - # EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed - # EXPORT_DISTRO_MQTTS_CERT_FILE: none - # EXPORT_DISTRO_MQTTS_KEY_FILE: none - ################################################################# # Device Services ################################################################# diff --git a/releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml b/releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml index ea77e17..afec8dc 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml @@ -230,48 +230,6 @@ services: depends_on: - app-service-rules - # export-client: - # image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master - # ports: - # - "48071:48071" - # container_name: edgex-export-client - # hostname: edgex-export-client - # networks: - # - edgex-network - # environment: - # <<: *common-variables - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # depends_on: - # - data - # - # export-distro: - # image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master - # ports: - # - "48070:48070" - # - "5566:5566" - # container_name: edgex-export-distro - # hostname: edgex-export-distro - # networks: - # - edgex-network - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # depends_on: - # - export-client - # environment: - # <<: *common-variables - # EXPORT_DISTRO_CLIENT_HOST: export-client - # EXPORT_DISTRO_DATA_HOST: edgex-core-data - # EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed - # EXPORT_DISTRO_MQTTS_CERT_FILE: none - # EXPORT_DISTRO_MQTTS_KEY_FILE: none - ################################################################# # Device Services ################################################################# diff --git a/releases/nightly-build/compose-files/docker-compose-nexus.yml b/releases/nightly-build/compose-files/docker-compose-nexus.yml index 5cabec0..f1378bd 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus.yml @@ -405,50 +405,6 @@ services: depends_on: - app-service-rules - # export-client: - # image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master - # ports: - # - "48071:48071" - # container_name: edgex-export-client - # hostname: edgex-export-client - # networks: - # - edgex-network - # environment: - # <<: *common-variables - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # - vault-config:/vault/config - # - /tmp/edgex/secrets/ca/ca.pem:/tmp/edgex/secrets/ca/ca.pem:ro - # depends_on: - # - data - # - # export-distro: - # image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master - # ports: - # - "48070:48070" - # - "5566:5566" - # container_name: edgex-export-distro - # hostname: edgex-export-distro - # networks: - # - edgex-network - # volumes: - # - db-data:/data/db - # - log-data:/edgex/logs - # - consul-config:/consul/config - # - consul-data:/consul/data - # depends_on: - # - export-client - # environment: - # <<: *common-variables - # EXPORT_DISTRO_CLIENT_HOST: export-client - # EXPORT_DISTRO_DATA_HOST: edgex-core-data - # EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed - # EXPORT_DISTRO_MQTTS_CERT_FILE: none - # EXPORT_DISTRO_MQTTS_KEY_FILE: none - ################################################################# # Device Services ################################################################# diff --git a/run-it.sh b/run-it.sh index 3998d08..db790d0 100755 --- a/run-it.sh +++ b/run-it.sh @@ -68,10 +68,6 @@ run_service command 48082 run_service scheduler 48085 -run_service export-client 48071 - -run_service export-distro 48070 - run_service rulesengine 48075 run_service device-virtual 49990