Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Update helm charts, Readme bash scripts (#22)
Browse files Browse the repository at this point in the history
- Refactor the helm charts to only have one shared chart, updating this chart to be resilient to handle all APIs
- Update the deploy readme to be accurate and more condensed
- Fix the APIs to actually use the mongo_conn and expose_port ENV variables
- Add .dockerignore file to speed up local docker builds where node_modules is present from the mongodb npm package
- Fix the web client to have the proper internal API addresses for the k8s cluster
  • Loading branch information
dtzar authored Dec 6, 2018
1 parent 8a4961a commit 5fd4753
Show file tree
Hide file tree
Showing 152 changed files with 179 additions and 13,660 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@ bin/
EventLogs/
obj/
*.sln
restore.dg
restore.dg

# Node.JS code
node_modules
package-lock.json
4 changes: 2 additions & 2 deletions CatalogSrvc/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Server and management port config
server.port=50001
server.port=${expose_port}
#management.port: 8081
spring.application.name=catalog-catalogservice

# Default MongoDB configuration parameters
#spring.data.mongodb.repositories.enabled=true
spring.data.mongodb.uri=mongodb://localhost:27017/ordering
spring.data.mongodb.uri=${mongo_conn}

#Control if spring banner should be displayed
spring.main.banner-mode=off
Expand Down
4 changes: 2 additions & 2 deletions DealerService/Controllers/DealerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public DealerController(ILogger<DealerController> log,IConfiguration iconfigurat
_log = log;
log.LogInformation("--------------------------------------------------");
log.LogInformation("---debug----Creating instance Dealer");
log.LogInformation(Environment.GetEnvironmentVariable("mongo_connection"));
log.LogInformation(Environment.GetEnvironmentVariable("mongo_conn"));
log.LogInformation(Environment.GetEnvironmentVariable("mongo_database"));
log.LogInformation("--------------------------------------------------");
objds = new MongoDealersRepository(Environment.GetEnvironmentVariable("mongo_connection"));
objds = new MongoDealersRepository(Environment.GetEnvironmentVariable("mongo_conn"));
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions OrderSrvc/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#Server and management port config
server.port:50003
server.port:${expose_port}
#management.port: 8081
spring.application.name=order-orderservice

# Default MongoDB configuration parameters
spring.data.mongodb.uri=mongodb://localhost:27017/ordering
spring.data.mongodb.uri=${mongo_conn}

#Control if spring banner should be displayed
spring.main.banner-mode=off

#exposing SBA to prometheus
management.security.enabled=false

#zinpin configurations
#zipkin configurations
zipkin.mrpservice.uri=http://zipkin-zipkin:9411/api/v1/spans

#Hystrix command properties
Expand Down
5 changes: 2 additions & 3 deletions QuoteSrvc/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#Server and management port config
server.port=50002
server.port=${expose_port}
spring.application.name=quote-quoteservice

# Default MongoDB configuration parameters
spring.data.mongodb.uri=mongodb://localhost:27017/ordering

spring.data.mongodb.uri=${mongo_conn}

#Control if spring banner should be displayed
spring.main.banner-mode=off
Expand Down
2 changes: 1 addition & 1 deletion RestAPIGateway/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ zuul.routes.shipment-service.path=/api/shipments/**
zuul.routes.shipment-service.url=http://shipment-shipmentservice/api/shipments/

ribbon.eureka.enabled=false
server.port=9020
server.port=${expose_port}
4 changes: 2 additions & 2 deletions ShipmentSrvc/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Server and management port config
server.port=50004
server.port=${expose_port}
#management.port: 8081

spring.application.name=shipment-shipmentservice
# Default MongoDB configuration parameters
#spring.data.mongodb.repositories.enabled=true
spring.data.mongodb.uri=mongodb://localhost:27017/ordering
spring.data.mongodb.uri=${mongo_conn}

#Control if spring banner should be displayed
spring.main.banner-mode=off
Expand Down
12 changes: 6 additions & 6 deletions Web/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server.port=8080
server.port=${expose_port}

spring.application.name=mrp_client

Expand All @@ -20,11 +20,11 @@ logging.file=${catalina.home}/logs/mrp_client.log
#logging.file=/logs/mrp_client.log

#Micro-Services Endpoint details
service.catalog.uri=http://api-partsunlimitedmrp:9020/api/catalog
service.quote.uri=http://api-partsunlimitedmrp:9020/api/quotes
service.order.uri=http://api-partsunlimitedmrp:9020/api/orders
service.dealer.uri=http://api-partsunlimitedmrp:9020/api/dealers
service.shipment.uri=http://api-partsunlimitedmrp:9020/api/shipments
service.catalog.uri=http://pumrp-catalog-svc/api/catalog
service.quote.uri=http://pumrp-quote-svc/api/quotes
service.order.uri=http://pumrp-order-svc/api/orders
service.dealer.uri=http://pumrp-dealer-svc/api/Dealer
service.shipment.uri=http://pumrp-shipment-svc/api/shipments


#Hystrix command properties
Expand Down
Loading

0 comments on commit 5fd4753

Please sign in to comment.