From 8b4ab00c9196a31a96337189e7772dc2936984ca Mon Sep 17 00:00:00 2001 From: Sreenivasulu Kalluru <69580789+Sreenivas-Kalluru@users.noreply.github.com> Date: Wed, 24 Mar 2021 11:00:27 +0530 Subject: [PATCH 01/31] updated package version for ssri and is-svg (#1636) --- src/Web/WebSPA/package-lock.json | 14 +++++++------- src/Web/WebSPA/package.json | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json index e0b8a607c..ce1fcf057 100644 --- a/src/Web/WebSPA/package-lock.json +++ b/src/Web/WebSPA/package-lock.json @@ -8474,12 +8474,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", - "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.2.2.tgz", + "integrity": "sha512-JlA7Mc7mfWjdxxTkJ094oUK9amGD7gQaj5xA/NCY0vlVvZ1stmj4VX+bRuwOMN93IHRZ2ctpPH/0FO6DqvQ5Rw==", "dev": true, "requires": { - "html-comment-regex": "^1.1.0" + "html-comment-regex": "^1.1.2" } }, "is-symbol": { @@ -14771,9 +14771,9 @@ } }, "ssri": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", - "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", "dev": true, "requires": { "minipass": "^3.1.1" diff --git a/src/Web/WebSPA/package.json b/src/Web/WebSPA/package.json index d1f140331..43358a1e3 100644 --- a/src/Web/WebSPA/package.json +++ b/src/Web/WebSPA/package.json @@ -56,7 +56,9 @@ "tslib": "^2.0.0", "typedoc": "^0.19.2", "webpack-dev-server": "3.1.14", - "zone.js": "~0.10.2" + "zone.js": "~0.10.2", + "ssri": ">=8.0.1", + "is-svg": ">=4.2.2" }, "devDependencies": { "@angular-devkit/build-angular": "~0.1002.0", From 5974647b529de0d6727ce6b1ed778a4dd4bd5a50 Mon Sep 17 00:00:00 2001 From: n-stefan <38526229+n-stefan@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:51:53 +0200 Subject: [PATCH 02/31] Fix WebSPA catalog filter (#1637) --- src/Web/WebSPA/Client/modules/catalog/catalog.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts index c4538b393..942f117d5 100644 --- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts +++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts @@ -59,6 +59,7 @@ export class CatalogComponent implements OnInit { this.brandSelected = this.brandSelected && this.brandSelected.toString() != "null" ? this.brandSelected : null; this.typeSelected = this.typeSelected && this.typeSelected.toString() != "null" ? this.typeSelected : null; + this.paginationInfo.actualPage = 0; this.getCatalog(this.paginationInfo.itemsPage, this.paginationInfo.actualPage, this.brandSelected, this.typeSelected); } From a71b0048970cab3e95b1f01297b3ded703a0a6d6 Mon Sep 17 00:00:00 2001 From: Matt Callahan Date: Wed, 7 Apr 2021 23:16:11 -0700 Subject: [PATCH 03/31] updated CardType and Enumeration classes (#1528) * updated CardType and Enumeration classes * Update per IEvangelist's suggestion * Update src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs Co-authored-by: David Pine Co-authored-by: Sumit Ghosh Co-authored-by: David Pine --- .../BuyerAggregate/CardType.cs | 6 ++-- .../Ordering.Domain/SeedWork/Enumeration.cs | 28 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs index 3053cb678..872a8f65d 100644 --- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs +++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs @@ -9,9 +9,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B public class CardType : Enumeration { - public static CardType Amex = new CardType(1, "Amex"); - public static CardType Visa = new CardType(2, "Visa"); - public static CardType MasterCard = new CardType(3, "MasterCard"); + public static CardType Amex = new CardType(1, nameof(Amex)); + public static CardType Visa = new CardType(2, nameof(Visa)); + public static CardType MasterCard = new CardType(3, nameof(MasterCard)); public CardType(int id, string name) : base(id, name) diff --git a/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs b/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs index d3e415df2..731dd8c86 100644 --- a/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs +++ b/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs @@ -11,27 +11,23 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork public int Id { get; private set; } - protected Enumeration(int id, string name) - { - Id = id; - Name = name; - } + protected Enumeration(int id, string name) => (Id, Name) = (id, name); public override string ToString() => Name; - - public static IEnumerable GetAll() where T : Enumeration - { - var fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly); - - return fields.Select(f => f.GetValue(null)).Cast(); - } - + + public static IEnumerable GetAll() where T : Enumeration => + typeof(T).GetFields(BindingFlags.Public | + BindingFlags.Static | + BindingFlags.DeclaredOnly) + .Select(f => f.GetValue(null)) + .Cast(); + public override bool Equals(object obj) { - var otherValue = obj as Enumeration; - - if (otherValue == null) + if (obj is not Enumeration otherValue) + { return false; + } var typeMatches = GetType().Equals(obj.GetType()); var valueMatches = Id.Equals(otherValue.Id); From 6012fb06490503eb2b656b74b85592805bcab49e Mon Sep 17 00:00:00 2001 From: Mohamed Seada Date: Mon, 12 Apr 2021 07:49:26 +0200 Subject: [PATCH 04/31] Fix aggregator address (#1646) --- src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml b/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml index 1ae8c45a1..8f2162ad7 100644 --- a/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml +++ b/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml @@ -103,7 +103,7 @@ static_resources: lb_policy: round_robin hosts: - socket_address: - address: webshoppingagg + address: mobileshoppingagg port_value: 80 - name: catalog connect_timeout: 0.25s From d0cd2830a864a8b975341b02b93a0887a3908c04 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Tue, 13 Apr 2021 06:15:38 -0700 Subject: [PATCH 05/31] Update sdk tag (#1647) --- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile | 2 +- .../Mobile.Bff.Shopping/aggregator/Dockerfile.develop | 2 +- src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile | 2 +- src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop | 2 +- src/Services/Basket/Basket.API/Dockerfile | 2 +- src/Services/Basket/Basket.API/Dockerfile.develop | 2 +- src/Services/Catalog/Catalog.API/Dockerfile | 2 +- src/Services/Catalog/Catalog.API/Dockerfile.develop | 2 +- src/Services/Identity/Identity.API/Dockerfile | 2 +- src/Services/Identity/Identity.API/Dockerfile.develop | 2 +- src/Services/Ordering/Ordering.API/Dockerfile | 2 +- src/Services/Ordering/Ordering.API/Dockerfile.develop | 2 +- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 2 +- src/Services/Ordering/Ordering.SignalrHub/Dockerfile | 2 +- src/Services/Ordering/Ordering.SignalrHub/Dockerfile.develop | 2 +- src/Services/Payment/Payment.API/Dockerfile | 2 +- src/Services/Payment/Payment.API/Dockerfile.develop | 2 +- src/Services/Webhooks/Webhooks.API/Dockerfile | 2 +- src/Services/Webhooks/Webhooks.API/Dockerfile.develop | 2 +- src/Web/WebMVC/Dockerfile | 2 +- src/Web/WebMVC/Dockerfile.develop | 2 +- src/Web/WebSPA/Dockerfile | 2 +- src/Web/WebStatus/Dockerfile | 2 +- src/Web/WebhookClient/Dockerfile | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index ee0370910..d64cd2f77 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop index b2a61dc7d..c4988428d 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index 5736c19f7..6a7eb023b 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop index 462afbcd9..5fbbdbffb 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index de2718ad4..7ba77d156 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/src/Services/Basket/Basket.API/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Basket/Basket.API/Dockerfile.develop b/src/Services/Basket/Basket.API/Dockerfile.develop index 4ad633175..3e9aed06b 100644 --- a/src/Services/Basket/Basket.API/Dockerfile.develop +++ b/src/Services/Basket/Basket.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index ec10cac79..74dd100a5 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/src/Services/Catalog/Catalog.API/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Catalog/Catalog.API/Dockerfile.develop b/src/Services/Catalog/Catalog.API/Dockerfile.develop index 3df91b3df..12a4cdae4 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile.develop +++ b/src/Services/Catalog/Catalog.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 3608476bc..039aba031 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Identity/Identity.API/Dockerfile.develop b/src/Services/Identity/Identity.API/Dockerfile.develop index 0d50b0388..11c5c6536 100644 --- a/src/Services/Identity/Identity.API/Dockerfile.develop +++ b/src/Services/Identity/Identity.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 7659da4de..54d63a41c 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/src/Services/Ordering/Ordering.API/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Ordering/Ordering.API/Dockerfile.develop b/src/Services/Ordering/Ordering.API/Dockerfile.develop index 5f7200c84..9bf101ad1 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile.develop +++ b/src/Services/Ordering/Ordering.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index ea95935ab..05b83d441 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index bb80617ff..ce132b71a 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile.develop b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile.develop index efe636e63..9acf557ac 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile.develop +++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index d56f3d7c3..fba668f09 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/src/Services/Payment/Payment.API/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Payment/Payment.API/Dockerfile.develop b/src/Services/Payment/Payment.API/Dockerfile.develop index bb6e353d2..3717c132e 100644 --- a/src/Services/Payment/Payment.API/Dockerfile.develop +++ b/src/Services/Payment/Payment.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile b/src/Services/Webhooks/Webhooks.API/Dockerfile index 263de13d6..67e1c5375 100644 --- a/src/Services/Webhooks/Webhooks.API/Dockerfile +++ b/src/Services/Webhooks/Webhooks.API/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Services/Webhooks/Webhooks.API/Dockerfile.develop b/src/Services/Webhooks/Webhooks.API/Dockerfile.develop index eda18ae91..c1e4b880e 100644 --- a/src/Services/Webhooks/Webhooks.API/Dockerfile.develop +++ b/src/Services/Webhooks/Webhooks.API/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index bab4109b5..a99a72c6f 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Web/WebMVC/Dockerfile.develop b/src/Web/WebMVC/Dockerfile.develop index c22717a35..2a6115246 100644 --- a/src/Web/WebMVC/Dockerfile.develop +++ b/src/Web/WebMVC/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim +FROM mcr.microsoft.com/dotnet/sdk:5.0 ARG BUILD_CONFIGURATION=Debug ENV ASPNETCORE_ENVIRONMENT=Development ENV DOTNET_USE_POLLING_FILE_WATCHER=true diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 0dcac8433..800caa2ac 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -10,7 +10,7 @@ COPY Web/WebSPA/package-lock.json . COPY Web/WebSPA . RUN npm i npm@6.14.11 -g && npm update && npm install && npm run build:prod -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index 7c1f74e7e..438837423 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/src/Web/WebStatus/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles diff --git a/src/Web/WebhookClient/Dockerfile b/src/Web/WebhookClient/Dockerfile index 31c4c76eb..150049bd9 100644 --- a/src/Web/WebhookClient/Dockerfile +++ b/src/Web/WebhookClient/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles From acb304c06aab04220df0a9509c4a0133d716e2d2 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Wed, 14 Apr 2021 09:25:18 -0500 Subject: [PATCH 06/31] Adding deploy workflows and script --- .github/workflows/basket-api-deploy.yml | 50 +++++ .github/workflows/catalog-api-deploy.yml | 50 +++++ .github/workflows/identity-api-deploy.yml | 50 +++++ .../workflows/mobileshoppingagg-deploy.yml | 50 +++++ .github/workflows/ordering-api-deploy.yml | 50 +++++ .../ordering-backgroundtasks-deploy.yml | 50 +++++ .../workflows/ordering-signalrhub-deploy.yml | 50 +++++ .github/workflows/payment-api-deploy.yml | 50 +++++ .github/workflows/webhooks-api-deploy.yml | 50 +++++ .github/workflows/webmvc-deploy.yml | 50 +++++ .github/workflows/webshoppingagg-deploy.yml | 50 +++++ .github/workflows/webspa-deploy.yml | 50 +++++ .github/workflows/webstatus-deploy.yml | 50 +++++ deploy/k8s/helm/deploy-chart.sh | 199 ++++++++++++++++++ 14 files changed, 849 insertions(+) create mode 100644 .github/workflows/basket-api-deploy.yml create mode 100644 .github/workflows/catalog-api-deploy.yml create mode 100644 .github/workflows/identity-api-deploy.yml create mode 100644 .github/workflows/mobileshoppingagg-deploy.yml create mode 100644 .github/workflows/ordering-api-deploy.yml create mode 100644 .github/workflows/ordering-backgroundtasks-deploy.yml create mode 100644 .github/workflows/ordering-signalrhub-deploy.yml create mode 100644 .github/workflows/payment-api-deploy.yml create mode 100644 .github/workflows/webhooks-api-deploy.yml create mode 100644 .github/workflows/webmvc-deploy.yml create mode 100644 .github/workflows/webshoppingagg-deploy.yml create mode 100644 .github/workflows/webspa-deploy.yml create mode 100644 .github/workflows/webstatus-deploy.yml create mode 100644 deploy/k8s/helm/deploy-chart.sh diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml new file mode 100644 index 000000000..daf47fc99 --- /dev/null +++ b/.github/workflows/basket-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy basket-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["basket-api"] + branches: [dev] + types: [completed] + +env: + chart: basket-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml new file mode 100644 index 000000000..4bc3a9fbb --- /dev/null +++ b/.github/workflows/catalog-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy catalog-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["catalog-api"] + branches: [dev] + types: [completed] + +env: + chart: catalog-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml new file mode 100644 index 000000000..4399957ec --- /dev/null +++ b/.github/workflows/identity-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy identity-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["identity-api"] + branches: [dev] + types: [completed] + +env: + chart: identity-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml new file mode 100644 index 000000000..cd93dabd4 --- /dev/null +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy mobileshoppingagg + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["mobileshoppingagg"] + branches: [dev] + types: [completed] + +env: + chart: mobileshoppingagg + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml new file mode 100644 index 000000000..9a8b8dbd5 --- /dev/null +++ b/.github/workflows/ordering-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy ordering-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["ordering-api"] + branches: [dev] + types: [completed] + +env: + chart: ordering-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml new file mode 100644 index 000000000..d384f6077 --- /dev/null +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy ordering-backgroundtasks + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["ordering-backgroundtasks"] + branches: [dev] + types: [completed] + +env: + chart: ordering-backgroundtasks + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml new file mode 100644 index 000000000..2ca62d979 --- /dev/null +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy ordering-signalrhub + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["ordering-signalrhub"] + branches: [dev] + types: [completed] + +env: + chart: ordering-signalrhub + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml new file mode 100644 index 000000000..e19a0ee95 --- /dev/null +++ b/.github/workflows/payment-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy payment-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["payment-api"] + branches: [dev] + types: [completed] + +env: + chart: payment-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml new file mode 100644 index 000000000..1e72de350 --- /dev/null +++ b/.github/workflows/webhooks-api-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy webhooks-api + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["webhooks-api"] + branches: [dev] + types: [completed] + +env: + chart: webhooks-api + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml new file mode 100644 index 000000000..782d97bc2 --- /dev/null +++ b/.github/workflows/webmvc-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy webmvc + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["webmvc"] + branches: [dev] + types: [completed] + +env: + chart: webmvc + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml new file mode 100644 index 000000000..293554b29 --- /dev/null +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy webshoppingagg + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["webshoppingagg"] + branches: [dev] + types: [completed] + +env: + chart: webshoppingagg + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml new file mode 100644 index 000000000..e613a24c2 --- /dev/null +++ b/.github/workflows/webspa-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy webspa + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["webspa"] + branches: [dev] + types: [completed] + +env: + chart: webspa + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml new file mode 100644 index 000000000..fb05495b4 --- /dev/null +++ b/.github/workflows/webstatus-deploy.yml @@ -0,0 +1,50 @@ +name: Deploy webstatus + +on: + workflow_dispatch: + repository_dispatch: + types: + - deploy + workflow_run: + workflows: ["webstatus"] + branches: [dev] + types: [completed] + +env: + chart: webstatus + namespace: eshop + app-name: eshop + chart-root: deploy/k8s/helm + +jobs: + DeployToK8s: + if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - uses: azure/aks-set-context@v1 + name: Set AKS context + with: + creds: '${{ secrets.AZURE_CREDENTIALS }}' + cluster-name: ${{ secrets.CLUSTER_NAME }} + resource-group: ${{ secrets.RESOURCE_GROUP }} + + - name: Set branch name as env variable + run: | + currentbranch=$(echo ${GITHUB_REF##*/}) + echo "running on $currentbranch" + echo "BRANCH=$currentbranch" >> $GITHUB_ENV + shell: bash + + - name: Deploy chart + run: | + ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + env: + TAG: ${{ env.BRANCH }} + working-directory: ${{ env.chart-root }} \ No newline at end of file diff --git a/deploy/k8s/helm/deploy-chart.sh b/deploy/k8s/helm/deploy-chart.sh new file mode 100644 index 000000000..4196d5cfe --- /dev/null +++ b/deploy/k8s/helm/deploy-chart.sh @@ -0,0 +1,199 @@ +#!/usr/bin/env bash + +# http://redsymbol.net/articles/unofficial-bash-strict-mode +set -euo pipefail + +usage() +{ + cat < + The name of the AKS cluster. Required when the registry (using the -r parameter) is set to "aks". + --aks-rg + The resource group for the AKS cluster. Required when the registry (using the -r parameter) is set to "aks". + -c | --chart + The name of the chart to upgrade (or install) + -d | --dns | --dns aks + Specifies the external DNS/ IP address of the Kubernetes cluster. + If 'aks' is set as value, the DNS value is retrieved from the AKS. --aks-name and --aks-rg are needed. + When --use-local-k8s is specified the external DNS is automatically set to localhost. + -h | --help + Displays this help text and exits the script. + -n | --app-name + Specifies the name of the application (default: eshop). + --namespace + Specifies the namespace name to deploy the app. If it doesn't exists it will be created (default: eshop). + -p | --docker-password + The Docker password used to logon to the custom registry, supplied using the -r parameter. + -r | --registry + Specifies the container registry to use (required), e.g. myregistry.azurecr.io. + --skip-clean + Do not clean the Kubernetes helm chart. Default is to clean the chart. + -t | --tag + The tag used for the newly created docker images. Default: latest. + -u | --docker-username + The Docker username used to logon to the custom registry, supplied using the -r parameter. + --use-local-k8s + Deploy to a locally installed Kubernetes (default: false). + +It is assumed that the Kubernetes cluster has been granted access to the container registry. +If using AKS and ACR see link for more info: +https://docs.microsoft.com/en-us/azure/container-registry/container-registry-auth-aks + +WARNING! THE SCRIPT WILL COMPLETELY DESTROY ALL DEPLOYMENTS AND SERVICES VISIBLE +FROM THE CURRENT CONFIGURATION CONTEXT AND NAMESPACE. +It is recommended that you check your selected namespace, 'eshop' by default, is already in use. +Every deployment and service done in the namespace will be deleted. +For more information see https://kubernetes.io/docs/tasks/administer-cluster/namespaces/ + +END +} + +acr_connected='' +app_name='eshop' +aks_name='' +aks_rg='' +chart='' +clean='yes' +container_registry='' +docker_password='' +docker_username='' +dns='' +image_tag='latest' +skip_infrastructure='' +use_local_k8s='' +namespace='eshop' + +while [[ $# -gt 0 ]]; do + case "$1" in + --acr-connected ) + acr_connected='yes'; shift ;; + --aks-name ) + aks_name="$2"; shift 2;; + --aks-rg ) + aks_rg="$2"; shift 2;; + -c | --chart ) + chart="$2"; shift 2;; + -d | --dns ) + dns="$2"; shift 2;; + -h | --help ) + usage; exit 1 ;; + -n | --app-name ) + app_name="$2"; shift 2;; + -p | --docker-password ) + docker_password="$2"; shift 2;; + -r | --registry ) + container_registry="$2"; shift 2;; + --skip-clean ) + clean=''; shift ;; + --image-build ) + build_images='yes'; shift ;; + --image-push ) + push_images='yes'; shift ;; + --skip-infrastructure ) + skip_infrastructure='yes'; shift ;; + -t | --tag ) + image_tag="$2"; shift 2;; + -u | --docker-username ) + docker_username="$2"; shift 2;; + --use-local-k8s ) + use_local_k8s='yes'; shift ;; + --namespace ) + namespace="$2"; shift 2;; + *) + echo "Unknown option $1" + usage; exit 2 ;; + esac +done + +export TAG=$image_tag + +use_custom_registry='' + +if [[ -n $container_registry ]] && [[ -z $acr_connected ]]; then + echo "################ Log into custom registry $container_registry ##################" + use_custom_registry='yes' + if [[ -z $docker_username ]] || [[ -z $docker_password ]]; then + echo "Error: Must use -u (--docker-username) AND -p (--docker-password) if specifying custom registry" + exit 1 + fi + docker login -u $docker_username -p $docker_password $container_registry +fi + +ingress_values_file="ingress_values.yaml" + +if [[ $use_local_k8s ]]; then + ingress_values_file="ingress_values_dockerk8s.yaml" + dns="localhost" +fi + +if [[ $dns == "aks" ]]; then + echo "#################### Begin AKS discovery based on the --dns aks setting. ####################" + if [[ -z $aks_name ]] || [[ -z $aks_rg ]]; then + echo "Error: When using -dns aks, MUST set -aksName and -aksRg too." + echo '' + usage + exit 1 + fi + + echo "Getting AKS cluster $aks_name AKS (in resource group $aks_rg)" + # JMESPath queries are case sensitive and httpapplicationrouting can be lowercase sometimes + jmespath_dnsqueries=(\ + addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName \ + addonProfiles.httpapplicationrouting.config.HTTPApplicationRoutingZoneName \ + ) + for q in "${jmespath_dnsqueries[@]}" + do + dns="$(az aks show -n $aks_name -g $aks_rg --query $q -o tsv)" + if [[ -n $dns ]]; then break; fi + done + if [[ -z $dns ]]; then + echo "Error: when getting DNS of AKS $aks_name (in resource group $aks_rg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged in and is of version 2.0.37 or higher." + exit 1 + fi + echo "DNS base found is $dns. Will use $aks_name.$dns for the app!" + dns="$aks_name.$dns" +fi + +# Initialization & check commands +if [[ -z $dns ]]; then + echo "No DNS specified. Ingress resources will be bound to public IP." +fi + +previous_install='' +if [[ -z $(helm ls -q --namespace $namespace | grep "$app_name-$chart") ]]; then + echo "No previous release found" +else + previous_install='yes' +fi + +if [[ $clean ]] && [[ $previous_install ]]; then + echo "Cleaning previous helm releases..." + helm uninstall "$app_name-$chart" --namespace $namespace + echo "Previous release deleted" + waitsecs=5; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done + previous_install='' +fi + +echo "#################### Begin $app_name $chart installation using Helm ####################" +if [[ $use_custom_registry ]] || [[ $acr_connected ]]; then + if [[ -z $acr_connected ]]; then + if [[ -z $previous_install ]]; then + helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart + else + helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart + fi + elif [[ $chart != "eshop-common" ]]; then + # ACR is already connected, so we don't need username/password + if [[ -z $previous_install ]]; then + helm install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart + else + # don't set the image repo since it's already set + helm upgrade "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart + fi + fi +elif [[ $chart != "eshop-common" ]]; then # eshop-common is ignored when no secret must be deployed + helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart +fi +echo "FINISHED: Helm chart installed." \ No newline at end of file From 996da7718aa589c7a4278a4bab8ab7f2acd69998 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:33:56 -0500 Subject: [PATCH 07/31] Update checkout from @v1 to @v2 --- .github/workflows/basket-api-deploy.yml | 2 +- .github/workflows/catalog-api-deploy.yml | 2 +- .github/workflows/identity-api-deploy.yml | 2 +- .github/workflows/mobileshoppingagg-deploy.yml | 2 +- .github/workflows/ordering-api-deploy.yml | 2 +- .github/workflows/ordering-backgroundtasks-deploy.yml | 2 +- .github/workflows/ordering-signalrhub-deploy.yml | 2 +- .github/workflows/payment-api-deploy.yml | 2 +- .github/workflows/webhooks-api-deploy.yml | 2 +- .github/workflows/webmvc-deploy.yml | 2 +- .github/workflows/webshoppingagg-deploy.yml | 2 +- .github/workflows/webspa-deploy.yml | 2 +- .github/workflows/webstatus-deploy.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index daf47fc99..91e8a67d1 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index 4bc3a9fbb..e603a6285 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index 4399957ec..30baa6e52 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index cd93dabd4..4311a389d 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 9a8b8dbd5..14e9a2d0d 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index d384f6077..701b7e5cd 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 2ca62d979..25b03af04 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index e19a0ee95..c543e7299 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 1e72de350..96bed6381 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index 782d97bc2..ab2bddb79 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 293554b29..17e94de1a 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index e613a24c2..979619695 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index fb05495b4..bea0fa440 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: azure/login@v1 with: From 8414627340965ca7c30523b82d34701ededfbd57 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:36:37 -0500 Subject: [PATCH 08/31] Update chart-root to CHART_ROOT --- .github/workflows/basket-api-deploy.yml | 4 ++-- .github/workflows/catalog-api-deploy.yml | 4 ++-- .github/workflows/identity-api-deploy.yml | 4 ++-- .github/workflows/mobileshoppingagg-deploy.yml | 4 ++-- .github/workflows/ordering-api-deploy.yml | 4 ++-- .github/workflows/ordering-backgroundtasks-deploy.yml | 4 ++-- .github/workflows/ordering-signalrhub-deploy.yml | 4 ++-- .github/workflows/payment-api-deploy.yml | 4 ++-- .github/workflows/webhooks-api-deploy.yml | 4 ++-- .github/workflows/webmvc-deploy.yml | 4 ++-- .github/workflows/webshoppingagg-deploy.yml | 4 ++-- .github/workflows/webspa-deploy.yml | 4 ++-- .github/workflows/webstatus-deploy.yml | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 91e8a67d1..9e2178480 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: basket-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index e603a6285..d50ddf6af 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: catalog-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index 30baa6e52..15862044c 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: identity-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index 4311a389d..c9419eb58 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -14,7 +14,7 @@ env: chart: mobileshoppingagg namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 14e9a2d0d..15304b801 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: ordering-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 701b7e5cd..d9311bd29 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -14,7 +14,7 @@ env: chart: ordering-backgroundtasks namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 25b03af04..1d908b1be 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -14,7 +14,7 @@ env: chart: ordering-signalrhub namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index c543e7299..f9f0609de 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: payment-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 96bed6381..f72ff7783 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -14,7 +14,7 @@ env: chart: webhooks-api namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index ab2bddb79..613147e53 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -14,7 +14,7 @@ env: chart: webmvc namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 17e94de1a..856b64869 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -14,7 +14,7 @@ env: chart: webshoppingagg namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 979619695..c449e3984 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -14,7 +14,7 @@ env: chart: webspa namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index bea0fa440..03b9b9246 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -14,7 +14,7 @@ env: chart: webstatus namespace: eshop app-name: eshop - chart-root: deploy/k8s/helm + CHART_ROOT: deploy/k8s/helm jobs: DeployToK8s: @@ -47,4 +47,4 @@ jobs: ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} - working-directory: ${{ env.chart-root }} \ No newline at end of file + working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From ede057c6e79ad16de9904f0b960badd518a2c2fe Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:37:30 -0500 Subject: [PATCH 09/31] Update chart to CHART --- .github/workflows/basket-api-deploy.yml | 6 +++--- .github/workflows/catalog-api-deploy.yml | 6 +++--- .github/workflows/identity-api-deploy.yml | 6 +++--- .github/workflows/mobileshoppingagg-deploy.yml | 6 +++--- .github/workflows/ordering-api-deploy.yml | 6 +++--- .github/workflows/ordering-backgroundtasks-deploy.yml | 6 +++--- .github/workflows/ordering-signalrhub-deploy.yml | 6 +++--- .github/workflows/payment-api-deploy.yml | 6 +++--- .github/workflows/webhooks-api-deploy.yml | 6 +++--- .github/workflows/webmvc-deploy.yml | 6 +++--- .github/workflows/webshoppingagg-deploy.yml | 6 +++--- .github/workflows/webspa-deploy.yml | 6 +++--- .github/workflows/webstatus-deploy.yml | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 9e2178480..8a5bf4803 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: basket-api + CHART: basket-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index d50ddf6af..c0538b3a0 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: catalog-api + CHART: catalog-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index 15862044c..8d5f4a24b 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: identity-api + CHART: identity-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index c9419eb58..d283e7c22 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: mobileshoppingagg + CHART: mobileshoppingagg namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 15304b801..b2d933787 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: ordering-api + CHART: ordering-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index d9311bd29..b276f5b6c 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: ordering-backgroundtasks + CHART: ordering-backgroundtasks namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 1d908b1be..770ea348f 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: ordering-signalrhub + CHART: ordering-signalrhub namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index f9f0609de..a57bc7ec1 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: payment-api + CHART: payment-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index f72ff7783..7b5cea483 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: webhooks-api + CHART: webhooks-api namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index 613147e53..e61c8dc7a 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: webmvc + CHART: webmvc namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 856b64869..60df219a3 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: webshoppingagg + CHART: webshoppingagg namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index c449e3984..3679e8f32 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: webspa + CHART: webspa namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index 03b9b9246..fc05b7797 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -11,7 +11,7 @@ on: types: [completed] env: - chart: webstatus + CHART: webstatus namespace: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -42,9 +42,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy chart + - name: Deploy CHART run: | - ./deploy-chart.sh -c ${{ env.chart }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From 7343ceb4c25d6f77c4532fe9a608a5d97bf1bdf9 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:39:39 -0500 Subject: [PATCH 10/31] Update namespace to NAMESPACE --- .github/workflows/basket-api-deploy.yml | 4 ++-- .github/workflows/catalog-api-deploy.yml | 4 ++-- .github/workflows/identity-api-deploy.yml | 4 ++-- .github/workflows/mobileshoppingagg-deploy.yml | 4 ++-- .github/workflows/ordering-api-deploy.yml | 4 ++-- .github/workflows/ordering-backgroundtasks-deploy.yml | 4 ++-- .github/workflows/ordering-signalrhub-deploy.yml | 4 ++-- .github/workflows/payment-api-deploy.yml | 4 ++-- .github/workflows/webhooks-api-deploy.yml | 4 ++-- .github/workflows/webmvc-deploy.yml | 4 ++-- .github/workflows/webshoppingagg-deploy.yml | 4 ++-- .github/workflows/webspa-deploy.yml | 4 ++-- .github/workflows/webstatus-deploy.yml | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 8a5bf4803..43b9b95c5 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: basket-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index c0538b3a0..ae49c6a85 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: catalog-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index 8d5f4a24b..bcdc9df41 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: identity-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index d283e7c22..cb38de329 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: mobileshoppingagg - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index b2d933787..0a3ac5bdc 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: ordering-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index b276f5b6c..9f01f4e25 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: ordering-backgroundtasks - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 770ea348f..6f2642f2f 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: ordering-signalrhub - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index a57bc7ec1..9f5ad1749 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: payment-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 7b5cea483..adb3ee122 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: webhooks-api - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index e61c8dc7a..97b5fdf53 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: webmvc - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 60df219a3..bc946aa7b 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: webshoppingagg - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 3679e8f32..598f55b63 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: webspa - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index fc05b7797..51d93c492 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -12,7 +12,7 @@ on: env: CHART: webstatus - namespace: eshop + NAMESPACE: eshop app-name: eshop CHART_ROOT: deploy/k8s/helm @@ -44,7 +44,7 @@ jobs: - name: Deploy CHART run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected + ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From c152b030ba103b0e3243141dd862f996d8cb00e7 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:46:11 -0500 Subject: [PATCH 11/31] Remove app-name --- .github/workflows/basket-api-deploy.yml | 1 - .github/workflows/catalog-api-deploy.yml | 1 - .github/workflows/identity-api-deploy.yml | 1 - .github/workflows/mobileshoppingagg-deploy.yml | 1 - .github/workflows/ordering-api-deploy.yml | 1 - .github/workflows/ordering-backgroundtasks-deploy.yml | 1 - .github/workflows/ordering-signalrhub-deploy.yml | 1 - .github/workflows/payment-api-deploy.yml | 1 - .github/workflows/webhooks-api-deploy.yml | 1 - .github/workflows/webmvc-deploy.yml | 1 - .github/workflows/webshoppingagg-deploy.yml | 1 - .github/workflows/webspa-deploy.yml | 1 - .github/workflows/webstatus-deploy.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 43b9b95c5..42b881c72 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: basket-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index ae49c6a85..2afb8f978 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: catalog-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index bcdc9df41..b52350ff4 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: identity-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index cb38de329..fe431a768 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: mobileshoppingagg NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 0a3ac5bdc..710834d42 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: ordering-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 9f01f4e25..3b267fcf5 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: ordering-backgroundtasks NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 6f2642f2f..76809d1ad 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: ordering-signalrhub NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index 9f5ad1749..348f1f6cd 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: payment-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index adb3ee122..89084f8b2 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: webhooks-api NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index 97b5fdf53..dbd892473 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: webmvc NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index bc946aa7b..1fa5b8945 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: webshoppingagg NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 598f55b63..84749ae7a 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: webspa NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index 51d93c492..3d0f17638 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -13,7 +13,6 @@ on: env: CHART: webstatus NAMESPACE: eshop - app-name: eshop CHART_ROOT: deploy/k8s/helm jobs: From 391de9fc9ebc2cfb61adb03b686fbdd1982294d9 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 08:48:00 -0500 Subject: [PATCH 12/31] Update DeployToK8s to deploy-to-k8s --- .github/workflows/basket-api-deploy.yml | 2 +- .github/workflows/catalog-api-deploy.yml | 2 +- .github/workflows/identity-api-deploy.yml | 2 +- .github/workflows/mobileshoppingagg-deploy.yml | 2 +- .github/workflows/ordering-api-deploy.yml | 2 +- .github/workflows/ordering-backgroundtasks-deploy.yml | 2 +- .github/workflows/ordering-signalrhub-deploy.yml | 2 +- .github/workflows/payment-api-deploy.yml | 2 +- .github/workflows/webhooks-api-deploy.yml | 2 +- .github/workflows/webmvc-deploy.yml | 2 +- .github/workflows/webshoppingagg-deploy.yml | 2 +- .github/workflows/webspa-deploy.yml | 2 +- .github/workflows/webstatus-deploy.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 42b881c72..9d913e286 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index 2afb8f978..b5fff26ac 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index b52350ff4..796c71629 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index fe431a768..fb02a718e 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 710834d42..9c23e4aa7 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 3b267fcf5..2755e8743 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 76809d1ad..3cbacf641 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index 348f1f6cd..f7fb930a9 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 89084f8b2..0f9d216ec 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index dbd892473..1840817f3 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 1fa5b8945..01e8c91bc 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 84749ae7a..03b47d12d 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index 3d0f17638..d0cdccf16 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -16,7 +16,7 @@ env: CHART_ROOT: deploy/k8s/helm jobs: - DeployToK8s: + deploy-to-k8s: if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest From 9affd629beb94afd73f1775740feea2370ac451f Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:11:49 -0500 Subject: [PATCH 13/31] Adding unit tests --- .github/workflows/basket-api.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 9d2685382..ac75fb723 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -21,6 +21,7 @@ on: env: SERVICE: basket-api IMAGE: basket.api + DOTNET_VERSION: 5.0.x jobs: @@ -45,6 +46,20 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master + + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd /src/Services/Catalog/Catalog.API + dotnet build --no-restore + cd - + cd src/Services/Catalog/Catalog.UnitTests + dotnet test - name: Enable experimental features for the Docker daemon and CLI run: | From d261523c0596bc56298471c694094ac29030685c Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:13:31 -0500 Subject: [PATCH 14/31] Revert --- .github/workflows/basket-api.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index ac75fb723..01c587a99 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -21,7 +21,6 @@ on: env: SERVICE: basket-api IMAGE: basket.api - DOTNET_VERSION: 5.0.x jobs: @@ -47,20 +46,6 @@ jobs: - name: 'Checkout Github Action' uses: actions/checkout@master - - name: Setup dotnet - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} - - - name: Build and run unit tests - run: | - dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" - cd /src/Services/Catalog/Catalog.API - dotnet build --no-restore - cd - - cd src/Services/Catalog/Catalog.UnitTests - dotnet test - - name: Enable experimental features for the Docker daemon and CLI run: | echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json From e858b1af512a5de7344c34b591ef12c2f96d5495 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:14:41 -0500 Subject: [PATCH 15/31] Full revert --- .github/workflows/basket-api.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 01c587a99..9d2685382 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -45,7 +45,7 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master - + - name: Enable experimental features for the Docker daemon and CLI run: | echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json From 53ad2d19c35922d2a2da26b85f0aed2cf2e79a53 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:24:28 -0500 Subject: [PATCH 16/31] Adding unit tests --- .github/workflows/basket-api.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 9d2685382..13cbd8756 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -21,6 +21,7 @@ on: env: SERVICE: basket-api IMAGE: basket.api + DOTNET_VERSION: 5.0.x jobs: @@ -46,6 +47,20 @@ jobs: - name: 'Checkout Github Action' uses: actions/checkout@master + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd /src/Services/Catalog/Catalog.API + dotnet build --no-restore + cd - + cd src/Services/Catalog/Catalog.UnitTests + dotnet test + - name: Enable experimental features for the Docker daemon and CLI run: | echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json From c6763a2aa68fe18e6b498389d7717ca147d21e61 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:25:56 -0500 Subject: [PATCH 17/31] Add workflow_dispatch --- .github/workflows/basket-api.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 13cbd8756..83b929587 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -1,6 +1,7 @@ name: basket-api on: + workflow_dispatch: push: branches: - dev From 99e86312f96a9b909939c2725549c086f36f18e0 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:28:08 -0500 Subject: [PATCH 18/31] Change working dir --- .github/workflows/basket-api.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 83b929587..1d6ca60e7 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -55,11 +55,12 @@ jobs: - name: Build and run unit tests run: | + cd src dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" - cd /src/Services/Catalog/Catalog.API + cd Services/Catalog/Catalog.API dotnet build --no-restore cd - - cd src/Services/Catalog/Catalog.UnitTests + cd Services/Catalog/Catalog.UnitTests dotnet test - name: Enable experimental features for the Docker daemon and CLI From 47ca5681f967430cd62839ea355d90bfc58e3c24 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:50:10 -0500 Subject: [PATCH 19/31] Adding workflow_dispatch and unit tests --- .github/workflows/catalog-api.yml | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/catalog-api.yml b/.github/workflows/catalog-api.yml index ca05a56ea..9c39165ef 100644 --- a/.github/workflows/catalog-api.yml +++ b/.github/workflows/catalog-api.yml @@ -1,6 +1,7 @@ name: catalog-api on: + workflow_dispatch: push: branches: - dev @@ -21,6 +22,7 @@ on: env: SERVICE: catalog-api IMAGE: catalog.api + DOTNET_VERSION: 5.0.x jobs: @@ -30,6 +32,21 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master + + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + cd src + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd Services/Catalog/Catalog.API + dotnet build --no-restore + cd - + cd Services/Catalog/Catalog.UnitTests + dotnet test - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -46,6 +63,21 @@ jobs: - name: 'Checkout Github Action' uses: actions/checkout@master + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + cd src + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd Services/Catalog/Catalog.API + dotnet build --no-restore + cd - + cd Services/Catalog/Catalog.UnitTests + dotnet test + - name: Enable experimental features for the Docker daemon and CLI run: | echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json From 17dc8efb534475e6de390fd75dc653706ff6cfe4 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 10:50:19 -0500 Subject: [PATCH 20/31] Adding unit tests --- .github/workflows/basket-api.yml | 17 +++++++++++++++- .github/workflows/ordering-api.yml | 32 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 1d6ca60e7..dadd47467 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -32,7 +32,22 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master - + + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + cd src + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd Services/Basket/Basket.API + dotnet build --no-restore + cd - + cd Services/Basket/Basket.UnitTests + dotnet test + - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} working-directory: ./src diff --git a/.github/workflows/ordering-api.yml b/.github/workflows/ordering-api.yml index 5adec0760..afaf99152 100644 --- a/.github/workflows/ordering-api.yml +++ b/.github/workflows/ordering-api.yml @@ -1,6 +1,7 @@ name: ordering-api on: + workflow_dispatch: push: branches: - dev @@ -21,6 +22,7 @@ on: env: SERVICE: ordering-api IMAGE: ordering.api + DOTNET_VERSION: 5.0.x jobs: @@ -30,6 +32,21 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master + + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + cd src + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd Services/Ordering/Ordering.API + dotnet build --no-restore + cd - + cd Services/Ordering/Ordering.UnitTests + dotnet test - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -45,6 +62,21 @@ jobs: steps: - name: 'Checkout Github Action' uses: actions/checkout@master + + - name: Setup dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Build and run unit tests + run: | + cd src + dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" + cd Services/Ordering/Ordering.API + dotnet build --no-restore + cd - + cd Services/Ordering/Ordering.UnitTests + dotnet test - name: Enable experimental features for the Docker daemon and CLI run: | From f388b4fd175c19e40779dd1227d0441bc678f774 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 11:02:21 -0500 Subject: [PATCH 21/31] Up verbosity --- .github/workflows/basket-api.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index dadd47467..7cbb91e3f 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -46,7 +46,7 @@ jobs: dotnet build --no-restore cd - cd Services/Basket/Basket.UnitTests - dotnet test + dotnet test --no-build -v=normal - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -72,11 +72,11 @@ jobs: run: | cd src dotnet restore "eShopOnContainers-ServicesAndWebApps.sln" - cd Services/Catalog/Catalog.API + cd Services/Basket/Basket.API dotnet build --no-restore cd - - cd Services/Catalog/Catalog.UnitTests - dotnet test + cd Services/Basket/Basket.UnitTests + dotnet test --no-build -v=normal - name: Enable experimental features for the Docker daemon and CLI run: | From 95fc2197ed9baa2b737ff883a30dd5cfa3da3043 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 11:07:22 -0500 Subject: [PATCH 22/31] Update arg --- .github/workflows/basket-api.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index 7cbb91e3f..d29ef11ff 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -46,7 +46,7 @@ jobs: dotnet build --no-restore cd - cd Services/Basket/Basket.UnitTests - dotnet test --no-build -v=normal + dotnet test -v=normal - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -76,7 +76,7 @@ jobs: dotnet build --no-restore cd - cd Services/Basket/Basket.UnitTests - dotnet test --no-build -v=normal + dotnet test -v=normal - name: Enable experimental features for the Docker daemon and CLI run: | From 87016c328046322709f2ae1dc87546841788afd1 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 11:10:41 -0500 Subject: [PATCH 23/31] Change verbosity to only test --- .github/workflows/basket-api.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml index d29ef11ff..b886d30b9 100644 --- a/.github/workflows/basket-api.yml +++ b/.github/workflows/basket-api.yml @@ -46,7 +46,8 @@ jobs: dotnet build --no-restore cd - cd Services/Basket/Basket.UnitTests - dotnet test -v=normal + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -76,7 +77,8 @@ jobs: dotnet build --no-restore cd - cd Services/Basket/Basket.UnitTests - dotnet test -v=normal + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Enable experimental features for the Docker daemon and CLI run: | From 5ec02287b66cc0fd40bfc4f66b470b554dc71448 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 11:24:44 -0500 Subject: [PATCH 24/31] Fixing dotnet test cmd --- .github/workflows/catalog-api.yml | 6 ++++-- .github/workflows/ordering-api.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/catalog-api.yml b/.github/workflows/catalog-api.yml index 9c39165ef..9170e7cc8 100644 --- a/.github/workflows/catalog-api.yml +++ b/.github/workflows/catalog-api.yml @@ -46,7 +46,8 @@ jobs: dotnet build --no-restore cd - cd Services/Catalog/Catalog.UnitTests - dotnet test + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -76,7 +77,8 @@ jobs: dotnet build --no-restore cd - cd Services/Catalog/Catalog.UnitTests - dotnet test + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Enable experimental features for the Docker daemon and CLI run: | diff --git a/.github/workflows/ordering-api.yml b/.github/workflows/ordering-api.yml index afaf99152..10be98451 100644 --- a/.github/workflows/ordering-api.yml +++ b/.github/workflows/ordering-api.yml @@ -46,7 +46,8 @@ jobs: dotnet build --no-restore cd - cd Services/Ordering/Ordering.UnitTests - dotnet test + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Compose build ${{ env.SERVICE }} run: sudo -E docker-compose build ${{ env.SERVICE }} @@ -76,7 +77,8 @@ jobs: dotnet build --no-restore cd - cd Services/Ordering/Ordering.UnitTests - dotnet test + dotnet build --no-restore + dotnet test --no-build -v=normal - name: Enable experimental features for the Docker daemon and CLI run: | From e10f9c1c892d27cd8d9e024eb377f0c8006819d6 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 11:55:10 -0500 Subject: [PATCH 25/31] Fix file name --- .github/workflows/catalog-api-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index b5fff26ac..229f693b1 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From e367740725d9d3f9f167bdfe7e13889f26893a48 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 12:00:23 -0500 Subject: [PATCH 26/31] Fix perms --- deploy/k8s/helm/deploy-chart.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 deploy/k8s/helm/deploy-chart.sh diff --git a/deploy/k8s/helm/deploy-chart.sh b/deploy/k8s/helm/deploy-chart.sh old mode 100644 new mode 100755 From d8c65784e7c8be16283862813429aedd1ba7c620 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 12:06:17 -0500 Subject: [PATCH 27/31] Fix casing --- .github/workflows/catalog-api-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index 229f693b1..dbec268b7 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -43,7 +43,7 @@ jobs: - name: Deploy chart run: | - ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From 6f29ec52d4617f421982b23876152db346a3e8d6 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 15 Apr 2021 12:12:43 -0500 Subject: [PATCH 28/31] Fixing casing --- .github/workflows/basket-api-deploy.yml | 4 ++-- .github/workflows/identity-api-deploy.yml | 4 ++-- .github/workflows/mobileshoppingagg-deploy.yml | 4 ++-- .github/workflows/ordering-api-deploy.yml | 4 ++-- .github/workflows/ordering-backgroundtasks-deploy.yml | 4 ++-- .github/workflows/ordering-signalrhub-deploy.yml | 4 ++-- .github/workflows/payment-api-deploy.yml | 4 ++-- .github/workflows/webhooks-api-deploy.yml | 4 ++-- .github/workflows/webmvc-deploy.yml | 4 ++-- .github/workflows/webshoppingagg-deploy.yml | 4 ++-- .github/workflows/webspa-deploy.yml | 4 ++-- .github/workflows/webstatus-deploy.yml | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 9d913e286..00c8113e6 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index 796c71629..dcb2212b2 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index fb02a718e..d20ddbabd 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index 9c23e4aa7..b9395b1a1 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index 2755e8743..f83e8eb82 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 3cbacf641..1b955acd6 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index f7fb930a9..840283b58 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index 0f9d216ec..a35d2a951 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index 1840817f3..34ef4ebed 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 01e8c91bc..76288a0ea 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 03b47d12d..1d87c9ab6 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index d0cdccf16..39671fbbf 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -41,9 +41,9 @@ jobs: echo "BRANCH=$currentbranch" >> $GITHUB_ENV shell: bash - - name: Deploy CHART + - name: Deploy Chart run: | - ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected + ./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected env: TAG: ${{ env.BRANCH }} working-directory: ${{ env.CHART_ROOT }} \ No newline at end of file From 81f05762ce482c998a9c8b24b5844bdd48f4e6c7 Mon Sep 17 00:00:00 2001 From: Sumit Ghosh Date: Wed, 21 Apr 2021 20:04:54 +0530 Subject: [PATCH 29/31] Updated sockjs package (#1651) --- src/Web/WebSPA/package-lock.json | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json index ce1fcf057..724c29073 100644 --- a/src/Web/WebSPA/package-lock.json +++ b/src/Web/WebSPA/package-lock.json @@ -14408,18 +14408,21 @@ } }, "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", + "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", + "dev": true, "requires": { "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "uuid": "^3.4.0", + "websocket-driver": "0.6.5" } }, "sockjs-client": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", - "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", + "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", + "dev": true, "requires": { "debug": "^3.2.5", "eventsource": "^1.0.7", @@ -14429,10 +14432,20 @@ "url-parse": "^1.4.3" }, "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, "faye-websocket": { "version": "0.11.3", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "dev": true, "requires": { "websocket-driver": ">=0.5.1" } @@ -16765,8 +16778,8 @@ "selfsigned": "^1.9.1", "semver": "^5.6.0", "serve-index": "^1.7.2", - "sockjs": "0.3.19", - "sockjs-client": "1.3.0", + "sockjs": "0.3.20", + "sockjs-client": "1.4.0", "spdy": "^4.0.0", "strip-ansi": "^3.0.0", "supports-color": "^5.1.0", From 374cf8d7100a2091e2312f3204ad8acc91e7649f Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Fri, 23 Apr 2021 00:20:29 -0500 Subject: [PATCH 30/31] Prevent deploy jobs --- .github/workflows/basket-api-deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml index 00c8113e6..3d51c6d24 100644 --- a/.github/workflows/basket-api-deploy.yml +++ b/.github/workflows/basket-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: From c4d40f16db625ed10d052f1df79a2955d3774b20 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Fri, 23 Apr 2021 00:20:38 -0500 Subject: [PATCH 31/31] Prevent deploy jobs --- .github/workflows/catalog-api-deploy.yml | 3 ++- .github/workflows/identity-api-deploy.yml | 3 ++- .github/workflows/mobileshoppingagg-deploy.yml | 3 ++- .github/workflows/ordering-api-deploy.yml | 3 ++- .github/workflows/ordering-backgroundtasks-deploy.yml | 3 ++- .github/workflows/ordering-signalrhub-deploy.yml | 3 ++- .github/workflows/payment-api-deploy.yml | 3 ++- .github/workflows/webhooks-api-deploy.yml | 3 ++- .github/workflows/webmvc-deploy.yml | 3 ++- .github/workflows/webshoppingagg-deploy.yml | 3 ++- .github/workflows/webspa-deploy.yml | 3 ++- .github/workflows/webstatus-deploy.yml | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml index dbec268b7..7a5827b66 100644 --- a/.github/workflows/catalog-api-deploy.yml +++ b/.github/workflows/catalog-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml index dcb2212b2..5b2626a3e 100644 --- a/.github/workflows/identity-api-deploy.yml +++ b/.github/workflows/identity-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml index d20ddbabd..012d4957a 100644 --- a/.github/workflows/mobileshoppingagg-deploy.yml +++ b/.github/workflows/mobileshoppingagg-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml index b9395b1a1..0ae9d28cb 100644 --- a/.github/workflows/ordering-api-deploy.yml +++ b/.github/workflows/ordering-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml index f83e8eb82..65eab8148 100644 --- a/.github/workflows/ordering-backgroundtasks-deploy.yml +++ b/.github/workflows/ordering-backgroundtasks-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml index 1b955acd6..d7842a30f 100644 --- a/.github/workflows/ordering-signalrhub-deploy.yml +++ b/.github/workflows/ordering-signalrhub-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml index 840283b58..9592259b1 100644 --- a/.github/workflows/payment-api-deploy.yml +++ b/.github/workflows/payment-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml index a35d2a951..08955a3d4 100644 --- a/.github/workflows/webhooks-api-deploy.yml +++ b/.github/workflows/webhooks-api-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml index 34ef4ebed..3f1d9c4a1 100644 --- a/.github/workflows/webmvc-deploy.yml +++ b/.github/workflows/webmvc-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml index 76288a0ea..7cff7ceac 100644 --- a/.github/workflows/webshoppingagg-deploy.yml +++ b/.github/workflows/webshoppingagg-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml index 1d87c9ab6..2700ee9cd 100644 --- a/.github/workflows/webspa-deploy.yml +++ b/.github/workflows/webspa-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml index 39671fbbf..dc5629ab9 100644 --- a/.github/workflows/webstatus-deploy.yml +++ b/.github/workflows/webstatus-deploy.yml @@ -17,7 +17,8 @@ env: jobs: deploy-to-k8s: - if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: false runs-on: ubuntu-latest steps: