diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml index dca11afbf..43b374808 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml @@ -1,13 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile install: chart: charts/aggregator values: - values.dev.yaml? - secrets.dev.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: image: tag: $(tag) diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/azds.yaml b/src/ApiGateways/Web.Bff.Shopping/aggregator/azds.yaml index 870c18fd5..02706e10a 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/azds.yaml +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile install: chart: ../../../../k8s/helm/apigwws values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: diff --git a/src/Services/Basket/Basket.API/app.yaml b/src/Services/Basket/Basket.API/app.yaml deleted file mode 100644 index 6ca5d9d31..000000000 --- a/src/Services/Basket/Basket.API/app.yaml +++ /dev/null @@ -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 diff --git a/src/Services/Basket/Basket.API/azds.yaml b/src/Services/Basket/Basket.API/azds.yaml index 597c79d8c..1cc5377f4 100644 --- a/src/Services/Basket/Basket.API/azds.yaml +++ b/src/Services/Basket/Basket.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Basket/Basket.API/Dockerfile install: chart: ../../../../k8s/helm/basket-api values: - values.dev.yaml? - secrets.dev.yaml? - - inf.yaml - - app.yaml + - ../../../../k8s/helm/inf.yaml + - ../../../../k8s/helm/app.yaml set: replicaCount: 1 image: diff --git a/src/Services/Basket/Basket.API/inf.yaml b/src/Services/Basket/Basket.API/inf.yaml deleted file mode 100644 index 3e3e143da..000000000 --- a/src/Services/Basket/Basket.API/inf.yaml +++ /dev/null @@ -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 diff --git a/src/Services/Catalog/Catalog.API/app.yaml b/src/Services/Catalog/Catalog.API/app.yaml deleted file mode 100644 index c6209da47..000000000 --- a/src/Services/Catalog/Catalog.API/app.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/azds.yaml b/src/Services/Catalog/Catalog.API/azds.yaml index 7ea0ae087..d0122bb93 100644 --- a/src/Services/Catalog/Catalog.API/azds.yaml +++ b/src/Services/Catalog/Catalog.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Catalog/Catalog.API/Dockerfile install: chart: ../../../../k8s/helm/catalog-api values: - values.dev.yaml? - secrets.dev.yaml? - - inf.yaml - - app.yaml + - ../../../../k8s/helm/inf.yaml + - ../../../../k8s/helm/app.yaml set: image: tag: $(tag) diff --git a/src/Services/Catalog/Catalog.API/inf.yaml b/src/Services/Catalog/Catalog.API/inf.yaml deleted file mode 100644 index 74a7762c4..000000000 --- a/src/Services/Catalog/Catalog.API/inf.yaml +++ /dev/null @@ -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-" 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 \ No newline at end of file diff --git a/src/Services/Identity/Identity.API/app.yaml b/src/Services/Identity/Identity.API/app.yaml deleted file mode 100644 index c6209da47..000000000 --- a/src/Services/Identity/Identity.API/app.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/src/Services/Identity/Identity.API/azds.yaml b/src/Services/Identity/Identity.API/azds.yaml index 7d1a00460..055e995a4 100644 --- a/src/Services/Identity/Identity.API/azds.yaml +++ b/src/Services/Identity/Identity.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Identity/Identity.API/Dockerfile install: chart: ../../../../k8s/helm/identity-api values: - values.dev.yaml? - secrets.dev.yaml? - - inf.yaml - - app.yaml + - ../../../../k8s/helm/inf.yaml + - ../../../../k8s/helm/app.yaml set: replicaCount: 1 image: diff --git a/src/Services/Identity/Identity.API/inf.yaml b/src/Services/Identity/Identity.API/inf.yaml deleted file mode 100644 index a4c4b08ef..000000000 --- a/src/Services/Identity/Identity.API/inf.yaml +++ /dev/null @@ -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-" 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 \ No newline at end of file diff --git a/src/Services/Location/Locations.API/azds.yaml b/src/Services/Location/Locations.API/azds.yaml index 7c1b3c790..86df01648 100644 --- a/src/Services/Location/Locations.API/azds.yaml +++ b/src/Services/Location/Locations.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Location/Locations.API/Dockerfile install: chart: ../../../../k8s/helm/locations-api values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: diff --git a/src/Services/Marketing/Marketing.API/azds.yaml b/src/Services/Marketing/Marketing.API/azds.yaml index 39381c499..8513719b5 100644 --- a/src/Services/Marketing/Marketing.API/azds.yaml +++ b/src/Services/Marketing/Marketing.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Marketing/Marketing.API/Dockerfile install: chart: ../../../../k8s/helm/marketing-api values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: diff --git a/src/Services/Ordering/Ordering.API/app.yaml b/src/Services/Ordering/Ordering.API/app.yaml deleted file mode 100644 index 6ca5d9d31..000000000 --- a/src/Services/Ordering/Ordering.API/app.yaml +++ /dev/null @@ -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 diff --git a/src/Services/Ordering/Ordering.API/azds.yaml b/src/Services/Ordering/Ordering.API/azds.yaml index b81f9d773..82e56add6 100644 --- a/src/Services/Ordering/Ordering.API/azds.yaml +++ b/src/Services/Ordering/Ordering.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Ordering/Ordering.API/Dockerfile install: chart: ../../../../k8s/helm/ordering-api values: - values.dev.yaml? - secrets.dev.yaml? - - inf.yaml - - app.yaml + - ../../../../k8s/helm/inf.yaml + - ../../../../k8s/helm/app.yaml set: replicaCount: 1 diff --git a/src/Services/Ordering/Ordering.API/inf.yaml b/src/Services/Ordering/Ordering.API/inf.yaml deleted file mode 100644 index 943ec99fb..000000000 --- a/src/Services/Ordering/Ordering.API/inf.yaml +++ /dev/null @@ -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-" 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 diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/azds.yaml b/src/Services/Ordering/Ordering.BackgroundTasks/azds.yaml index 57e25c501..c94939335 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/azds.yaml +++ b/src/Services/Ordering/Ordering.BackgroundTasks/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile install: chart: ../../../../k8s/helm/ordering-backgroundtasks values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: diff --git a/src/Services/Ordering/Ordering.SignalrHub/azds.yaml b/src/Services/Ordering/Ordering.SignalrHub/azds.yaml index e2b280ee8..740f56e4c 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/azds.yaml +++ b/src/Services/Ordering/Ordering.SignalrHub/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile install: chart: ../../../../k8s/helm/ordering-signalrhub values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: diff --git a/src/Services/Payment/Payment.API/azds.yaml b/src/Services/Payment/Payment.API/azds.yaml index 0f1a75856..48f9d244b 100644 --- a/src/Services/Payment/Payment.API/azds.yaml +++ b/src/Services/Payment/Payment.API/azds.yaml @@ -1,15 +1,15 @@ kind: helm-release apiVersion: 1.0 build: - context: ..\..\..\.. - dockerfile: Dockerfile + context: ../../../../ + dockerfile: src/Services/Payment/Payment.API/Dockerfile install: chart: ../../../../k8s/helm/payment-api values: - values.dev.yaml? - secrets.dev.yaml? - - ..\..\..\..\k8s\helm\app.yaml? - - ..\..\..\..\k8s\helm\inf.yaml? + - ../../../../k8s/helm/app.yaml? + - ../../../../k8s/helm/inf.yaml? set: replicaCount: 1 image: