update context path

This commit is contained in:
Erik Pique 2018-11-29 13:12:06 +01:00
parent 6183b25c72
commit 81a28300eb
22 changed files with 74 additions and 330 deletions

View File

@ -6,9 +6,9 @@ Param(
[parameter(Mandatory=$false)][string]$appName="eshop", [parameter(Mandatory=$false)][string]$appName="eshop",
[parameter(Mandatory=$false)][bool]$deployInfrastructure=$true, [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
[parameter(Mandatory=$false)][bool]$clean=$true, [parameter(Mandatory=$false)][bool]$clean=$true,
[parameter(Mandatory=$false)][string]$aksName="", [parameter(Mandatory=$false)][string]$aksName="eshop-test-aks",
[parameter(Mandatory=$false)][string]$aksRg="", [parameter(Mandatory=$false)][string]$aksRg="eshop-test",
[parameter(Mandatory=$false)][string]$imageTag="latest" [parameter(Mandatory=$false)][string]$imageTag="dev"
) )
$dns = $externalDns $dns = $externalDns

View File

@ -1,13 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
install: install:
chart: charts/aggregator chart: charts/aggregator
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ../../../../k8s/helm/app.yaml?
- ../../../../k8s/helm/inf.yaml?
set: set:
image: image:
tag: $(tag) tag: $(tag)

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
install: install:
chart: ../../../../k8s/helm/apigwws chart: ../../../../k8s/helm/apigwws
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -7,29 +7,29 @@
"sslPort": 0 "sslPort": 0
} }
}, },
"profiles": { "profiles": {
"IIS Express": { "IIS Express": {
"commandName": "IISExpress", "commandName": "IISExpress",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "swagger", "launchUrl": "swagger",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }
}, },
"Microsoft.eShopOnContainers.Services.Basket.API": { "Microsoft.eShopOnContainers.Services.Basket.API": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "http://localhost:55103/", "launchUrl": "http://localhost:55103/",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }
}, },
"Azure Dev Spaces": { "Azure Dev Spaces": {
"commandName": "AzureDevSpaces", "commandName": "AzureDevSpaces",
"launchBrowser": true, "launchBrowser": true,
"resourceGroup": "shopErikRG", "resourceGroup": "eshop-test",
"aksName": "shopErik", "aksName": "eshop-test-aks",
"subscriptionId": "c9138ae8-a61d-4ac9-82ab-d827f6182575" "subscriptionId": "6c22bb55-0221-4ce4-9bf1-3c4a10a7294c"
}
} }
}
} }

View File

@ -1,43 +0,0 @@
# This heml values file defines app-based settings
# Charts use those values, so this file **MUST** be included in all chart releases
app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
identity: identity # ingress entry for identity api
mvc: webmvc # ingress entry for web mvc
spa: "" # ingress entry for web spa
status: webstatus # ingress entry for web status
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
webmarketingapigw: webmarketingapigw # ingress entry for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # ingress entry for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
payment: payment-api # ingress entry for payment api
locations: locations-api # ingress entry for locations api
marketing: marketing-api # ingress entry for marketing api
svc:
basket: basket # service name for basket api
catalog: catalog # service name for catalog api
ordering: ordering # service name for ordering api
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
identity: identity # service name for identity api
mvc: webmvc # service name for web mvc
spa: webspa # service name for web spa
status: webstatus # service name for web status
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
webshoppingagg: webshoppingagg # service name for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
payment: payment # service name for payment api
locations: locations # service name for locations api
marketing: marketing # service name for marketing ap

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Basket/Basket.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/basket-api chart: ../../../../k8s/helm/basket-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- inf.yaml - ../../../../k8s/helm/inf.yaml
- app.yaml - ../../../../k8s/helm/app.yaml
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,18 +0,0 @@
# This heml values file defines all infrastructure used by eShopOnContainers.
# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
inf:
redis: # inf.redis defines the redis' connection strings
basket:
svc: basket-data # Name of k8s svc for basket redis
constr: basket-data # Connection string to Redis used by Basket API
eventbus:
svc: rabbitmq # Name of k8s svc for rabbitmq
constr: rabbitmq # Event bus connection string
useAzure: false # true if use Azure Service Bus. False if RabbitMQ
appinsights:
key: "" # App insights to use
k8s: {}
misc: # inf.misc contains miscellaneous configuration related to infrastructure
useLoadTest: false # If running under loading test or not
useAzureStorage: false # If catalog api uses azure storage or not

View File

@ -27,9 +27,9 @@
"Azure Dev Spaces": { "Azure Dev Spaces": {
"commandName": "AzureDevSpaces", "commandName": "AzureDevSpaces",
"launchBrowser": true, "launchBrowser": true,
"resourceGroup": "edu-devspaces3", "resourceGroup": "eshop-test",
"aksName": "edu-devspaces3", "aksName": "eshop-test-aks",
"subscriptionId": "e3035ac1-c06c-4daf-8939-57b3c5f1f759" "subscriptionId": "6c22bb55-0221-4ce4-9bf1-3c4a10a7294c"
} }
} }
} }

View File

@ -1,39 +0,0 @@
app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
identity: identity # ingress entry for identity api
mvc: webmvc # ingress entry for web mvc
spa: "" # ingress entry for web spa
status: webstatus # ingress entry for web status
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
webmarketingapigw: webmarketingapigw # ingress entry for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # ingress entry for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
payment: payment-api # ingress entry for payment api
locations: locations-api # ingress entry for locations api
marketing: marketing-api # ingress entry for marketing api
svc:
basket: basket # service name for basket api
catalog: catalog # service name for catalog api
ordering: ordering # service name for ordering api
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
identity: identity # service name for identity api
mvc: webmvc # service name for web mvc
spa: webspa # service name for web spa
status: webstatus # service name for web status
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
webshoppingagg: webshoppingagg # service name for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
payment: payment # service name for payment api
locations: locations # service name for locations api
marketing: marketing # service name for marketing api

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/catalog-api chart: ../../../../k8s/helm/catalog-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- inf.yaml - ../../../../k8s/helm/inf.yaml
- app.yaml - ../../../../k8s/helm/app.yaml
set: set:
image: image:
tag: $(tag) tag: $(tag)

View File

@ -1,25 +0,0 @@
# This heml values file defines all infrastructure used by eShopOnContainers.
# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
inf:
sql: # inf.sql defines the sql server databases & logins
# host: my-sql-server # Uncomment to specify a custom sql-server to be used. By default "sql-data-<appname>" will be used
common:
user: sa # SQL user
pwd: Pass@word # SQL pwd
pid: Developer
catalog: # inf.sql.catalog: settings for the catalog-api sql (user, pwd, db)
db: CatalogDb # Catalog API SQL db name
keystore:
svc: keystore-data # Name of k8s svc for keystore-data redis
constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
eventbus:
svc: rabbitmq # Name of k8s svc for rabbitmq
constr: rabbitmq # Event bus connection string
useAzure: false # true if use Azure Service Bus. False if RabbitMQ
appinsights:
key: "" # App insights to use
k8s: {}
misc: # inf.misc contains miscellaneous configuration related to infrastructure
useLoadTest: false # If running under loading test or not
useAzureStorage: false # If catalog api uses azure storage or not

View File

@ -1,39 +0,0 @@
app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
identity: identity # ingress entry for identity api
mvc: webmvc # ingress entry for web mvc
spa: "" # ingress entry for web spa
status: webstatus # ingress entry for web status
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
webmarketingapigw: webmarketingapigw # ingress entry for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # ingress entry for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
payment: payment-api # ingress entry for payment api
locations: locations-api # ingress entry for locations api
marketing: marketing-api # ingress entry for marketing api
svc:
basket: basket # service name for basket api
catalog: catalog # service name for catalog api
ordering: ordering # service name for ordering api
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
identity: identity # service name for identity api
mvc: webmvc # service name for web mvc
spa: webspa # service name for web spa
status: webstatus # service name for web status
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
webshoppingagg: webshoppingagg # service name for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
payment: payment # service name for payment api
locations: locations # service name for locations api
marketing: marketing # service name for marketing api

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Identity/Identity.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/identity-api chart: ../../../../k8s/helm/identity-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- inf.yaml - ../../../../k8s/helm/inf.yaml
- app.yaml - ../../../../k8s/helm/app.yaml
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,29 +0,0 @@
# This heml values file defines all infrastructure used by eShopOnContainers.
# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
inf:
sql: # inf.sql defines the sql server databases & logins
# host: my-sql-server # Uncomment to specify a custom sql-server to be used. By default "sql-data-<appname>" will be used
common:
user: sa # SQL user
pwd: Pass@word # SQL pwd
pid: Developer
identity:
db: IdentityDb # Ordering API SQL db name
keystore:
svc: keystore-data # Name of k8s svc for keystore-data redis
constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
redis: # inf.redis defines the redis' connection strings
keystore:
svc: keystore-data # Name of k8s svc for keystore-data redis
constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
eventbus:
svc: rabbitmq # Name of k8s svc for rabbitmq
constr: rabbitmq # Event bus connection string
useAzure: false # true if use Azure Service Bus. False if RabbitMQ
appinsights:
key: "" # App insights to use
k8s: {}
misc: # inf.misc contains miscellaneous configuration related to infrastructure
useLoadTest: false # If running under loading test or not
useAzureStorage: false # If catalog api uses azure storage or not

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Location/Locations.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/locations-api chart: ../../../../k8s/helm/locations-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/marketing-api chart: ../../../../k8s/helm/marketing-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,43 +0,0 @@
# This heml values file defines app-based settings
# Charts use those values, so this file **MUST** be included in all chart releases
app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
identity: identity # ingress entry for identity api
mvc: webmvc # ingress entry for web mvc
spa: "" # ingress entry for web spa
status: webstatus # ingress entry for web status
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
webmarketingapigw: webmarketingapigw # ingress entry for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # ingress entry for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
payment: payment-api # ingress entry for payment api
locations: locations-api # ingress entry for locations api
marketing: marketing-api # ingress entry for marketing api
svc:
basket: basket # service name for basket api
catalog: catalog # service name for catalog api
ordering: ordering # service name for ordering api
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
identity: identity # service name for identity api
mvc: webmvc # service name for web mvc
spa: webspa # service name for web spa
status: webstatus # service name for web status
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
webshoppingagg: webshoppingagg # service name for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
payment: payment # service name for payment api
locations: locations # service name for locations api
marketing: marketing # service name for marketing ap

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/ordering-api chart: ../../../../k8s/helm/ordering-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- inf.yaml - ../../../../k8s/helm/inf.yaml
- app.yaml - ../../../../k8s/helm/app.yaml
set: set:
replicaCount: 1 replicaCount: 1

View File

@ -1,22 +0,0 @@
# This heml values file defines all infrastructure used by eShopOnContainers.
# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
inf:
sql: # inf.sql defines the sql server databases & logins
# host: my-sql-server # Uncomment to specify a custom sql-server to be used. By default "sql-data-<appname>" will be used
common:
user: sa # SQL user
pwd: Pass@word # SQL pwd
pid: Developer
ordering: # inf.sql.ordering: settings for the ordering-api sql (user, pwd, db)
db: OrderingDb # Ordering API SQL db name
eventbus:
svc: rabbitmq # Name of k8s svc for rabbitmq
constr: rabbitmq # Event bus connection string
useAzure: false # true if use Azure Service Bus. False if RabbitMQ
appinsights:
key: "" # App insights to use
k8s: {}
misc: # inf.misc contains miscellaneous configuration related to infrastructure
useLoadTest: false # If running under loading test or not
useAzureStorage: false # If catalog api uses azure storage or not

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
install: install:
chart: ../../../../k8s/helm/ordering-backgroundtasks chart: ../../../../k8s/helm/ordering-backgroundtasks
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
install: install:
chart: ../../../../k8s/helm/ordering-signalrhub chart: ../../../../k8s/helm/ordering-signalrhub
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image:

View File

@ -1,15 +1,15 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.0
build: build:
context: ..\..\..\.. context: ../../../../
dockerfile: Dockerfile dockerfile: src/Services/Payment/Payment.API/Dockerfile
install: install:
chart: ../../../../k8s/helm/payment-api chart: ../../../../k8s/helm/payment-api
values: values:
- values.dev.yaml? - values.dev.yaml?
- secrets.dev.yaml? - secrets.dev.yaml?
- ..\..\..\..\k8s\helm\app.yaml? - ../../../../k8s/helm/app.yaml?
- ..\..\..\..\k8s\helm\inf.yaml? - ../../../../k8s/helm/inf.yaml?
set: set:
replicaCount: 1 replicaCount: 1
image: image: