From 3f0651cb876f85fd93caee18a3c5fa27bf338837 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:42:25 +0530
Subject: [PATCH 01/44] Updated readme with new book cover icon

---
 README.md                                       |   4 ++--
 img/architecture-book-cover-large-we.png        | Bin 0 -> 14093 bytes
 img/devops-book-cover-large-we.png              | Bin 0 -> 9978 bytes
 ...enterprise-patterns-ebook-cover-large-we.png | Bin 0 -> 44407 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 img/architecture-book-cover-large-we.png
 create mode 100644 img/devops-book-cover-large-we.png
 create mode 100644 img/xamarin-enterprise-patterns-ebook-cover-large-we.png

diff --git a/README.md b/README.md
index 6f3c1f5b7..634d87908 100644
--- a/README.md
+++ b/README.md
@@ -82,8 +82,8 @@ You can download them and start reviewing these Guides/eBooks here:
 
 | Architecting & Developing | Containers Lifecycle & CI/CD | App patterns with Xamarin.Forms |
 | ------------ | ------------|  ------------|
-| [![](img/Microservices-cover-small.png)](https://aka.ms/microservicesebook) | [![](img/DevOps-Cover-small.png)](https://aka.ms/dockerlifecycleebook) | [![](img/xamarin-enterprise-patterns-ebook-cover-small.png)](https://aka.ms/xamarinpatternsebook) |
-| <sup> <a href='https://aka.ms/microservicesebook'>**Download .PDF**</a> </sup>  | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** </a>  </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download**  </a>  </sup> |
+| [![](img/architecture-book-cover-large-we.png)](https://aka.ms/microservicesebook) | [![](img/devops-book-cover-large-we.png)](https://aka.ms/dockerlifecycleebook) | [![](img/xamarin-enterprise-patterns-ebook-cover-large-we.png)](https://aka.ms/xamarinpatternsebook) |
+| <sup> <a href='https://aka.ms/microservicesebook'>**Download PDF**</a> </sup>  | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download PDF** </a>  </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download PDF**  </a>  </sup> |
 
 For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues>
 
diff --git a/img/architecture-book-cover-large-we.png b/img/architecture-book-cover-large-we.png
new file mode 100644
index 0000000000000000000000000000000000000000..23c8de23199c1ffb8c1155ab5a3a6d5ffcbd1464
GIT binary patch
literal 14093
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
JT1nH;{{zZ(b;bYy

literal 0
HcmV?d00001

diff --git a/img/devops-book-cover-large-we.png b/img/devops-book-cover-large-we.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c30876b1d569df1454bd4933f89cae4c145cac
GIT binary patch
literal 9978
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

literal 0
HcmV?d00001

diff --git a/img/xamarin-enterprise-patterns-ebook-cover-large-we.png b/img/xamarin-enterprise-patterns-ebook-cover-large-we.png
new file mode 100644
index 0000000000000000000000000000000000000000..28fdcc390353c1517cf1926ae1e2e21988f651fc
GIT binary patch
literal 44407
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

literal 0
HcmV?d00001


From 1522c14b5aff8b97ba72b5fab77be23f5a70d525 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 15:08:48 +0530
Subject: [PATCH 02/44] Bump npm-registry-fetch from 4.0.2 to 4.0.5 in
 /src/Web/WebSPA (#1361)

Bumps [npm-registry-fetch](https://github.com/npm/registry-fetch) from 4.0.2 to 4.0.5.
- [Release notes](https://github.com/npm/registry-fetch/releases)
- [Changelog](https://github.com/npm/npm-registry-fetch/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/registry-fetch/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Web/WebSPA/package-lock.json | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index b6669ee0f..a04640254 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -1219,7 +1219,8 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
         "negotiator": {
@@ -1914,7 +1915,8 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
         "source-map": {
@@ -6199,7 +6201,8 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
         "normalize-path": {
@@ -6348,7 +6351,8 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
         "schema-utils": {
@@ -11181,9 +11185,9 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz",
-      "integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz",
+      "integrity": "sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.4",
@@ -11205,9 +11209,9 @@
           }
         },
         "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
         },
         "yallist": {
@@ -14166,7 +14170,8 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
         "schema-utils": {

From 6bd3301cb5ef4cbf70a6e144009089ff6419ed75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 15:09:15 +0530
Subject: [PATCH 03/44] Bump lodash from 4.17.15 to 4.17.19 in /src/Web/WebSPA
 (#1365)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Web/WebSPA/package-lock.json | 6 +++---
 src/Web/WebSPA/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index a04640254..8b39dd48b 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -9827,9 +9827,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash.capitalize": {
       "version": "4.2.1",
diff --git a/src/Web/WebSPA/package.json b/src/Web/WebSPA/package.json
index 63b43bcd2..35eb95fa1 100644
--- a/src/Web/WebSPA/package.json
+++ b/src/Web/WebSPA/package.json
@@ -76,7 +76,7 @@
     "karma-cli": "^2.0.0",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.5.3",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
     "merge": "1.2.1",
     "npm-watch": "0.5.0",
     "protractor": "^5.4.3",

From 058790471f84b0328623ff0a79dab3ac13cc6d5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 15:10:00 +0530
Subject: [PATCH 04/44] Bump jquery from 3.4.1 to 3.5.0 in /src/Web/WebSPA
 (#1313)

Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Web/WebSPA/package-lock.json | 6 +++---
 src/Web/WebSPA/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 8b39dd48b..513ac97be 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -9415,9 +9415,9 @@
       }
     },
     "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz",
+      "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ=="
     },
     "js-levenshtein": {
       "version": "1.1.6",
diff --git a/src/Web/WebSPA/package.json b/src/Web/WebSPA/package.json
index 35eb95fa1..cc60ba65f 100644
--- a/src/Web/WebSPA/package.json
+++ b/src/Web/WebSPA/package.json
@@ -46,7 +46,7 @@
     "file-loader": "2.0.0",
     "font-awesome": "4.7.0",
     "isomorphic-fetch": "2.2.1",
-    "jquery": "3.4.1",
+    "jquery": "3.5.0",
     "ngx-toastr": "10.1.0",
     "normalize.css": "8.0.0",
     "popper.js": "1.16.1",

From 99bbbfb5c9dd2dde76443a108110bdc932937333 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 15:11:01 +0530
Subject: [PATCH 05/44] Bump websocket-extensions from 0.1.3 to 0.1.4 in
 /src/Web/WebSPA (#1336)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Web/WebSPA/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 513ac97be..eba515ab7 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -16888,9 +16888,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
     },
     "whatwg-fetch": {
       "version": "2.0.4",

From edf539457932ebc1485ab5f64be30eff2d4eb6f0 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com>
Date: Wed, 22 Jul 2020 20:51:09 +0530
Subject: [PATCH 06/44] Updated readme.md with mslearn link

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 634d87908..3e7e7851e 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,8 @@ You can download them and start reviewing these Guides/eBooks here:
 
 For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues>
 
+If you are looking for a more hands-on experience where you build one of such service of your own then check out [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/)
+
 ## Read further
 
 - [Explore the application](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Explore-the-application)

From eece98132de288b29f9efb1b97891cfb471456e7 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com>
Date: Fri, 24 Jul 2020 11:00:11 +0530
Subject: [PATCH 07/44] Moved mslearn section on top

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3e7e7851e..da20b01b8 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,13 @@ _**Dev** branch contains the latest **beta** code and their images are tagged wi
 
 ## Getting Started
 
-eShopOnContainers is provided in two flavors: Basic and Advanced.
+Are you new to **microservices** and **cloud-native concepts** ? Then checkout [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/). It's an hour of content designed for beginners with hands-on exercise. It would be a good place to start before exploring more on `eShopOnContainers`.
+
+*eShopOnContainers* is provided in two flavors: Basic and Advanced.
 
 ### Basic scenario
 
-The basic scenario can be run locally using docker compose, and also deployed to a local Kubernetes cluster. Refer these Wiki pages to Get Started:
+The basic scenario can be run locally using docker-compose, and also deployed to a local Kubernetes cluster. Refer these Wiki pages to Get Started:
 
 - [CLI or Visual Studio Code](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup)
 - [Visual Studio (F5 experience)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup#optional---use-visual-studio)
@@ -44,6 +46,7 @@ The Advanced scenario can be run only in a Kubernetes cluster. Currently this sc
 
 In the future more features will be implemented in the advanced scenario.
 
+
 ## IMPORTANT NOTES!
 
 **You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**.
@@ -87,7 +90,6 @@ You can download them and start reviewing these Guides/eBooks here:
 
 For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues>
 
-If you are looking for a more hands-on experience where you build one of such service of your own then check out [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/)
 
 ## Read further
 

From 35bd66e9a98a2a4be5e60e871162378aebc689c9 Mon Sep 17 00:00:00 2001
From: Sander Holvoet <holvoetsander@hotmail.com>
Date: Tue, 28 Jul 2020 09:13:18 +0200
Subject: [PATCH 08/44] Fixed typo in README (#1375)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 634d87908..9c1a53bf5 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ eShopOnContainers is provided in two flavors: Basic and Advanced.
 
 ### Basic scenario
 
-The basic scenario can be run locally using docker compose, and also deployed to a local Kubernetes cluster. Refer these Wiki pages to Get Started:
+The basic scenario can be run locally using docker compose, and also deployed to a local Kubernetes cluster. Refer to these Wiki pages to Get Started:
 
 - [CLI or Visual Studio Code](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup)
 - [Visual Studio (F5 experience)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup#optional---use-visual-studio)

From 75fdb3dd608303ea6a16ac2452df5cb9433f4928 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com>
Date: Tue, 28 Jul 2020 14:41:05 +0530
Subject: [PATCH 09/44] Shifting MS learn section on top.

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index da20b01b8..c6f869f1e 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,12 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 | Ordering API | [![Ordering API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/ordering?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=198&branchName=dev) | Webhooks Client | [![Webhooks demo client](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webhooks-client?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=208&branchName=dev) |
 | Payment API | [![Payment API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/payment?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=205&branchName=dev) | | |
 
-_**Dev** branch contains the latest **beta** code and their images are tagged with `:dev` in our [Docker Hub](https://hub.docker.com/u/eshop)_
+_**Dev** branch contains the latest **beta** code and their images are tagged with `:linux-dev` in our [Docker Hub](https://hub.docker.com/u/eshop)_
 
-## Getting Started
+## New to **microservices** and **cloud-native development** !! 
+Please take a look at this free course : [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/). This MS Learn module will explain microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`.
 
-Are you new to **microservices** and **cloud-native concepts** ? Then checkout [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/). It's an hour of content designed for beginners with hands-on exercise. It would be a good place to start before exploring more on `eShopOnContainers`.
+## Getting Started
 
 *eShopOnContainers* is provided in two flavors: Basic and Advanced.
 

From bbccef746600c2b7c0191ea713e123feaff85664 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 28 Jul 2020 17:36:43 +0530
Subject: [PATCH 10/44] Fix/1370 - Updated script related changes for helm 3.x
 and k8s 1.16.x (#1378)

* Fix for helm 3 and k8s 1.16

* Inclusion of archived directory under k8s

* separate deploy-all powershell script for local Mac OS deployment.
---
 deploy/k8s/archived/README.md                 |   8 +
 deploy/k8s/archived/create-aks.ps1            |  50 ++++
 deploy/k8s/archived/dashboard-adminuser.yaml  |  18 ++
 deploy/k8s/archived/enable-tls.ps1            |  20 ++
 deploy/k8s/archived/helm-rbac.yaml            |  18 ++
 .../k8s/archived/helm/aks-httpaddon-cfg.yaml  |  12 +
 deploy/k8s/archived/helm/apigwmm/.helmignore  |  21 ++
 deploy/k8s/archived/helm/apigwmm/Chart.yaml   |   5 +
 deploy/k8s/archived/helm/apigwmm/envoy.yaml   |  75 ++++++
 .../archived/helm/apigwmm/templates/NOTES.txt |   2 +
 .../helm/apigwmm/templates/_helpers.tpl       |  32 +++
 .../helm/apigwmm/templates/_names.tpl         |  52 ++++
 .../helm/apigwmm/templates/deployment.yaml    | 110 ++++++++
 .../helm/apigwmm/templates/envoy-cm.yaml      |  14 ++
 .../helm/apigwmm/templates/ingress.yaml       |  46 ++++
 .../helm/apigwmm/templates/service.yaml       |  23 ++
 deploy/k8s/archived/helm/apigwmm/values.yaml  |  45 ++++
 deploy/k8s/archived/helm/apigwms/.helmignore  |  21 ++
 deploy/k8s/archived/helm/apigwms/Chart.yaml   |   5 +
 deploy/k8s/archived/helm/apigwms/envoy.yaml   | 139 ++++++++++
 .../archived/helm/apigwms/templates/NOTES.txt |   2 +
 .../helm/apigwms/templates/_helpers.tpl       |  32 +++
 .../helm/apigwms/templates/_names.tpl         |  52 ++++
 .../helm/apigwms/templates/deployment.yaml    | 110 ++++++++
 .../helm/apigwms/templates/envoy-cm.yaml      |  14 ++
 .../helm/apigwms/templates/ingress.yaml       |  47 ++++
 .../helm/apigwms/templates/service.yaml       |  23 ++
 deploy/k8s/archived/helm/apigwms/values.yaml  |  45 ++++
 deploy/k8s/archived/helm/apigwwm/.helmignore  |  21 ++
 deploy/k8s/archived/helm/apigwwm/Chart.yaml   |   5 +
 deploy/k8s/archived/helm/apigwwm/envoy.yaml   |  75 ++++++
 .../archived/helm/apigwwm/templates/NOTES.txt |   2 +
 .../helm/apigwwm/templates/_helpers.tpl       |  32 +++
 .../helm/apigwwm/templates/_names.tpl         |  52 ++++
 .../helm/apigwwm/templates/deployment.yaml    | 110 ++++++++
 .../helm/apigwwm/templates/envoy-cm.yaml      |  14 ++
 .../helm/apigwwm/templates/ingress.yaml       |  47 ++++
 .../helm/apigwwm/templates/service.yaml       |  23 ++
 deploy/k8s/archived/helm/apigwwm/values.yaml  |  46 ++++
 deploy/k8s/archived/helm/apigwws/.helmignore  |  21 ++
 deploy/k8s/archived/helm/apigwws/Chart.yaml   |   5 +
 deploy/k8s/archived/helm/apigwws/envoy.yaml   | 139 ++++++++++
 .../archived/helm/apigwws/templates/NOTES.txt |   2 +
 .../helm/apigwws/templates/_helpers.tpl       |  32 +++
 .../helm/apigwws/templates/_names.tpl         |  52 ++++
 .../helm/apigwws/templates/deployment.yaml    | 109 ++++++++
 .../helm/apigwws/templates/envoy-cm.yaml      |  14 ++
 .../helm/apigwws/templates/ingress.yaml       |  46 ++++
 .../helm/apigwws/templates/service.yaml       |  23 ++
 deploy/k8s/archived/helm/apigwws/values.yaml  |  46 ++++
 deploy/k8s/archived/helm/app.yaml             |  46 ++++
 .../k8s/archived/helm/basket-api/.helmignore  |  21 ++
 .../k8s/archived/helm/basket-api/Chart.yaml   |   5 +
 .../helm/basket-api/templates/NOTES.txt       |   8 +
 .../helm/basket-api/templates/_helpers.tpl    |  32 +++
 .../helm/basket-api/templates/_names.tpl      |  52 ++++
 .../helm/basket-api/templates/configmap.yaml  |  18 ++
 .../helm/basket-api/templates/deployment.yaml |  99 ++++++++
 .../helm/basket-api/templates/service.yaml    |  23 ++
 .../k8s/archived/helm/basket-api/values.yaml  |  63 +++++
 .../k8s/archived/helm/basket-data/.helmignore |  21 ++
 .../k8s/archived/helm/basket-data/Chart.yaml  |   5 +
 .../helm/basket-data/templates/NOTES.txt      |   8 +
 .../helm/basket-data/templates/_helpers.tpl   |  32 +++
 .../basket-data/templates/deployment.yaml     |  43 ++++
 .../helm/basket-data/templates/service.yaml   |  19 ++
 .../k8s/archived/helm/basket-data/values.yaml |  19 ++
 .../k8s/archived/helm/catalog-api/.helmignore |  21 ++
 .../k8s/archived/helm/catalog-api/Chart.yaml  |   5 +
 .../helm/catalog-api/templates/NOTES.txt      |   9 +
 .../helm/catalog-api/templates/_helpers.tpl   |  32 +++
 .../helm/catalog-api/templates/_names.tpl     |  60 +++++
 .../helm/catalog-api/templates/configmap.yaml |  21 ++
 .../catalog-api/templates/deployment.yaml     |  99 ++++++++
 .../helm/catalog-api/templates/service.yaml   |  23 ++
 .../k8s/archived/helm/catalog-api/values.yaml |  63 +++++
 deploy/k8s/archived/helm/deploy-all.ps1       | 149 +++++++++++
 deploy/k8s/archived/helm/deploy-all.sh        | 232 +++++++++++++++++
 .../archived/helm/eshop-common/.helmignore    |  21 ++
 .../k8s/archived/helm/eshop-common/Chart.yaml |   5 +
 .../helm/eshop-common/templates/NOTES.txt     |   7 +
 .../helm/eshop-common/templates/_helpers.tpl  |  32 +++
 .../helm/eshop-common/templates/_names.tpl    |   3 +
 .../helm/eshop-common/templates/secret.yaml   |   9 +
 .../archived/helm/eshop-common/values.yaml    |   0
 .../archived/helm/identity-api/.helmignore    |  21 ++
 .../k8s/archived/helm/identity-api/Chart.yaml |   5 +
 .../helm/identity-api/templates/NOTES.txt     |   4 +
 .../helm/identity-api/templates/_helpers.tpl  |  32 +++
 .../helm/identity-api/templates/_names.tpl    |  51 ++++
 .../identity-api/templates/configmap.yaml     |  39 +++
 .../identity-api/templates/deployment.yaml    |  96 +++++++
 .../templates/ingress-dockerk8s.yaml          |  33 +++
 .../helm/identity-api/templates/ingress.yaml  |  46 ++++
 .../helm/identity-api/templates/service.yaml  |  19 ++
 .../archived/helm/identity-api/values.yaml    |  84 +++++++
 deploy/k8s/archived/helm/inf.yaml             |  56 +++++
 deploy/k8s/archived/helm/ingress_values.yaml  |   8 +
 .../helm/ingress_values_dockerk8s.yaml        |   7 +
 .../archived/helm/ingress_values_linkerd.yaml |  16 ++
 .../archived/helm/keystore-data/.helmignore   |  21 ++
 .../archived/helm/keystore-data/Chart.yaml    |   5 +
 .../helm/keystore-data/templates/NOTES.txt    |   8 +
 .../helm/keystore-data/templates/_helpers.tpl |  32 +++
 .../keystore-data/templates/deployment.yaml   |  43 ++++
 .../helm/keystore-data/templates/service.yaml |  19 ++
 .../archived/helm/keystore-data/values.yaml   |  19 ++
 .../archived/helm/locations-api/.helmignore   |  21 ++
 .../archived/helm/locations-api/Chart.yaml    |   5 +
 .../helm/locations-api/templates/NOTES.txt    |   9 +
 .../helm/locations-api/templates/_helpers.tpl |  32 +++
 .../helm/locations-api/templates/_names.tpl   |  52 ++++
 .../locations-api/templates/configmap.yaml    |  22 ++
 .../locations-api/templates/deployment.yaml   |  96 +++++++
 .../helm/locations-api/templates/service.yaml |  19 ++
 .../archived/helm/locations-api/values.yaml   |  66 +++++
 .../archived/helm/marketing-api/.helmignore   |  21 ++
 .../archived/helm/marketing-api/Chart.yaml    |   5 +
 .../helm/marketing-api/templates/NOTES.txt    |   9 +
 .../helm/marketing-api/templates/_helpers.tpl |  32 +++
 .../helm/marketing-api/templates/_names.tpl   |  60 +++++
 .../marketing-api/templates/configmap.yaml    |  27 ++
 .../marketing-api/templates/deployment.yaml   |  96 +++++++
 .../helm/marketing-api/templates/service.yaml |  19 ++
 .../archived/helm/marketing-api/values.yaml   |  70 ++++++
 .../helm/mobileshoppingagg/.helmignore        |  21 ++
 .../helm/mobileshoppingagg/Chart.yaml         |   5 +
 .../mobileshoppingagg/templates/NOTES.txt     |   8 +
 .../mobileshoppingagg/templates/_helpers.tpl  |  32 +++
 .../mobileshoppingagg/templates/_names.tpl    |  52 ++++
 .../templates/configmap.yaml                  |  29 +++
 .../templates/deployment.yaml                 |  96 +++++++
 .../mobileshoppingagg/templates/service.yaml  |  19 ++
 .../helm/mobileshoppingagg/values.yaml        |  85 +++++++
 .../k8s/archived/helm/nosql-data/.helmignore  |  21 ++
 .../k8s/archived/helm/nosql-data/Chart.yaml   |   5 +
 .../helm/nosql-data/templates/NOTES.txt       |   8 +
 .../helm/nosql-data/templates/_helpers.tpl    |  32 +++
 .../helm/nosql-data/templates/_names.tpl      |   8 +
 .../helm/nosql-data/templates/deployment.yaml |  43 ++++
 .../helm/nosql-data/templates/service.yaml    |  19 ++
 .../k8s/archived/helm/nosql-data/values.yaml  |  19 ++
 .../archived/helm/ordering-api/.helmignore    |  21 ++
 .../k8s/archived/helm/ordering-api/Chart.yaml |   5 +
 .../helm/ordering-api/templates/NOTES.txt     |   8 +
 .../helm/ordering-api/templates/_helpers.tpl  |  32 +++
 .../helm/ordering-api/templates/_names.tpl    |  51 ++++
 .../ordering-api/templates/configmap.yaml     |  19 ++
 .../ordering-api/templates/deployment.yaml    |  99 ++++++++
 .../helm/ordering-api/templates/service.yaml  |  23 ++
 .../archived/helm/ordering-api/values.yaml    |  69 +++++
 .../helm/ordering-backgroundtasks/.helmignore |  21 ++
 .../helm/ordering-backgroundtasks/Chart.yaml  |   5 +
 .../templates/NOTES.txt                       |   3 +
 .../templates/_helpers.tpl                    |  32 +++
 .../templates/_names.tpl                      |  51 ++++
 .../templates/configmap.yaml                  |  21 ++
 .../templates/deployment.yaml                 |  92 +++++++
 .../templates/service.yaml                    |  19 ++
 .../helm/ordering-backgroundtasks/values.yaml |  70 ++++++
 .../helm/ordering-signalrhub/.helmignore      |  21 ++
 .../helm/ordering-signalrhub/Chart.yaml       |   5 +
 .../ordering-signalrhub/templates/NOTES.txt   |   8 +
 .../templates/_helpers.tpl                    |  32 +++
 .../ordering-signalrhub/templates/_names.tpl  |  51 ++++
 .../templates/configmap.yaml                  |  18 ++
 .../templates/deployment.yaml                 |  70 ++++++
 .../templates/service.yaml                    |  19 ++
 .../helm/ordering-signalrhub/values.yaml      |  57 +++++
 .../k8s/archived/helm/payment-api/.helmignore |  21 ++
 .../k8s/archived/helm/payment-api/Chart.yaml  |   5 +
 .../helm/payment-api/templates/NOTES.txt      |   9 +
 .../helm/payment-api/templates/_helpers.tpl   |  32 +++
 .../helm/payment-api/templates/_names.tpl     |  51 ++++
 .../helm/payment-api/templates/configmap.yaml |  15 ++
 .../payment-api/templates/deployment.yaml     |  96 +++++++
 .../helm/payment-api/templates/service.yaml   |  19 ++
 .../k8s/archived/helm/payment-api/values.yaml |  56 +++++
 deploy/k8s/archived/helm/rabbitmq/.helmignore |  21 ++
 deploy/k8s/archived/helm/rabbitmq/Chart.yaml  |   5 +
 .../helm/rabbitmq/templates/NOTES.txt         |   8 +
 .../helm/rabbitmq/templates/_helpers.tpl      |  32 +++
 .../helm/rabbitmq/templates/_names.tpl        |   8 +
 .../helm/rabbitmq/templates/deployment.yaml   |  43 ++++
 .../helm/rabbitmq/templates/service.yaml      |  19 ++
 deploy/k8s/archived/helm/rabbitmq/values.yaml |  19 ++
 deploy/k8s/archived/helm/sql-data/.helmignore |  21 ++
 deploy/k8s/archived/helm/sql-data/Chart.yaml  |   5 +
 .../helm/sql-data/templates/NOTES.txt         |   8 +
 .../helm/sql-data/templates/_helpers.tpl      |  32 +++
 .../helm/sql-data/templates/_names.tpl        |   8 +
 .../helm/sql-data/templates/deployment.yaml   |  50 ++++
 .../helm/sql-data/templates/service.yaml      |  19 ++
 deploy/k8s/archived/helm/sql-data/values.yaml |  19 ++
 .../k8s/archived/helm/tls-support/.helmignore |  21 ++
 .../k8s/archived/helm/tls-support/Chart.yaml  |   5 +
 .../helm/tls-support/templates/_helpers.tpl   |  32 +++
 .../helm/tls-support/templates/issuer.yaml    |  17 ++
 .../helm/tls-support/values-prod.yaml         |   8 +
 .../helm/tls-support/values-staging.yaml      |   8 +
 .../archived/helm/webhooks-api/.helmignore    |  21 ++
 .../k8s/archived/helm/webhooks-api/Chart.yaml |   5 +
 .../helm/webhooks-api/templates/NOTES.txt     |   8 +
 .../helm/webhooks-api/templates/_helpers.tpl  |  32 +++
 .../helm/webhooks-api/templates/_names.tpl    |  60 +++++
 .../webhooks-api/templates/configmap.yaml     |  21 ++
 .../webhooks-api/templates/deployment.yaml    |  75 ++++++
 .../helm/webhooks-api/templates/ingress.yaml  |  46 ++++
 .../helm/webhooks-api/templates/service.yaml  |  19 ++
 .../archived/helm/webhooks-api/values.yaml    |  53 ++++
 .../archived/helm/webhooks-web/.helmignore    |  21 ++
 .../k8s/archived/helm/webhooks-web/Chart.yaml |   5 +
 .../helm/webhooks-web/templates/NOTES.txt     |   8 +
 .../helm/webhooks-web/templates/_helpers.tpl  |  32 +++
 .../helm/webhooks-web/templates/_names.tpl    |  60 +++++
 .../webhooks-web/templates/configmap.yaml     |  20 ++
 .../webhooks-web/templates/deployment.yaml    |  75 ++++++
 .../helm/webhooks-web/templates/ingress.yaml  |  45 ++++
 .../helm/webhooks-web/templates/service.yaml  |  19 ++
 .../archived/helm/webhooks-web/values.yaml    |  52 ++++
 deploy/k8s/archived/helm/webmvc/.helmignore   |  21 ++
 deploy/k8s/archived/helm/webmvc/Chart.yaml    |   5 +
 .../archived/helm/webmvc/templates/NOTES.txt  |   2 +
 .../helm/webmvc/templates/_helpers.tpl        |  32 +++
 .../archived/helm/webmvc/templates/_names.tpl |  60 +++++
 .../helm/webmvc/templates/configmap.yaml      |  26 ++
 .../helm/webmvc/templates/deployment.yaml     |  75 ++++++
 .../webmvc/templates/ingress-dockerk8s.yaml   |  33 +++
 .../helm/webmvc/templates/ingress.yaml        |  46 ++++
 .../helm/webmvc/templates/service.yaml        |  19 ++
 deploy/k8s/archived/helm/webmvc/values.yaml   |  61 +++++
 .../archived/helm/webshoppingagg/.helmignore  |  21 ++
 .../archived/helm/webshoppingagg/Chart.yaml   |   5 +
 .../helm/webshoppingagg/templates/NOTES.txt   |   8 +
 .../webshoppingagg/templates/_helpers.tpl     |  32 +++
 .../helm/webshoppingagg/templates/_names.tpl  |  52 ++++
 .../webshoppingagg/templates/configmap.yaml   |  29 +++
 .../webshoppingagg/templates/deployment.yaml  |  95 +++++++
 .../webshoppingagg/templates/service.yaml     |  19 ++
 .../archived/helm/webshoppingagg/values.yaml  |  87 +++++++
 deploy/k8s/archived/helm/webspa/.helmignore   |  21 ++
 deploy/k8s/archived/helm/webspa/Chart.yaml    |   5 +
 .../archived/helm/webspa/templates/NOTES.txt  |   2 +
 .../helm/webspa/templates/_helpers.tpl        |  32 +++
 .../archived/helm/webspa/templates/_names.tpl |  60 +++++
 .../helm/webspa/templates/configmap.yaml      |  27 ++
 .../helm/webspa/templates/deployment.yaml     |  75 ++++++
 .../helm/webspa/templates/ingress.yaml        |  45 ++++
 .../helm/webspa/templates/service.yaml        |  19 ++
 deploy/k8s/archived/helm/webspa/values.yaml   |  61 +++++
 .../k8s/archived/helm/webstatus/.helmignore   |  21 ++
 deploy/k8s/archived/helm/webstatus/Chart.yaml |   5 +
 .../helm/webstatus/templates/NOTES.txt        |   2 +
 .../helm/webstatus/templates/_helpers.tpl     |  32 +++
 .../helm/webstatus/templates/_names.tpl       |  50 ++++
 .../helm/webstatus/templates/configmap.yaml   |  54 ++++
 .../helm/webstatus/templates/deployment.yaml  |  75 ++++++
 .../helm/webstatus/templates/ingress.yaml     |  46 ++++
 .../helm/webstatus/templates/service.yaml     |  19 ++
 .../k8s/archived/helm/webstatus/values.yaml   |  95 +++++++
 .../k8s/archived/linkerd/basket-api-sp.yaml   |  42 ++++
 .../k8s/archived/linkerd/catalog-api-sp.yaml  |  47 ++++
 .../k8s/archived/nginx-ingress/local-cm.yaml  |  11 +
 .../local-dockerk8s/identityapi-cm-fix.yaml   |   3 +
 .../local-dockerk8s/mvc-cm-fix.yaml           |   3 +
 .../local-dockerk8s/mvc-fix.yaml              |  39 +++
 .../k8s/archived/nginx-ingress/local-svc.yaml |  21 ++
 .../k8s/archived/nginx-ingress/mandatory.yaml | 238 ++++++++++++++++++
 .../nginx-ingress/service-nodeport.yaml       |  22 ++
 .../archived/nodeports/rabbitmq-admin.yaml    |  12 +
 .../k8s/archived/nodeports/sql-service.yaml   |  12 +
 .../helm/apigwmm/templates/deployment.yaml    |   2 +-
 .../helm/apigwms/templates/deployment.yaml    |   2 +-
 .../helm/apigwwm/templates/deployment.yaml    |   2 +-
 .../helm/apigwws/templates/deployment.yaml    |   2 +-
 .../helm/basket-api/templates/deployment.yaml |   2 +-
 .../basket-data/templates/deployment.yaml     |   2 +-
 .../catalog-api/templates/deployment.yaml     |   2 +-
 deploy/k8s/helm/deploy-all-mac.ps1            | 156 ++++++++++++
 deploy/k8s/helm/deploy-all.ps1                |  18 +-
 deploy/k8s/helm/deploy-all.sh                 |   8 +-
 .../identity-api/templates/deployment.yaml    |   2 +-
 .../keystore-data/templates/deployment.yaml   |   2 +-
 .../locations-api/templates/deployment.yaml   |   2 +-
 .../marketing-api/templates/deployment.yaml   |   2 +-
 .../templates/deployment.yaml                 |   2 +-
 .../helm/nosql-data/templates/deployment.yaml |   2 +-
 .../ordering-api/templates/deployment.yaml    |   2 +-
 .../templates/deployment.yaml                 |   2 +-
 .../templates/deployment.yaml                 |   2 +-
 .../payment-api/templates/deployment.yaml     |   2 +-
 .../helm/rabbitmq/templates/deployment.yaml   |   2 +-
 .../helm/sql-data/templates/deployment.yaml   |   2 +-
 .../webhooks-api/templates/deployment.yaml    |   2 +-
 .../webhooks-web/templates/deployment.yaml    |   2 +-
 .../k8s/helm/webmvc/templates/deployment.yaml |   2 +-
 .../webshoppingagg/templates/deployment.yaml  |   2 +-
 .../k8s/helm/webspa/templates/deployment.yaml |   2 +-
 .../helm/webstatus/templates/deployment.yaml  |   2 +-
 deploy/k8s/nginx-ingress/mandatory.yaml       |   2 +-
 300 files changed, 9522 insertions(+), 36 deletions(-)
 create mode 100644 deploy/k8s/archived/README.md
 create mode 100644 deploy/k8s/archived/create-aks.ps1
 create mode 100644 deploy/k8s/archived/dashboard-adminuser.yaml
 create mode 100644 deploy/k8s/archived/enable-tls.ps1
 create mode 100644 deploy/k8s/archived/helm-rbac.yaml
 create mode 100644 deploy/k8s/archived/helm/aks-httpaddon-cfg.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/.helmignore
 create mode 100644 deploy/k8s/archived/helm/apigwmm/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/envoy.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/envoy-cm.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwmm/values.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/.helmignore
 create mode 100644 deploy/k8s/archived/helm/apigwms/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/envoy.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/envoy-cm.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwms/values.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/.helmignore
 create mode 100644 deploy/k8s/archived/helm/apigwwm/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/envoy.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/envoy-cm.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwwm/values.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/.helmignore
 create mode 100644 deploy/k8s/archived/helm/apigwws/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/envoy.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/envoy-cm.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/apigwws/values.yaml
 create mode 100644 deploy/k8s/archived/helm/app.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/basket-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-data/.helmignore
 create mode 100644 deploy/k8s/archived/helm/basket-data/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-data/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/basket-data/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/basket-data/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-data/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/basket-data/values.yaml
 create mode 100644 deploy/k8s/archived/helm/catalog-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/catalog-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/catalog-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/catalog-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/deploy-all.ps1
 create mode 100644 deploy/k8s/archived/helm/deploy-all.sh
 create mode 100644 deploy/k8s/archived/helm/eshop-common/.helmignore
 create mode 100644 deploy/k8s/archived/helm/eshop-common/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/eshop-common/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/eshop-common/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/eshop-common/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/eshop-common/templates/secret.yaml
 create mode 100644 deploy/k8s/archived/helm/eshop-common/values.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/identity-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/ingress-dockerk8s.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/identity-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/inf.yaml
 create mode 100644 deploy/k8s/archived/helm/ingress_values.yaml
 create mode 100644 deploy/k8s/archived/helm/ingress_values_dockerk8s.yaml
 create mode 100644 deploy/k8s/archived/helm/ingress_values_linkerd.yaml
 create mode 100644 deploy/k8s/archived/helm/keystore-data/.helmignore
 create mode 100644 deploy/k8s/archived/helm/keystore-data/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/keystore-data/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/keystore-data/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/keystore-data/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/keystore-data/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/keystore-data/values.yaml
 create mode 100644 deploy/k8s/archived/helm/locations-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/locations-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/locations-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/locations-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/marketing-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/marketing-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/marketing-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/marketing-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/.helmignore
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/mobileshoppingagg/values.yaml
 create mode 100644 deploy/k8s/archived/helm/nosql-data/.helmignore
 create mode 100644 deploy/k8s/archived/helm/nosql-data/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/nosql-data/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/nosql-data/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/nosql-data/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/nosql-data/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/nosql-data/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/nosql-data/values.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/ordering-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/.helmignore
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-backgroundtasks/values.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/.helmignore
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/ordering-signalrhub/values.yaml
 create mode 100644 deploy/k8s/archived/helm/payment-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/payment-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/payment-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/payment-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/.helmignore
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/rabbitmq/values.yaml
 create mode 100644 deploy/k8s/archived/helm/sql-data/.helmignore
 create mode 100644 deploy/k8s/archived/helm/sql-data/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/sql-data/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/sql-data/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/sql-data/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/sql-data/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/sql-data/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/sql-data/values.yaml
 create mode 100644 deploy/k8s/archived/helm/tls-support/.helmignore
 create mode 100644 deploy/k8s/archived/helm/tls-support/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/tls-support/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/tls-support/templates/issuer.yaml
 create mode 100644 deploy/k8s/archived/helm/tls-support/values-prod.yaml
 create mode 100644 deploy/k8s/archived/helm/tls-support/values-staging.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-api/values.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webhooks-web/values.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webmvc/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/ingress-dockerk8s.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webmvc/values.yaml
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webshoppingagg/values.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webspa/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webspa/values.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/.helmignore
 create mode 100644 deploy/k8s/archived/helm/webstatus/Chart.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/NOTES.txt
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/_helpers.tpl
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/_names.tpl
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/configmap.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/deployment.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/ingress.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/templates/service.yaml
 create mode 100644 deploy/k8s/archived/helm/webstatus/values.yaml
 create mode 100644 deploy/k8s/archived/linkerd/basket-api-sp.yaml
 create mode 100644 deploy/k8s/archived/linkerd/catalog-api-sp.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/local-cm.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-fix.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/local-svc.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/mandatory.yaml
 create mode 100644 deploy/k8s/archived/nginx-ingress/service-nodeport.yaml
 create mode 100644 deploy/k8s/archived/nodeports/rabbitmq-admin.yaml
 create mode 100644 deploy/k8s/archived/nodeports/sql-service.yaml
 create mode 100644 deploy/k8s/helm/deploy-all-mac.ps1

diff --git a/deploy/k8s/archived/README.md b/deploy/k8s/archived/README.md
new file mode 100644
index 000000000..3e464c3d1
--- /dev/null
+++ b/deploy/k8s/archived/README.md
@@ -0,0 +1,8 @@
+# Kubernetes deployment
+
+This folder contains the files required to deploy eShopOnContainers to a Kubernetes cluster.
+
+For more information see the following articles in the [wiki](https://github.com/dotnet-architecture/eShopOnContainers/wiki):
+
+- [Deploy to Local Kubernetes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Local-Kubernetes)
+- [Deploy to Azure Kubernetes Service (AKS)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS))
diff --git a/deploy/k8s/archived/create-aks.ps1 b/deploy/k8s/archived/create-aks.ps1
new file mode 100644
index 000000000..327f5fd6b
--- /dev/null
+++ b/deploy/k8s/archived/create-aks.ps1
@@ -0,0 +1,50 @@
+Param(
+    [parameter(Mandatory=$true)][string]$resourceGroupName,
+    [parameter(Mandatory=$true)][string]$location,
+    [parameter(Mandatory=$true)][string]$serviceName,
+    [parameter(Mandatory=$true)][string]$dnsNamePrefix,
+    [parameter(Mandatory=$false)][string]$registryName,
+    [parameter(Mandatory=$true)][bool]$createAcr=$true,
+    [parameter(Mandatory=$false)][int]$nodeCount=3,
+    [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2",
+    [parameter(Mandatory=$false)][bool]$enableHttpApplicationAddon=$true,
+    [parameter(Mandatory=$false)][bool]$enableAzureMonitoring=$false,
+    [parameter(Mandatory=$false)][ValidateSet("VirtualMachineScaleSets","AvailabilitySet",IgnoreCase=$true)]$vmSetType="VirtualMachineScaleSets"
+)
+
+# Create resource group
+Write-Host "Creating Azure Resource Group..." -ForegroundColor Yellow
+az group create --name=$resourceGroupName --location=$location
+
+if ($createAcr -eq $true) {
+    # Create Azure Container Registry
+    if ([string]::IsNullOrEmpty($registryName)) {
+        $registryName=$serviceName
+    }
+    Write-Host "Creating Azure Container Registry named $registryName" -ForegroundColor Yellow
+    az acr create -n $registryName -g $resourceGroupName -l $location  --admin-enabled true --sku Basic
+}
+
+# Create kubernetes cluster in AKS
+Write-Host "Creating AKS $resourceGroupName/$serviceName" -ForegroundColor Yellow
+az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsNamePrefix --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize --vm-set-type $vmSetType
+
+if ($enableHttpApplicationAddon) {
+    Write-Host "Enabling Http Applciation Routing in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons http_application_routing
+}
+
+if ($enableAzureMonitoring) {
+    Write-Host "Enabling Azure Monitoring in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons monitoring
+}
+
+# Retrieve kubernetes cluster configuration and save it under ~/.kube/config
+Write-Host "Getting Kubernetes config..." -ForegroundColor Yellow
+az aks get-credentials --resource-group=$resourceGroupName --name=$serviceName
+
+if ($createAcr -eq $true) {
+    # Show ACR credentials
+    Write-Host "ACR $registryName credentials:" -ForegroundColor Yellow
+    az acr credential show -n $registryName
+}
diff --git a/deploy/k8s/archived/dashboard-adminuser.yaml b/deploy/k8s/archived/dashboard-adminuser.yaml
new file mode 100644
index 000000000..9f24303cd
--- /dev/null
+++ b/deploy/k8s/archived/dashboard-adminuser.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: admin-user
+  namespace: kubernetes-dashboard
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: admin-user
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: admin-user
+  namespace: kubernetes-dashboard
diff --git a/deploy/k8s/archived/enable-tls.ps1 b/deploy/k8s/archived/enable-tls.ps1
new file mode 100644
index 000000000..cd4ef3ffe
--- /dev/null
+++ b/deploy/k8s/archived/enable-tls.ps1
@@ -0,0 +1,20 @@
+Param (
+[parameter(Mandatory=$false)][string]$aksName="",
+[parameter(Mandatory=$false)][string]$aksRg=""
+)
+
+if ($aksName -and $aksRg) {
+
+    $aks=$(az aks show -n $aksName -g $aksRg -o json | ConvertFrom-Json)
+    if (-not $aks) {
+        Write-Host "AKS $aksName not found in RG $aksRg" -ForegroundColor Red
+        exit 1
+    }
+
+    Write-Host "Switching kubectl context to $aksRg/$aksName" -ForegroundColor Yellow
+    az aks get-credentials -g $aksRg -n $aksName
+}
+
+Write-Host "Installing cert-manager on current cluster"
+
+kubectl apply  --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.11.0/cert-manager.yaml --validate=false
diff --git a/deploy/k8s/archived/helm-rbac.yaml b/deploy/k8s/archived/helm-rbac.yaml
new file mode 100644
index 000000000..b6180329a
--- /dev/null
+++ b/deploy/k8s/archived/helm-rbac.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tiller
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: tiller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: tiller
+    namespace: kube-system
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/aks-httpaddon-cfg.yaml b/deploy/k8s/archived/helm/aks-httpaddon-cfg.yaml
new file mode 100644
index 000000000..b9576b0b6
--- /dev/null
+++ b/deploy/k8s/archived/helm/aks-httpaddon-cfg.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+#    addonmanager.kubernetes.io/mode: Reconcile
+    app: addon-http-application-routing-ingress-nginx
+    kubernetes.io/cluster-service: "true"
+  name: addon-http-application-routing-nginx-configuration
+  namespace: kube-system
+data:
+  proxy-buffer-size: "128k"
+  proxy-buffers: "4 256k"
diff --git a/deploy/k8s/archived/helm/apigwmm/.helmignore b/deploy/k8s/archived/helm/apigwmm/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/apigwmm/Chart.yaml b/deploy/k8s/archived/helm/apigwmm/Chart.yaml
new file mode 100644
index 000000000..50b3d07c6
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwmm
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/apigwmm/envoy.yaml b/deploy/k8s/archived/helm/apigwmm/envoy.yaml
new file mode 100644
index 000000000..54b1afa06
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/envoy.yaml
@@ -0,0 +1,75 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "m-short"
+                match:
+                  prefix: "/m/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/marketing-api/"
+                  cluster: marketing
+              - name: "m-long"
+                match:
+                  prefix: "/marketing-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: marketing
+          http_filters:
+          - name: envoy.router  
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}          
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"  
+                request_host: "%REQ(HOST)%"  
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%" 
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"    
+              path: "/tmp/access.log"                 
+  clusters:
+  - name: marketing
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: marketing-api
+        port_value: 80
+  - name: locations
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: locations-api
+        port_value: 80
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/NOTES.txt b/deploy/k8s/archived/helm/apigwmm/templates/NOTES.txt
new file mode 100644
index 000000000..30ef33447
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop API Gateway for Mobile Marketing services installed
+----------------------------------------------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/_helpers.tpl b/deploy/k8s/archived/helm/apigwmm/templates/_helpers.tpl
new file mode 100644
index 000000000..fd3d89212
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwmm.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwmm.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwmm.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/_names.tpl b/deploy/k8s/archived/helm/apigwmm/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/deployment.yaml b/deploy/k8s/archived/helm/apigwmm/templates/deployment.yaml
new file mode 100644
index 000000000..f93706bb9
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/deployment.yaml
@@ -0,0 +1,110 @@
+{{- $name := include "apigwmm.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwmm.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "apigwmm.name" . }}
+    chart: {{ template "apigwmm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwmm.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwmm.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml    
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}          
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}          
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/envoy-cm.yaml b/deploy/k8s/archived/helm/apigwmm/templates/envoy-cm.yaml
new file mode 100644
index 000000000..71728d084
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/envoy-cm.yaml
@@ -0,0 +1,14 @@
+{{- $name := include "apigwmm.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwmm.name" . }}
+    chart: {{ template "apigwmm.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig  | indent 2 }}
+
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/ingress.yaml b/deploy/k8s/archived/helm/apigwmm/templates/ingress.yaml
new file mode 100644
index 000000000..44e9a90fc
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobilemarketingapigw -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwmm.fullname" . }}
+  labels:
+    app: {{ template "apigwmm.name" . }}
+    chart: {{ template "apigwmm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts  }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/apigwmm/templates/service.yaml b/deploy/k8s/archived/helm/apigwmm/templates/service.yaml
new file mode 100644
index 000000000..286277c7d
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.mobilemarketingapigw }}
+  labels:
+    app: {{ template "apigwmm.name" . }}
+    chart: {{ template "apigwmm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin    
+  selector:
+    app: {{ template "apigwmm.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/apigwmm/values.yaml b/deploy/k8s/archived/helm/apigwmm/values.yaml
new file mode 100644
index 000000000..21f12f27a
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwmm/values.yaml
@@ -0,0 +1,45 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /mobilemarketingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001  
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwms/.helmignore b/deploy/k8s/archived/helm/apigwms/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/apigwms/Chart.yaml b/deploy/k8s/archived/helm/apigwms/Chart.yaml
new file mode 100644
index 000000000..3ad3fdf46
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwms
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/apigwms/envoy.yaml b/deploy/k8s/archived/helm/apigwms/envoy.yaml
new file mode 100644
index 000000000..1ae8c45a1
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/envoy.yaml
@@ -0,0 +1,139 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80
diff --git a/deploy/k8s/archived/helm/apigwms/templates/NOTES.txt b/deploy/k8s/archived/helm/apigwms/templates/NOTES.txt
new file mode 100644
index 000000000..74b3eedda
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop API Gateway for Mobile Shopping services installed
+--------------------------------------------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwms/templates/_helpers.tpl b/deploy/k8s/archived/helm/apigwms/templates/_helpers.tpl
new file mode 100644
index 000000000..2ae403c2f
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwms.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwms.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwms.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/apigwms/templates/_names.tpl b/deploy/k8s/archived/helm/apigwms/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwms/templates/deployment.yaml b/deploy/k8s/archived/helm/apigwms/templates/deployment.yaml
new file mode 100644
index 000000000..2c5703103
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/deployment.yaml
@@ -0,0 +1,110 @@
+{{- $name := include "apigwms.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwms.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwms.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwms.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}         
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/apigwms/templates/envoy-cm.yaml b/deploy/k8s/archived/helm/apigwms/templates/envoy-cm.yaml
new file mode 100644
index 000000000..76da5832b
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/envoy-cm.yaml
@@ -0,0 +1,14 @@
+{{- $name := include "apigwms.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+
diff --git a/deploy/k8s/archived/helm/apigwms/templates/ingress.yaml b/deploy/k8s/archived/helm/apigwms/templates/ingress.yaml
new file mode 100644
index 000000000..bc0c6d05b
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/ingress.yaml
@@ -0,0 +1,47 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobileshoppingapigw -}}
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwms.fullname" . }}
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/apigwms/templates/service.yaml b/deploy/k8s/archived/helm/apigwms/templates/service.yaml
new file mode 100644
index 000000000..aa087d428
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.mobileshoppingapigw }}
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin     
+  selector:
+    app: {{ template "apigwms.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/apigwms/values.yaml b/deploy/k8s/archived/helm/apigwms/values.yaml
new file mode 100644
index 000000000..4a92d85e9
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwms/values.yaml
@@ -0,0 +1,45 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /mobileshoppingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001  
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwwm/.helmignore b/deploy/k8s/archived/helm/apigwwm/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/apigwwm/Chart.yaml b/deploy/k8s/archived/helm/apigwwm/Chart.yaml
new file mode 100644
index 000000000..4c2082969
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwwm
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/apigwwm/envoy.yaml b/deploy/k8s/archived/helm/apigwwm/envoy.yaml
new file mode 100644
index 000000000..c6f3421de
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/envoy.yaml
@@ -0,0 +1,75 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "m-short"
+                match:
+                  prefix: "/m/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/marketing-api/"
+                  cluster: marketing
+              - name: "m-long"
+                match:
+                  prefix: "/marketing-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: marketing
+          http_filters:
+          - name: envoy.router      
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}          
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"  
+                request_host: "%REQ(HOST)%"  
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%" 
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"     
+              path: "/tmp/access.log"
+  clusters:
+  - name: marketing
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: marketing-api
+        port_value: 80
+  - name: locations
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: locations-api
+        port_value: 80
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/NOTES.txt b/deploy/k8s/archived/helm/apigwwm/templates/NOTES.txt
new file mode 100644
index 000000000..3420c97c8
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop API Gateway for Web Marketing services installed
+------------------------------------------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/_helpers.tpl b/deploy/k8s/archived/helm/apigwwm/templates/_helpers.tpl
new file mode 100644
index 000000000..194cf96ca
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwwm.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwwm.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwwm.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/_names.tpl b/deploy/k8s/archived/helm/apigwwm/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/deployment.yaml b/deploy/k8s/archived/helm/apigwwm/templates/deployment.yaml
new file mode 100644
index 000000000..6ceb1fa1b
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/deployment.yaml
@@ -0,0 +1,110 @@
+{{- $name := include "apigwwm.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwwm.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "apigwwm.name" . }}
+    chart: {{ template "apigwwm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwwm.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwwm.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/envoy-cm.yaml b/deploy/k8s/archived/helm/apigwwm/templates/envoy-cm.yaml
new file mode 100644
index 000000000..4d6307e36
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/envoy-cm.yaml
@@ -0,0 +1,14 @@
+{{- $name := include "apigwwm.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwwm.name" . }}
+    chart: {{ template "apigwwm.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 -}} 
+
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/ingress.yaml b/deploy/k8s/archived/helm/apigwwm/templates/ingress.yaml
new file mode 100644
index 000000000..00d54c226
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/ingress.yaml
@@ -0,0 +1,47 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webmarketingapigw -}}
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwwm.fullname" . }}
+  labels:
+    app: {{ template "apigwwm.name" . }}
+    chart: {{ template "apigwwm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/apigwwm/templates/service.yaml b/deploy/k8s/archived/helm/apigwwm/templates/service.yaml
new file mode 100644
index 000000000..cb11cc665
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webmarketingapigw }}
+  labels:
+    app: {{ template "apigwwm.name" . }}
+    chart: {{ template "apigwwm.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin      
+  selector:
+    app: {{ template "apigwwm.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/apigwwm/values.yaml b/deploy/k8s/archived/helm/apigwwm/values.yaml
new file mode 100644
index 000000000..d866c2d3c
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwwm/values.yaml
@@ -0,0 +1,46 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webmarketingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001  
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwws/.helmignore b/deploy/k8s/archived/helm/apigwws/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/apigwws/Chart.yaml b/deploy/k8s/archived/helm/apigwws/Chart.yaml
new file mode 100644
index 000000000..0a6c34e62
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwws
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/apigwws/envoy.yaml b/deploy/k8s/archived/helm/apigwws/envoy.yaml
new file mode 100644
index 000000000..1ae8c45a1
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/envoy.yaml
@@ -0,0 +1,139 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80
diff --git a/deploy/k8s/archived/helm/apigwws/templates/NOTES.txt b/deploy/k8s/archived/helm/apigwws/templates/NOTES.txt
new file mode 100644
index 000000000..8214afb1e
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop API Gateway for Web Shopping services installed
+-----------------------------------------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwws/templates/_helpers.tpl b/deploy/k8s/archived/helm/apigwws/templates/_helpers.tpl
new file mode 100644
index 000000000..b6aa6b483
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwws.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwws.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwws.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/apigwws/templates/_names.tpl b/deploy/k8s/archived/helm/apigwws/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/apigwws/templates/deployment.yaml b/deploy/k8s/archived/helm/apigwws/templates/deployment.yaml
new file mode 100644
index 000000000..3aedde6dd
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/deployment.yaml
@@ -0,0 +1,109 @@
+{{- $name := include "apigwws.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwws.fullname" . }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwws.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwws.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}        
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}      
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/apigwws/templates/envoy-cm.yaml b/deploy/k8s/archived/helm/apigwws/templates/envoy-cm.yaml
new file mode 100644
index 000000000..6d41bd2e2
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/envoy-cm.yaml
@@ -0,0 +1,14 @@
+{{- $name := include "apigwws.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+
diff --git a/deploy/k8s/archived/helm/apigwws/templates/ingress.yaml b/deploy/k8s/archived/helm/apigwws/templates/ingress.yaml
new file mode 100644
index 000000000..945038081
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webshoppingapigw -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwws.fullname" . }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/apigwws/templates/service.yaml b/deploy/k8s/archived/helm/apigwws/templates/service.yaml
new file mode 100644
index 000000000..55f6daf3f
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webshoppingapigw }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin
+  selector:
+    app: {{ template "apigwws.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/apigwws/values.yaml b/deploy/k8s/archived/helm/apigwws/values.yaml
new file mode 100644
index 000000000..fb1182dac
--- /dev/null
+++ b/deploy/k8s/archived/helm/apigwws/values.yaml
@@ -0,0 +1,46 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webshoppingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/app.yaml b/deploy/k8s/archived/helm/app.yaml
new file mode 100644
index 000000000..e83ea2823
--- /dev/null
+++ b/deploy/k8s/archived/helm/app.yaml
@@ -0,0 +1,46 @@
+# This helm values file defines app-based settings
+# Charts use those values, so this file **MUST** be included in all chart releases
+
+app:                                                    # app global settings
+  name: "my-eshop"                                      # Override for custom app name
+  ingress:                                              # ingress related settings
+    entries:
+      basket: basket-api                                # ingress entry for basket api
+      catalog: catalog-api                              # ingress entry for catalog api
+      ordering: ordering-api                            # ingress entry for ordering api
+      identity: identity                                # ingress entry for identity api
+      mvc: webmvc                                       # ingress entry for web mvc
+      spa: ""                                           # ingress entry for web spa
+      status: webstatus                                 # ingress entry for web status
+      webshoppingapigw: webshoppingapigw                # ingress entry for web shopping Agw
+      webmarketingapigw: webmarketingapigw              # ingress entry for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw        # ingress entry for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw          # ingress entry for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # ingress entry for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # ingress entry for mobile shopping aggregator
+      payment: payment-api                              # ingress entry for payment api
+      locations: locations-api                          # ingress entry for locations api
+      marketing: marketing-api                          # ingress entry for marketing api
+      webhooks: webhooks-api                            # ingress entry for webhooks api
+      webhooksweb: webhooks-web                         # ingress entry for webhooks web demo client
+  svc:
+      basket: basket-api                                # service name for basket api
+      catalog: catalog-api                              # service name for catalog api
+      ordering: ordering-api                            # service name for ordering api
+      orderingbackgroundtasks: ordering-backgroundtasks # service name for orderingbackgroundtasks
+      orderingsignalrhub: ordering-signalrhub           # service name for orderingsignalrhub
+      identity: identity-api                            # service name for identity api
+      mvc: webmvc                                       # service name for web mvc
+      spa: webspa                                       # service name for web spa
+      status: webstatus                                 # service name for web status
+      webshoppingapigw: webshoppingapigw                # service name for web shopping Agw
+      webmarketingapigw: webmarketingapigw              # service name for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw        # service name for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw          # service name for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # service name for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # service name for mobile shopping aggregator
+      payment: payment-api                              # service name for payment api
+      locations: locations-api                          # service name for locations api
+      marketing: marketing-api                          # service name for marketing ap
+      webhooks: webhooks-api                            # service name for webhooks api
+      webhooksweb: webhooks-client                      # service name for webhooks web
diff --git a/deploy/k8s/archived/helm/basket-api/.helmignore b/deploy/k8s/archived/helm/basket-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/basket-api/Chart.yaml b/deploy/k8s/archived/helm/basket-api/Chart.yaml
new file mode 100644
index 000000000..fd3e01486
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: basket-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/basket-api/templates/NOTES.txt b/deploy/k8s/archived/helm/basket-api/templates/NOTES.txt
new file mode 100644
index 000000000..8ba2c89ee
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Basket API installed.
+--------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/basket-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/basket-api/templates/_helpers.tpl
new file mode 100644
index 000000000..550eb2e6c
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "basket-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "basket-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "basket-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/basket-api/templates/_names.tpl b/deploy/k8s/archived/helm/basket-api/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/basket-api/templates/configmap.yaml b/deploy/k8s/archived/helm/basket-api/templates/configmap.yaml
new file mode 100644
index 000000000..2de0e28c7
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/configmap.yaml
@@ -0,0 +1,18 @@
+{{- $name := include "basket-api.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  basket__ConnectionString: {{ .Values.inf.redis.basket.constr }}
+  urls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  basket__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/basket-api/templates/deployment.yaml b/deploy/k8s/archived/helm/basket-api/templates/deployment.yaml
new file mode 100644
index 000000000..dc90666f5
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/deployment.yaml
@@ -0,0 +1,99 @@
+{{- $name := include "basket-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "basket-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "basket-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "basket-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}        
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet: 
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}        
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP                
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/basket-api/templates/service.yaml b/deploy/k8s/archived/helm/basket-api/templates/service.yaml
new file mode 100644
index 000000000..1783c59aa
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.basket }}
+  labels:
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+  selector:
+    app: {{ template "basket-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/basket-api/values.yaml b/deploy/k8s/archived/helm/basket-api/values.yaml
new file mode 100644
index 000000000..121de02de
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-api/values.yaml
@@ -0,0 +1,63 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /basket-api
+
+image:
+  repository: eshop/basket.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81  
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: basket__ConnectionString
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+    - name: UseLoadTest
+      key: basket__EnableLoadTest
+  # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"      
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
+
+ingress:
+  enabled: false
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/basket-data/.helmignore b/deploy/k8s/archived/helm/basket-data/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/basket-data/Chart.yaml b/deploy/k8s/archived/helm/basket-data/Chart.yaml
new file mode 100644
index 000000000..67ceddee1
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: basket-data
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/basket-data/templates/NOTES.txt b/deploy/k8s/archived/helm/basket-data/templates/NOTES.txt
new file mode 100644
index 000000000..c10513333
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Redis for keystore data installed
+----------------------------------------
+
+Redis is not directly exposed outside cluster. If need to access it from outside use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/basket-data/templates/_helpers.tpl b/deploy/k8s/archived/helm/basket-data/templates/_helpers.tpl
new file mode 100644
index 000000000..74b51b089
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "basket-data.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "basket-data.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "basket-data.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/basket-data/templates/deployment.yaml b/deploy/k8s/archived/helm/basket-data/templates/deployment.yaml
new file mode 100644
index 000000000..8ccceceeb
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/templates/deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "basket-data.fullname" . }}
+  labels:
+    app: {{ template "basket-data.name" . }}
+    chart: {{ template "basket-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "basket-data.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "basket-data.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 6379
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/deploy/k8s/archived/helm/basket-data/templates/service.yaml b/deploy/k8s/archived/helm/basket-data/templates/service.yaml
new file mode 100644
index 000000000..98b8cc3bd
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.inf.redis.basket.svc }}
+  labels:
+    app: {{ template "basket-data.name" . }}
+    chart: {{ template "basket-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "basket-data.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/basket-data/values.yaml b/deploy/k8s/archived/helm/basket-data/values.yaml
new file mode 100644
index 000000000..17cc75ee7
--- /dev/null
+++ b/deploy/k8s/archived/helm/basket-data/values.yaml
@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: redis
+  tag: 4.0.10
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 6379
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deploy/k8s/archived/helm/catalog-api/.helmignore b/deploy/k8s/archived/helm/catalog-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/catalog-api/Chart.yaml b/deploy/k8s/archived/helm/catalog-api/Chart.yaml
new file mode 100644
index 000000000..a143a0afe
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: catalog-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/NOTES.txt b/deploy/k8s/archived/helm/catalog-api/templates/NOTES.txt
new file mode 100644
index 000000000..1f01a2b92
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/NOTES.txt
@@ -0,0 +1,9 @@
+eShop Catalog API installed.
+----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "catalog-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
+
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/catalog-api/templates/_helpers.tpl
new file mode 100644
index 000000000..6fd128e77
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "catalog-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "catalog-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "catalog-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/_names.tpl b/deploy/k8s/archived/helm/catalog-api/templates/_names.tpl
new file mode 100644
index 000000000..605e92e7e
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/configmap.yaml b/deploy/k8s/archived/helm/catalog-api/templates/configmap.yaml
new file mode 100644
index 000000000..292b9e9b9
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/configmap.yaml
@@ -0,0 +1,21 @@
+{{- $name := include "catalog-api.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  catalog__PicBaseUrl: {{ $protocol }}://{{ $webshoppingapigw }}/c/api/v1/catalog/items/[0]/pic/
+  catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/deployment.yaml b/deploy/k8s/archived/helm/catalog-api/templates/deployment.yaml
new file mode 100644
index 000000000..33a0ad5b4
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/deployment.yaml
@@ -0,0 +1,99 @@
+{{- $name := include "catalog-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "catalog-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "catalog-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "catalog-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}               
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/catalog-api/templates/service.yaml b/deploy/k8s/archived/helm/catalog-api/templates/service.yaml
new file mode 100644
index 000000000..f634a7088
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.catalog }}
+  labels:
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc     
+  selector:
+    app: {{ template "catalog-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/catalog-api/values.yaml b/deploy/k8s/archived/helm/catalog-api/values.yaml
new file mode 100644
index 000000000..0de49b7f6
--- /dev/null
+++ b/deploy/k8s/archived/helm/catalog-api/values.yaml
@@ -0,0 +1,63 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /catalog-api
+
+image:
+  repository: eshop/catalog.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: catalog__ConnectionString
+    - name: PicBaseUrl
+      key: catalog__PicBaseUrl
+    - name: AzureStorageEnabled
+      key: catalog__AzureStorageEnabled
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
+
diff --git a/deploy/k8s/archived/helm/deploy-all.ps1 b/deploy/k8s/archived/helm/deploy-all.ps1
new file mode 100644
index 000000000..1711c0c2c
--- /dev/null
+++ b/deploy/k8s/archived/helm/deploy-all.ps1
@@ -0,0 +1,149 @@
+Param(
+    [parameter(Mandatory=$false)][string]$registry,
+    [parameter(Mandatory=$false)][string]$dockerUser,
+    [parameter(Mandatory=$false)][string]$dockerPassword,
+    [parameter(Mandatory=$false)][string]$externalDns,
+    [parameter(Mandatory=$false)][string]$appName="eshop",
+    [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
+    [parameter(Mandatory=$false)][bool]$deployCharts=$true,
+    [parameter(Mandatory=$false)][bool]$clean=$true,
+    [parameter(Mandatory=$false)][string]$aksName="",
+    [parameter(Mandatory=$false)][string]$aksRg="",
+    [parameter(Mandatory=$false)][string]$imageTag="latest",
+    [parameter(Mandatory=$false)][bool]$useLocalk8s=$false,
+    [parameter(Mandatory=$false)][bool]$useMesh=$false,
+    [parameter(Mandatory=$false)][string][ValidateSet('Always','IfNotPresent','Never', IgnoreCase=$false)]$imagePullPolicy="Always",
+    [parameter(Mandatory=$false)][string][ValidateSet('prod','staging','none','custom', IgnoreCase=$false)]$sslSupport = "none",
+    [parameter(Mandatory=$false)][string]$tlsSecretName = "eshop-tls-custom",
+    [parameter(Mandatory=$false)][string]$chartsToDeploy="*",
+    [parameter(Mandatory=$false)][string]$ingressMeshAnnotationsFile="ingress_values_linkerd.yaml"
+    )
+
+function Install-Chart  {
+    Param([string]$chart,[string]$initialOptions, [bool]$customRegistry)
+    $options=$initialOptions
+    if ($sslEnabled) {
+        $options = "$options --set ingress.tls[0].secretName=$tlsSecretName --set ingress.tls[0].hosts={$dns}" 
+        if ($sslSupport -ne "custom") {
+            $options = "$options --set inf.tls.issuer=$sslIssuer"
+        }
+    }
+    if ($customRegistry) {
+        $options = "$options --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret"
+    }
+    
+    if ($chart -ne "eshop-common" -or $customRegistry)  {       # eshop-common is ignored when no secret must be deployed        
+        $command = "install $options --name=$appName-$chart $chart"
+        Write-Host "Helm Command: helm $command" -ForegroundColor Gray
+        Invoke-Expression 'cmd /c "helm $command"'
+    }
+}
+
+$dns = $externalDns
+$sslEnabled=$false
+$sslIssuer=""
+
+if ($sslSupport -eq "staging") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-staging"
+    $sslIssuer="letsencrypt-staging"
+}
+elseif ($sslSupport -eq "prod") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-prod"
+    $sslIssuer="letsencrypt-prod"
+}
+elseif ($sslSupport -eq "custom") {
+    $sslEnabled=$true
+}
+
+$ingressValuesFile="ingress_values.yaml"
+
+if ($useLocalk8s -eq $true) {
+    $ingressValuesFile="ingress_values_dockerk8s.yaml"
+    $dns="localhost"
+}
+
+if ($externalDns -eq "aks") {
+    if  ([string]::IsNullOrEmpty($aksName) -or [string]::IsNullOrEmpty($aksRg)) {
+        Write-Host "Error: When using -dns aks, MUST set -aksName and -aksRg too." -ForegroundColor Red
+        exit 1
+    }
+    Write-Host "Getting DNS of AKS of AKS $aksName (in resource group $aksRg)..." -ForegroundColor Green
+    $dns = $(az aks show -n $aksName  -g $aksRg --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName)
+    if ([string]::IsNullOrEmpty($dns)) {
+        Write-Host "Error getting DNS of AKS $aksName (in resource group $aksRg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged & in version 2.0.37 or higher" -ForegroundColor Red
+        exit 1
+    }
+    $dns = $dns -replace '[\"]'
+    Write-Host "DNS base found is $dns. Will use $appName.$dns for the app!" -ForegroundColor Green
+    $dns = "$appName.$dns"
+}
+
+# Initialization & check commands
+if ([string]::IsNullOrEmpty($dns)) {
+    Write-Host "No DNS specified. Ingress resources will be bound to public ip" -ForegroundColor Yellow
+    if ($sslEnabled) {
+        Write-Host "Can't bound SSL to public IP. DNS is mandatory when using TLS" -ForegroundColor Red
+        exit 1
+    }
+}
+
+if ($useLocalk8s -and $sslEnabled) {
+    Write-Host "SSL can'be enabled on local K8s." -ForegroundColor Red
+    exit 1
+}
+
+if ($clean) {
+    Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
+    helm delete --purge $(helm ls -q eshop) 
+    Write-Host "Previous releases deleted" -ForegroundColor Green
+}
+
+$useCustomRegistry=$false
+
+if (-not [string]::IsNullOrEmpty($registry)) {
+    $useCustomRegistry=$true
+    if ([string]::IsNullOrEmpty($dockerUser) -or [string]::IsNullOrEmpty($dockerPassword)) {
+        Write-Host "Error: Must use -dockerUser AND -dockerPassword if specifying custom registry" -ForegroundColor Red
+        exit 1
+    }
+}
+
+Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
+
+$infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
+$charts = ("eshop-common", "basket-api","catalog-api", "identity-api", "locations-api", "marketing-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
+$gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
+
+if ($deployInfrastructure) {
+    foreach ($infra in $infras) {
+        Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
+        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" --name="$appName-$infra" $infra     
+    }
+}
+else {
+    Write-Host "eShopOnContainers infrastructure (bbdd, redis, ...) charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+if ($deployCharts) {
+    foreach ($chart in $charts) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing: $chart" -ForegroundColor Green
+            Install-Chart $chart "-f app.yaml --values inf.yaml -f $ingressValuesFile -f $ingressMeshAnnotationsFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=$imagePullPolicy --set inf.tls.enabled=$sslEnabled --set inf.mesh.enabled=$useMesh --set inf.k8s.local=$useLocalk8s" $useCustomRegistry
+        }
+    }
+
+    foreach ($chart in $gateways) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing Api Gateway Chart: $chart" -ForegroundColor Green
+            Install-Chart $chart "-f app.yaml -f inf.yaml -f $ingressValuesFile  --set app.name=$appName --set inf.k8s.dns=$dns  --set image.pullPolicy=$imagePullPolicy --set inf.mesh.enabled=$useMesh --set ingress.hosts={$dns} --set inf.tls.enabled=$sslEnabled" $false
+            
+        }
+    }
+}
+else {
+    Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+Write-Host "helm charts installed." -ForegroundColor Green
diff --git a/deploy/k8s/archived/helm/deploy-all.sh b/deploy/k8s/archived/helm/deploy-all.sh
new file mode 100644
index 000000000..6f6d868aa
--- /dev/null
+++ b/deploy/k8s/archived/helm/deploy-all.sh
@@ -0,0 +1,232 @@
+#!/usr/bin/env bash
+
+# http://redsymbol.net/articles/unofficial-bash-strict-mode
+set -euo pipefail
+
+usage()
+{
+  cat <<END
+deploy.sh: deploys the $app_name application to a Kubernetes cluster using Helm.
+Parameters:
+  --aks-name <AKS cluster name>
+    The name of the AKS cluster. Required when the registry (using the -r parameter) is set to "aks".
+  --aks-rg <AKS resource group>
+    The resource group for the AKS cluster. Required when the registry (using the -r parameter) is set to "aks".
+  -b | --build-solution
+    Force a solution build before deployment (default: false).
+  -d | --dns <dns or ip address> | --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.
+  --image-build
+    Build images (default is to not build all images).
+  --image-push
+    Upload images to the container registry (default is not pushing to the custom registry)
+  -n | --app-name <the name of the app>
+    Specifies the name of the application (default: eshop).
+  --namespace <namespace name>
+    Specifies the namespace name to deploy the app. If it doesn't exists it will be created (default: eshop).
+  -p | --docker-password <docker password>
+    The Docker password used to logon to the custom registry, supplied using the -r parameter.
+  -r | --registry <container registry>
+    Specifies the container registry to use (required), e.g. myregistry.azurecr.io.
+  --skip-clean
+    Do not clean the Kubernetes cluster (default is to clean the cluster).
+  --skip-infrastructure
+    Do not deploy infrastructure resources (like sql-data, no-sql or redis).
+    This is useful for production environments where infrastructure is hosted outside the Kubernetes cluster.
+  -t | --tag <docker image tag>
+    The tag used for the newly created docker images. Default: latest.
+  -u | --docker-username <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
+}
+
+app_name='eshop'
+aks_name=''
+aks_rg=''
+build_images=''
+clean='yes'
+build_solution=''
+container_registry=''
+docker_password=''
+docker_username=''
+dns=''
+image_tag='latest'
+push_images=''
+skip_infrastructure=''
+use_local_k8s=''
+namespace='eshop'
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --aks-name )
+      aks_name="$2"; shift 2;;
+    --aks-rg )
+      aks_rg="$2"; shift 2;;
+    -b | --build-solution )
+      build_solution='yes'; shift ;;
+    -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
+
+if [[ $build_solution ]]; then
+  echo "#################### Building $app_name solution ####################"
+  dotnet publish -o obj/Docker/publish ../../eShopOnContainers-ServicesAndWebApps.sln
+fi
+
+export TAG=$image_tag
+
+if [[ $build_images ]]; then
+  echo "#################### Building the $app_name Docker images ####################"
+  docker-compose -p ../.. -f ../../docker-compose.yml build
+
+  # Remove temporary images
+  docker rmi $(docker images -qf "dangling=true") 
+fi
+
+use_custom_registry=''
+
+if [[ -n $container_registry ]]; 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
+
+if [[ $push_images ]]; then
+  echo "#################### Pushing images to the container registry ####################"
+  services=(basket.api catalog.api identity.api ordering.api marketing.api payment.api locations.api webmvc webspa webstatus)
+
+  if [[ -z "$(docker image ls -q --filter=reference=eshop/$service:$image_tag)" ]]; then
+    image_tag=linux-$image_tag
+  fi
+
+  for service in "${services[@]}"
+  do
+    echo "Pushing image for service $service..."
+    docker tag "eshop/$service:$image_tag" "$container_registry/$service:$image_tag"
+    docker push "$container_registry/$service:$image_tag"
+  done
+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
+
+if [[ $clean ]]; then
+  echo "Cleaning previous helm releases..."
+  if [[ -z $(helm ls -q --namespace $namespace) ]]; then
+    echo "No previous releases found"
+  else
+    helm delete --purge $(helm ls -q --namespace $namespace)
+    echo "Previous releases deleted"
+    waitsecs=10; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
+  fi
+fi
+
+echo "#################### Begin $app_name installation using Helm ####################"
+infras=(sql-data nosql-data rabbitmq keystore-data basket-data)
+charts=(eshop-common apigwmm apigwms apigwwm apigwws basket-api catalog-api identity-api locations-api marketing-api mobileshoppingagg ordering-api ordering-backgroundtasks ordering-signalrhub payment-api webmvc webshoppingagg webspa webstatus webhooks-api webhooks-web)
+
+if [[ !$skip_infrastructure ]]; then
+  for infra in "${infras[@]}"
+  do
+    echo "Installing infrastructure: $infra"
+    helm install --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 --name="$app_name-$infra" $infra     
+  done  
+fi
+
+for chart in "${charts[@]}"
+do
+    echo "Installing: $chart"
+    if [[ $use_custom_registry ]]; then 
+      helm install --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 --name="$app_name-$chart" $chart 
+    elif [[ $chart != "eshop-common" ]]; then  # eshop-common is ignored when no secret must be deployed
+      helm install --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 --name="$app_name-$chart" $chart 
+    fi
+done
+
+echo "FINISHED: Helm charts installed."
diff --git a/deploy/k8s/archived/helm/eshop-common/.helmignore b/deploy/k8s/archived/helm/eshop-common/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/eshop-common/Chart.yaml b/deploy/k8s/archived/helm/eshop-common/Chart.yaml
new file mode 100644
index 000000000..cd5e7b2fe
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: eshop-common
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/eshop-common/templates/NOTES.txt b/deploy/k8s/archived/helm/eshop-common/templates/NOTES.txt
new file mode 100644
index 000000000..1cc59f58a
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/templates/NOTES.txt
@@ -0,0 +1,7 @@
+Common eShop resources installed:
+
+{{- if .Values.inf.registry -}}
+* Docker registry secret ({{ .Values.inf.registry.secretName }})
+{{- end -}}
+
++++ Done +++
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/eshop-common/templates/_helpers.tpl b/deploy/k8s/archived/helm/eshop-common/templates/_helpers.tpl
new file mode 100644
index 000000000..4a3c6324b
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "eshop-common.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "eshop-common.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "eshop-common.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/eshop-common/templates/_names.tpl b/deploy/k8s/archived/helm/eshop-common/templates/_names.tpl
new file mode 100644
index 000000000..7cdfb80d6
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/templates/_names.tpl
@@ -0,0 +1,3 @@
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.inf.registry.server (printf "%s:%s" .Values.inf.registry.login .Values.inf.registry.pwd | b64enc) | b64enc }}
+{{- end }}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/eshop-common/templates/secret.yaml b/deploy/k8s/archived/helm/eshop-common/templates/secret.yaml
new file mode 100644
index 000000000..285ec85e7
--- /dev/null
+++ b/deploy/k8s/archived/helm/eshop-common/templates/secret.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.inf.registry -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.inf.registry.secretName }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/eshop-common/values.yaml b/deploy/k8s/archived/helm/eshop-common/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/deploy/k8s/archived/helm/identity-api/.helmignore b/deploy/k8s/archived/helm/identity-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/identity-api/Chart.yaml b/deploy/k8s/archived/helm/identity-api/Chart.yaml
new file mode 100644
index 000000000..7b9290ada
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: identity-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/identity-api/templates/NOTES.txt b/deploy/k8s/archived/helm/identity-api/templates/NOTES.txt
new file mode 100644
index 000000000..48fbbe9b4
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/NOTES.txt
@@ -0,0 +1,4 @@
+eShop Identity API installed.
+-----------------------------
+
+Access this API through ingress.
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/identity-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/identity-api/templates/_helpers.tpl
new file mode 100644
index 000000000..fb47187b4
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "identity-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "identity-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "identity-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/identity-api/templates/_names.tpl b/deploy/k8s/archived/helm/identity-api/templates/_names.tpl
new file mode 100644
index 000000000..39ee485ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/_names.tpl
@@ -0,0 +1,51 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/identity-api/templates/configmap.yaml b/deploy/k8s/archived/helm/identity-api/templates/configmap.yaml
new file mode 100644
index 000000000..264ceb745
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/configmap.yaml
@@ -0,0 +1,39 @@
+{{- $name := include "identity-api.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $mvc_url := include "url-of" (list .Values.app.ingress.entries.mvc  .) -}}
+{{- $spa_url := include "url-of" (list .Values.app.ingress.entries.spa .) -}}
+{{- $locations_url := include "url-of" (list .Values.app.ingress.entries.locations .) -}}
+{{- $marketing_url := include "url-of" (list .Values.app.ingress.entries.marketing .) -}}
+{{- $basket_url := include "url-of" (list .Values.app.ingress.entries.basket .) -}}
+{{- $ordering_url := include "url-of" (list .Values.app.ingress.entries.ordering .) -}}
+{{- $mobileshoppingagg := include "url-of" (list .Values.app.ingress.entries.mobileshoppingagg .) -}}
+{{- $webhoppingagg := include "url-of" (list .Values.app.ingress.entries.webshoppingagg .) -}}
+{{- $xamarincallback := include "url-of" (list "xamarincallback" .) -}}
+{{- $webhooks_url := include "url-of" (list .Values.app.ingress.entries.webhooks .) -}}
+{{- $webhooksweb_url := include "url-of" (list .Values.app.ingress.entries.webhooksweb .) -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "identity-api.name" . }}
+    chart: {{ template "identity-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  identity__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.identity.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  identity__keystore: {{ .Values.inf.redis.keystore.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  mvc_e: http://{{ $mvc_url }}
+  spa_e: http://{{ $spa_url }}
+  locations_e: http://{{ $locations_url }}
+  marketing_e: http://{{ $marketing_url }}
+  basket_e: http://{{ $basket_url }}
+  ordering_e: http://{{ $ordering_url }}
+  mobileshoppingagg_e: http://{{ $mobileshoppingagg }}
+  webshoppingagg_e: http://{{ $webhoppingagg }}
+  xamarin_callback_e: http://{{ $xamarincallback }}
+  webhooksapi_e:  http://{{ $webhooks_url }}
+  webhooksweb_e: http://{{ $webhooksweb_url }}
+  enableDevspaces: "{{ .Values.enableDevspaces }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/identity-api/templates/deployment.yaml b/deploy/k8s/archived/helm/identity-api/templates/deployment.yaml
new file mode 100644
index 000000000..c6ad69067
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/deployment.yaml
@@ -0,0 +1,96 @@
+{{- $name := include "identity-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "identity-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "identity-api.name" . }}
+    chart: {{ template "identity-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "identity-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "identity-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}           
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/identity-api/templates/ingress-dockerk8s.yaml b/deploy/k8s/archived/helm/identity-api/templates/ingress-dockerk8s.yaml
new file mode 100644
index 000000000..b6a8980f2
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/ingress-dockerk8s.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.ingress.enabled -}}
+{{- if .Values.inf.k8s.local -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.identity }}
+{{- $name := include "identity-api.fullname" . -}} 
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $name }}-local
+  labels:
+    app: {{ template "identity-api.name" . }}
+    chart: {{ template "identity-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}    
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+  rules:
+  - http:
+      paths:
+      - backend:
+          serviceName: {{ $serviceName }}
+          servicePort: http
+        path: {{ $ingressPath }}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/identity-api/templates/ingress.yaml b/deploy/k8s/archived/helm/identity-api/templates/ingress.yaml
new file mode 100644
index 000000000..751636926
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.identity }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "identity-api.fullname" . }}
+  labels:
+    app: {{ template "identity-api.name" . }}
+    chart: {{ template "identity-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/identity-api/templates/service.yaml b/deploy/k8s/archived/helm/identity-api/templates/service.yaml
new file mode 100644
index 000000000..bca200389
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.identity }}
+  labels:
+    app: {{ template "identity-api.name" . }}
+    chart: {{ template "identity-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "identity-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/identity-api/values.yaml b/deploy/k8s/archived/helm/identity-api/values.yaml
new file mode 100644
index 000000000..7b57dfde1
--- /dev/null
+++ b/deploy/k8s/archived/helm/identity-api/values.yaml
@@ -0,0 +1,84 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /identity
+
+image:
+  repository: eshop/identity.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+env:
+  urls:
+  configmap:
+    - name: ConnectionString
+      key: identity__ConnectionString
+    - name: DPConnectionString
+      key: identity__keystore
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: MvcClient
+      key: mvc_e
+    - name: SpaClient
+      key: spa_e
+    - name: LocationApiClient
+      key: locations_e
+    - name: MarketingApiClient
+      key: marketing_e
+    - name: BasketApiClient
+      key: basket_e
+    - name: OrderingApiClient
+      key: ordering_e
+    - name: MobileShoppingAggClient
+      key: mobileshoppingagg_e
+    - name: WebShoppingAggClient
+      key: webshoppingagg_e
+    - name: XamarinCallback
+      key: xamarin_callback_e
+    - name: WebhooksApiClient
+      key: webhooksapi_e
+    - name: WebhooksWebClient
+      key: webhooksweb_e
+    - name: EnableDevspaces
+      key: enableDevspaces
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      value: 'True'
+
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
+
+enableDevspaces: "false"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/inf.yaml b/deploy/k8s/archived/helm/inf.yaml
new file mode 100644
index 000000000..938be3d45
--- /dev/null
+++ b/deploy/k8s/archived/helm/inf.yaml
@@ -0,0 +1,56 @@
+# This helm values file defines all infrastructure used by eShopOnContainers.
+# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
+
+inf:
+  mesh:
+    enabled: false          # True to enable Linkerd (set by deploy-all.ps1)
+  tls:
+    enabled: false          # True to enable TLS (set by deploy-all.ps1)
+    issuer: ""              # cert-manager issuer to use for retrieving certs (set by deploy-all.ps1)
+  sql:                      # inf.sql defines the sql server databases & logins
+#    host:  my-sql-server   # Uncomment to specify a custom sql-server to be used. By default "sql-data-<appname>" will be used  
+    common:
+      user: sa              # SQL user
+      pwd: Pass@word        # SQL pwd
+      pid: Developer
+    catalog:                # inf.sql.catalog: settings for the catalog-api sql (user, pwd, db)
+      db: CatalogDb         # Catalog API SQL db name
+    ordering:               # inf.sql.ordering: settings for the ordering-api sql (user, pwd, db)
+      db: OrderingDb        # Ordering API SQL db name
+    identity:
+      db: IdentityDb        # Ordering API SQL db name
+    marketing:
+      db: MarketingDb       # Marketing API SQL db name
+    webhooks:
+      db: WebhooksDb        # Webhooks DB
+  mongo:
+#    host: my-nosql-data    # Uncomment to use specify custom mongo host. By default nosql-data is used
+    locations:
+      database: LocationsDb
+    marketing:
+      database: MarketingDb
+  redis:                    # inf.redis defines the redis' connection strings
+    basket:     
+      svc: basket-data      # Name of k8s svc for basket redis     
+      constr: basket-data   # Connection string to Redis used by Basket API
+    keystore:
+      svc: keystore-data    # Name of k8s svc for keystore-data redis
+      constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
+  eventbus:
+    svc: rabbitmq           # Name of k8s svc for rabbitmq
+    constr: rabbitmq        # Event bus connection string
+    useAzure: false         # true if use Azure Service Bus. False if RabbitMQ
+  appinsights:
+      key: ""               # App insights to use
+  k8s:                      # inf.k8s defines Kubernetes cluster global config
+    dns:  ""                # k8s external  DNS. This value or ip value MUST BE PROVIDED
+    local: false            # True when deploying on "local K8s" provided by Docker Desktop.
+  misc:                     # inf.misc contains miscellaneous configuration related to infrastructure
+    useLoadTest: false      # If running under loading test or not
+    useAzureStorage: false  # If catalog api uses azure storage or not
+#  registry:                # Uncomment "registry" to specify registry secret
+#    secretName:            # secretName is the name of the secret inside k8s   
+#    server:                # Registry login server
+#    login:                 # User login
+#    pwd:                   # User pwd
+
diff --git a/deploy/k8s/archived/helm/ingress_values.yaml b/deploy/k8s/archived/helm/ingress_values.yaml
new file mode 100644
index 000000000..5f4d653c0
--- /dev/null
+++ b/deploy/k8s/archived/helm/ingress_values.yaml
@@ -0,0 +1,8 @@
+# This file contains common ingress annotations when using AKS with Http Application Routing
+
+ingress:
+  annotations:
+    kubernetes.io/ingress.class: addon-http-application-routing
+    ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+
diff --git a/deploy/k8s/archived/helm/ingress_values_dockerk8s.yaml b/deploy/k8s/archived/helm/ingress_values_dockerk8s.yaml
new file mode 100644
index 000000000..f69af8a5b
--- /dev/null
+++ b/deploy/k8s/archived/helm/ingress_values_dockerk8s.yaml
@@ -0,0 +1,7 @@
+# This file contains common ingress annotations when using Kubernetes included in Docker Desktop
+
+ingress:
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
diff --git a/deploy/k8s/archived/helm/ingress_values_linkerd.yaml b/deploy/k8s/archived/helm/ingress_values_linkerd.yaml
new file mode 100644
index 000000000..f85a3a57f
--- /dev/null
+++ b/deploy/k8s/archived/helm/ingress_values_linkerd.yaml
@@ -0,0 +1,16 @@
+# This file contains extra annotations to make Linkerd work with ingress.
+# ingress.mesh.annotations are inserted into ingress.annotations of the resource being generated, if mesh is deployed
+#
+# It is designed to work with NGINX ingress controller or the Http Application Routing
+#
+# Check https://linkerd.io/2/tasks/using-ingress/ for more info or other ingress controllers
+#
+# If using your custom file, use -ingressMeshAnnotationsFile parameter in deploy-all.ps1
+
+ingress:
+  mesh:
+    annotations:
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        proxy_set_header l5d-dst-override $service_name.$namespace.svc.cluster.local:$service_port;
+        proxy_hide_header l5d-remote-ip;
+        proxy_hide_header l5d-server-id;
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/keystore-data/.helmignore b/deploy/k8s/archived/helm/keystore-data/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/keystore-data/Chart.yaml b/deploy/k8s/archived/helm/keystore-data/Chart.yaml
new file mode 100644
index 000000000..0cfa515f9
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: keystore-data
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/keystore-data/templates/NOTES.txt b/deploy/k8s/archived/helm/keystore-data/templates/NOTES.txt
new file mode 100644
index 000000000..bec3a1f0f
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Redis for keystore data installed
+----------------------------------------
+
+Redis is not directly exposed outside cluster. If need to access it from outside use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "keystore-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/keystore-data/templates/_helpers.tpl b/deploy/k8s/archived/helm/keystore-data/templates/_helpers.tpl
new file mode 100644
index 000000000..18786752f
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "keystore-data.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "keystore-data.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "keystore-data.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/keystore-data/templates/deployment.yaml b/deploy/k8s/archived/helm/keystore-data/templates/deployment.yaml
new file mode 100644
index 000000000..34f1fe074
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/templates/deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "keystore-data.fullname" . }}
+  labels:
+    app: {{ template "keystore-data.name" . }}
+    chart: {{ template "keystore-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "keystore-data.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "keystore-data.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 6379
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/deploy/k8s/archived/helm/keystore-data/templates/service.yaml b/deploy/k8s/archived/helm/keystore-data/templates/service.yaml
new file mode 100644
index 000000000..38e9a4273
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.inf.redis.keystore.svc }}
+  labels:
+    app: {{ template "keystore-data.name" . }}
+    chart: {{ template "keystore-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "keystore-data.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/keystore-data/values.yaml b/deploy/k8s/archived/helm/keystore-data/values.yaml
new file mode 100644
index 000000000..17cc75ee7
--- /dev/null
+++ b/deploy/k8s/archived/helm/keystore-data/values.yaml
@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: redis
+  tag: 4.0.10
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 6379
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deploy/k8s/archived/helm/locations-api/.helmignore b/deploy/k8s/archived/helm/locations-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/locations-api/Chart.yaml b/deploy/k8s/archived/helm/locations-api/Chart.yaml
new file mode 100644
index 000000000..5126fe847
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: locations-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/locations-api/templates/NOTES.txt b/deploy/k8s/archived/helm/locations-api/templates/NOTES.txt
new file mode 100644
index 000000000..3b48889bf
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/NOTES.txt
@@ -0,0 +1,9 @@
+eShop Locations API installed.
+------------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "locations-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
+
diff --git a/deploy/k8s/archived/helm/locations-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/locations-api/templates/_helpers.tpl
new file mode 100644
index 000000000..086a461ba
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "locations-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "locations-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "locations-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/locations-api/templates/_names.tpl b/deploy/k8s/archived/helm/locations-api/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/locations-api/templates/configmap.yaml b/deploy/k8s/archived/helm/locations-api/templates/configmap.yaml
new file mode 100644
index 000000000..c5d752509
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/configmap.yaml
@@ -0,0 +1,22 @@
+{{- $name := include "locations-api.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $mongo := include "mongo-name" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  urls__IdentityUrl: {{ $identity }}
+  locations__ConnectionString: mongodb://{{ $mongo }}
+  locations__Database: {{ .Values.inf.mongo.locations.database }}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/locations-api/templates/deployment.yaml b/deploy/k8s/archived/helm/locations-api/templates/deployment.yaml
new file mode 100644
index 000000000..9a5bb608c
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/deployment.yaml
@@ -0,0 +1,96 @@
+{{- $name := include "locations-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "locations-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "locations-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "locations-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}     
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}            
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/locations-api/templates/service.yaml b/deploy/k8s/archived/helm/locations-api/templates/service.yaml
new file mode 100644
index 000000000..abd628beb
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.locations }}
+  labels:
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "locations-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/locations-api/values.yaml b/deploy/k8s/archived/helm/locations-api/values.yaml
new file mode 100644
index 000000000..4718f2a0b
--- /dev/null
+++ b/deploy/k8s/archived/helm/locations-api/values.yaml
@@ -0,0 +1,66 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /locations-api
+
+image:
+  repository: eshop/locations.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: UseLoadTest
+      key: all_EnableLoadTest
+    - name: IdentityUrl
+      key: internalurls__IdentityUrl
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrl
+    - name: ConnectionString
+      key: locations__ConnectionString
+    - name: Database
+      key: locations__Database
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/marketing-api/.helmignore b/deploy/k8s/archived/helm/marketing-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/marketing-api/Chart.yaml b/deploy/k8s/archived/helm/marketing-api/Chart.yaml
new file mode 100644
index 000000000..173f94fd6
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: marketing-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/NOTES.txt b/deploy/k8s/archived/helm/marketing-api/templates/NOTES.txt
new file mode 100644
index 000000000..7fa66ed47
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/NOTES.txt
@@ -0,0 +1,9 @@
+eShop Marketing API installed.
+------------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "marketing-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
+
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/marketing-api/templates/_helpers.tpl
new file mode 100644
index 000000000..c252aeeac
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "marketing-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "marketing-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "marketing-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/_names.tpl b/deploy/k8s/archived/helm/marketing-api/templates/_names.tpl
new file mode 100644
index 000000000..605e92e7e
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/configmap.yaml b/deploy/k8s/archived/helm/marketing-api/templates/configmap.yaml
new file mode 100644
index 000000000..e6b495a7a
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/configmap.yaml
@@ -0,0 +1,27 @@
+{{- $name := include "marketing-api.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $mongo := include "mongo-name" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "marketing-api.name" . }}
+    chart: {{ template "marketing-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  urls__IdentityUrl: {{ $protocol }}://{{ $identity }}
+  marketing__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.marketing.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  marketing__MongoConnectionString: mongodb://{{ $mongo }}
+  marketing__MongoDatabase: {{ .Values.inf.mongo.marketing.database }} 
+  marketing__PicBaseUrl: {{ $protocol }}://{{ $webshoppingapigw }}/c/api/v1/catalog/items/[0]/pic/
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/deployment.yaml b/deploy/k8s/archived/helm/marketing-api/templates/deployment.yaml
new file mode 100644
index 000000000..60d4cd1a3
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/deployment.yaml
@@ -0,0 +1,96 @@
+{{- $name := include "marketing-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "marketing-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "marketing-api.name" . }}
+    chart: {{ template "marketing-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "marketing-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "marketing-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}            
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/marketing-api/templates/service.yaml b/deploy/k8s/archived/helm/marketing-api/templates/service.yaml
new file mode 100644
index 000000000..0e9bfbea2
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.marketing }}
+  labels:
+    app: {{ template "marketing-api.name" . }}
+    chart: {{ template "marketing-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "marketing-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/marketing-api/values.yaml b/deploy/k8s/archived/helm/marketing-api/values.yaml
new file mode 100644
index 000000000..00bebf27f
--- /dev/null
+++ b/deploy/k8s/archived/helm/marketing-api/values.yaml
@@ -0,0 +1,70 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /marketing-api
+
+image:
+  repository: eshop/marketing.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: UseLoadTest
+      key: all_EnableLoadTest
+    - name: IdentityUrl
+      key: internalurls__IdentityUrl
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrl
+    - name: ConnectionString
+      key: marketing__ConnectionString
+    - name: MongoConnectionString
+      key: marketing__MongoConnectionString
+    - name: MongoDatabase
+      key: marketing__MongoDatabase
+    - name: PicBaseUrl
+      key: marketing__PicBaseUrl
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/.helmignore b/deploy/k8s/archived/helm/mobileshoppingagg/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/Chart.yaml b/deploy/k8s/archived/helm/mobileshoppingagg/Chart.yaml
new file mode 100644
index 000000000..957edd619
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: mobileshoppingagg
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/NOTES.txt b/deploy/k8s/archived/helm/mobileshoppingagg/templates/NOTES.txt
new file mode 100644
index 000000000..61971f717
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Mobile Marketing Aggregator is installed
+----------------------------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "mobileshoppingagg.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/_helpers.tpl b/deploy/k8s/archived/helm/mobileshoppingagg/templates/_helpers.tpl
new file mode 100644
index 000000000..b3aace0e7
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "mobileshoppingagg.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "mobileshoppingagg.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "mobileshoppingagg.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/_names.tpl b/deploy/k8s/archived/helm/mobileshoppingagg/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/configmap.yaml b/deploy/k8s/archived/helm/mobileshoppingagg/templates/configmap.yaml
new file mode 100644
index 000000000..1ca69509f
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/configmap.yaml
@@ -0,0 +1,29 @@
+{{- $name := include "mobileshoppingagg.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "mobileshoppingagg.name" . }}
+    chart: {{ template "mobileshoppingagg.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  mobileshoppingagg__keystore: {{ .Values.inf.redis.keystore.constr }}
+  internalurls__basket: http://{{ .Values.app.svc.basket }}
+  internalurls__catalog: http://{{ .Values.app.svc.catalog }}
+  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__ordering: http://{{ .Values.app.svc.ordering }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
+  internalurls__grpcBasket: "http://{{ .Values.app.svc.basket }}:{{ .Values.service.grpcPort }}"
+  internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
+  internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/deployment.yaml b/deploy/k8s/archived/helm/mobileshoppingagg/templates/deployment.yaml
new file mode 100644
index 000000000..41e1fa75c
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/deployment.yaml
@@ -0,0 +1,96 @@
+{{- $name := include "mobileshoppingagg.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "mobileshoppingagg.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "mobileshoppingagg.name" . }}
+    chart: {{ template "mobileshoppingagg.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "mobileshoppingagg.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "mobileshoppingagg.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}                
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/templates/service.yaml b/deploy/k8s/archived/helm/mobileshoppingagg/templates/service.yaml
new file mode 100644
index 000000000..ef6726e88
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.mobileshoppingagg }}
+  labels:
+    app: {{ template "mobileshoppingagg.name" . }}
+    chart: {{ template "mobileshoppingagg.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "mobileshoppingagg.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/mobileshoppingagg/values.yaml b/deploy/k8s/archived/helm/mobileshoppingagg/values.yaml
new file mode 100644
index 000000000..844a59441
--- /dev/null
+++ b/deploy/k8s/archived/helm/mobileshoppingagg/values.yaml
@@ -0,0 +1,85 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /mobileshoppingagg
+
+image:
+  repository: eshop/mobileshoppingagg
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: urls__basket
+      key: internalurls__basket
+    - name: urls__catalog
+      key: internalurls__catalog
+    - name: urls__orders
+      key: internalurls__ordering
+    - name: urls__identity
+      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
+    - name: urls__grpcBasket
+      key: internalurls__grpcBasket
+    - name: urls__grpcCatalog
+      key: internalurls__grpcCatalog
+    - name: urls__grpcOrdering
+      key: internalurls__grpcOrdering      
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: ASPNETCORE_URLS
+      value: http://0.0.0.0:80
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      value: 'True'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/nosql-data/.helmignore b/deploy/k8s/archived/helm/nosql-data/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/nosql-data/Chart.yaml b/deploy/k8s/archived/helm/nosql-data/Chart.yaml
new file mode 100644
index 000000000..848a11cbb
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: nosql-data
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/nosql-data/templates/NOTES.txt b/deploy/k8s/archived/helm/nosql-data/templates/NOTES.txt
new file mode 100644
index 000000000..116c3c4e0
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop MongoDb Installed
+-----------------------
+
+MongoDb is not exposed outside the cluster. If need to access it from outside, use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "nosql-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/nosql-data/templates/_helpers.tpl b/deploy/k8s/archived/helm/nosql-data/templates/_helpers.tpl
new file mode 100644
index 000000000..99be734f7
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "nosql-data.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "nosql-data.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "nosql-data.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/nosql-data/templates/_names.tpl b/deploy/k8s/archived/helm/nosql-data/templates/_names.tpl
new file mode 100644
index 000000000..56fb974fc
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/templates/_names.tpl
@@ -0,0 +1,8 @@
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/nosql-data/templates/deployment.yaml b/deploy/k8s/archived/helm/nosql-data/templates/deployment.yaml
new file mode 100644
index 000000000..9b1f32319
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/templates/deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "nosql-data.fullname" . }}
+  labels:
+    app: {{ template "nosql-data.name" . }}
+    chart: {{ template "nosql-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "nosql-data.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "nosql-data.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 27017
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/deploy/k8s/archived/helm/nosql-data/templates/service.yaml b/deploy/k8s/archived/helm/nosql-data/templates/service.yaml
new file mode 100644
index 000000000..478cadfea
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "mongo-name" . }}
+  labels:
+    app: {{ template "nosql-data.name" . }}
+    chart: {{ template "nosql-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "nosql-data.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/nosql-data/values.yaml b/deploy/k8s/archived/helm/nosql-data/values.yaml
new file mode 100644
index 000000000..1a380e6b4
--- /dev/null
+++ b/deploy/k8s/archived/helm/nosql-data/values.yaml
@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: mongo
+  tag: 3.6.5-jessie
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 27017
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deploy/k8s/archived/helm/ordering-api/.helmignore b/deploy/k8s/archived/helm/ordering-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/ordering-api/Chart.yaml b/deploy/k8s/archived/helm/ordering-api/Chart.yaml
new file mode 100644
index 000000000..b65ca4b9a
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: ordering-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/NOTES.txt b/deploy/k8s/archived/helm/ordering-api/templates/NOTES.txt
new file mode 100644
index 000000000..43bfd2fdf
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Ordering API installed.
+-----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ordering-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/ordering-api/templates/_helpers.tpl
new file mode 100644
index 000000000..978c08c64
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ordering-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ordering-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ordering-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/_names.tpl b/deploy/k8s/archived/helm/ordering-api/templates/_names.tpl
new file mode 100644
index 000000000..39ee485ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/_names.tpl
@@ -0,0 +1,51 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/configmap.yaml b/deploy/k8s/archived/helm/ordering-api/templates/configmap.yaml
new file mode 100644
index 000000000..e64a6c841
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/configmap.yaml
@@ -0,0 +1,19 @@
+{{- $name := include "ordering-api.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "ordering-api.name" . }}
+    chart: {{ template "ordering-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  ordering__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.ordering.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  ordering__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  urls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/deployment.yaml b/deploy/k8s/archived/helm/ordering-api/templates/deployment.yaml
new file mode 100644
index 000000000..327040701
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/deployment.yaml
@@ -0,0 +1,99 @@
+{{- $name := include "ordering-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "ordering-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "ordering-api.name" . }}
+    chart: {{ template "ordering-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "ordering-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "ordering-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}                      
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/ordering-api/templates/service.yaml b/deploy/k8s/archived/helm/ordering-api/templates/service.yaml
new file mode 100644
index 000000000..7c2cb0945
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.ordering }}
+  labels:
+    app: {{ template "ordering-api.name" . }}
+    chart: {{ template "ordering-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+  selector:
+    app: {{ template "ordering-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/ordering-api/values.yaml b/deploy/k8s/archived/helm/ordering-api/values.yaml
new file mode 100644
index 000000000..7eff1a48b
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-api/values.yaml
@@ -0,0 +1,69 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /ordering-api
+
+image:
+  repository: eshop/ordering.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81
+
+ingress:
+  enabled: false
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: ordering__ConnectionString
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: UseLoadTest
+      key: ordering__EnableLoadTest
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"      
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/.helmignore b/deploy/k8s/archived/helm/ordering-backgroundtasks/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/Chart.yaml b/deploy/k8s/archived/helm/ordering-backgroundtasks/Chart.yaml
new file mode 100644
index 000000000..6ad4f47e6
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: ordering-backgroundtasks
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/NOTES.txt b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/NOTES.txt
new file mode 100644
index 000000000..54e1b49ea
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/NOTES.txt
@@ -0,0 +1,3 @@
+eShop Ordering Background Tasks installed.
+------------------------------------------
+
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_helpers.tpl b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_helpers.tpl
new file mode 100644
index 000000000..e61b78285
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ordering-backgroundtasks.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ordering-backgroundtasks.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ordering-backgroundtasks.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_names.tpl b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_names.tpl
new file mode 100644
index 000000000..39ee485ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/_names.tpl
@@ -0,0 +1,51 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/configmap.yaml b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/configmap.yaml
new file mode 100644
index 000000000..7ed4a0e8e
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/configmap.yaml
@@ -0,0 +1,21 @@
+{{- $name := include "ordering-backgroundtasks.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $cfgname :=  printf "cfg-%s" $name | trunc 63  }}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ $cfgname }}"
+  labels:
+    app: {{ template "ordering-backgroundtasks.name" . }}
+    chart: {{ template "ordering-backgroundtasks.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  ordering__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.ordering.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  ordering__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  graceperiodmanager__CheckUpdateTime: "{{ .Values.cfg.checkUpdateTime }}"
+  graceperiodmanager__GracePeriodTime: "{{ .Values.cfg.gracePeriodTime }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/deployment.yaml b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/deployment.yaml
new file mode 100644
index 000000000..d93c7f764
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/deployment.yaml
@@ -0,0 +1,92 @@
+{{- $name := include "ordering-backgroundtasks.fullname" . -}}
+{{- $cfgname :=  printf "cfg-%s" $name | trunc 63  }}
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "ordering-backgroundtasks.fullname" . }}
+  labels:
+    app: {{ template "ordering-backgroundtasks.name" . }}
+    chart: {{ template "ordering-backgroundtasks.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "ordering-backgroundtasks.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "ordering-backgroundtasks.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}            
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/service.yaml b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/service.yaml
new file mode 100644
index 000000000..d8fcba036
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.orderingbackgroundtasks }}
+  labels:
+    app: {{ template "ordering-backgroundtasks.name" . }}
+    chart: {{ template "ordering-backgroundtasks.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "ordering-backgroundtasks.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/ordering-backgroundtasks/values.yaml b/deploy/k8s/archived/helm/ordering-backgroundtasks/values.yaml
new file mode 100644
index 000000000..d065f0345
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-backgroundtasks/values.yaml
@@ -0,0 +1,70 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /ordering-backgroundtasks
+
+image:
+  repository: eshop/ordering.backgroundtasks
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+cfg:
+  checkUpdateTime: "15000"
+  gracePeriodTime: "1"
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: ordering__ConnectionString
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: UseLoadTest
+      key: ordering__EnableLoadTest      
+    - name: CheckUpdateTime
+      key: graceperiodmanager__CheckUpdateTime
+    - name: GracePeriodTime
+      key: graceperiodmanager__GracePeriodTime
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/.helmignore b/deploy/k8s/archived/helm/ordering-signalrhub/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/Chart.yaml b/deploy/k8s/archived/helm/ordering-signalrhub/Chart.yaml
new file mode 100644
index 000000000..d43e83bf0
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: ordering-signalrhub
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/NOTES.txt b/deploy/k8s/archived/helm/ordering-signalrhub/templates/NOTES.txt
new file mode 100644
index 000000000..fc55c9dfa
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Ordering SignalR Hub installed
+------------------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "ordering-signalrhub.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/_helpers.tpl b/deploy/k8s/archived/helm/ordering-signalrhub/templates/_helpers.tpl
new file mode 100644
index 000000000..2c11ddb51
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ordering-signalrhub.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ordering-signalrhub.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ordering-signalrhub.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/_names.tpl b/deploy/k8s/archived/helm/ordering-signalrhub/templates/_names.tpl
new file mode 100644
index 000000000..39ee485ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/_names.tpl
@@ -0,0 +1,51 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/configmap.yaml b/deploy/k8s/archived/helm/ordering-signalrhub/templates/configmap.yaml
new file mode 100644
index 000000000..bab4ebc94
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/configmap.yaml
@@ -0,0 +1,18 @@
+{{- $name := include "ordering-signalrhub.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "ordering-signalrhub.name" . }}
+    chart: {{ template "ordering-signalrhub.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  signalr__StoreConnectionString: {{ .Values.inf.redis.keystore.constr }}
+  urls__IdentityUrl: http://{{ $identity }}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/deployment.yaml b/deploy/k8s/archived/helm/ordering-signalrhub/templates/deployment.yaml
new file mode 100644
index 000000000..af3867ea5
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/deployment.yaml
@@ -0,0 +1,70 @@
+{{- $name := include "ordering-signalrhub.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "ordering-signalrhub.fullname" . }}
+  labels:
+    app: {{ template "ordering-signalrhub.name" . }}
+    chart: {{ template "ordering-signalrhub.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "ordering-signalrhub.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "ordering-signalrhub.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/templates/service.yaml b/deploy/k8s/archived/helm/ordering-signalrhub/templates/service.yaml
new file mode 100644
index 000000000..501539923
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.orderingsignalrhub }}
+  labels:
+    app: {{ template "ordering-signalrhub.name" . }}
+    chart: {{ template "ordering-signalrhub.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "ordering-signalrhub.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/ordering-signalrhub/values.yaml b/deploy/k8s/archived/helm/ordering-signalrhub/values.yaml
new file mode 100644
index 000000000..19099b147
--- /dev/null
+++ b/deploy/k8s/archived/helm/ordering-signalrhub/values.yaml
@@ -0,0 +1,57 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /ordering-signalrhub
+
+image:
+  repository: eshop/ordering.signalrhub
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+cfg:
+  checkUpdateTime: "15000"
+  gracePeriodTime: "1"
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+    - name: SignalrStoreConnectionString
+      key: signalr__StoreConnectionString
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      values: 'True'
+
diff --git a/deploy/k8s/archived/helm/payment-api/.helmignore b/deploy/k8s/archived/helm/payment-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/payment-api/Chart.yaml b/deploy/k8s/archived/helm/payment-api/Chart.yaml
new file mode 100644
index 000000000..b7dba9341
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: payment-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/payment-api/templates/NOTES.txt b/deploy/k8s/archived/helm/payment-api/templates/NOTES.txt
new file mode 100644
index 000000000..6d178f344
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/NOTES.txt
@@ -0,0 +1,9 @@
+eShop Payment API installed.
+----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "payment-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
+
diff --git a/deploy/k8s/archived/helm/payment-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/payment-api/templates/_helpers.tpl
new file mode 100644
index 000000000..2f98d7ea2
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "payment-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "payment-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "payment-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/payment-api/templates/_names.tpl b/deploy/k8s/archived/helm/payment-api/templates/_names.tpl
new file mode 100644
index 000000000..39ee485ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/_names.tpl
@@ -0,0 +1,51 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/payment-api/templates/configmap.yaml b/deploy/k8s/archived/helm/payment-api/templates/configmap.yaml
new file mode 100644
index 000000000..3bdb95c0f
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/configmap.yaml
@@ -0,0 +1,15 @@
+{{- $name := include "payment-api.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "payment-api.name" . }}
+    chart: {{ template "payment-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/payment-api/templates/deployment.yaml b/deploy/k8s/archived/helm/payment-api/templates/deployment.yaml
new file mode 100644
index 000000000..f83eb37da
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/deployment.yaml
@@ -0,0 +1,96 @@
+{{- $name := include "payment-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "payment-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "payment-api.name" . }}
+    chart: {{ template "payment-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "payment-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "payment-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}                
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/payment-api/templates/service.yaml b/deploy/k8s/archived/helm/payment-api/templates/service.yaml
new file mode 100644
index 000000000..14fc7479c
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.payment }}
+  labels:
+    app: {{ template "payment-api.name" . }}
+    chart: {{ template "payment-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "payment-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/payment-api/values.yaml b/deploy/k8s/archived/helm/payment-api/values.yaml
new file mode 100644
index 000000000..341e4e1a9
--- /dev/null
+++ b/deploy/k8s/archived/helm/payment-api/values.yaml
@@ -0,0 +1,56 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /payment-api
+
+image:
+  repository: eshop/payment.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
diff --git a/deploy/k8s/archived/helm/rabbitmq/.helmignore b/deploy/k8s/archived/helm/rabbitmq/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/rabbitmq/Chart.yaml b/deploy/k8s/archived/helm/rabbitmq/Chart.yaml
new file mode 100644
index 000000000..2d955858e
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: rabbitmq
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/rabbitmq/templates/NOTES.txt b/deploy/k8s/archived/helm/rabbitmq/templates/NOTES.txt
new file mode 100644
index 000000000..49edf7f9c
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop rabbitmq installed
+-------------------------
+
+rabbitmq is not directly exposed outside cluster. If need to access it from outside use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "rabbitmq.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/rabbitmq/templates/_helpers.tpl b/deploy/k8s/archived/helm/rabbitmq/templates/_helpers.tpl
new file mode 100644
index 000000000..bbbb2e33d
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "rabbitmq.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "rabbitmq.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "rabbitmq.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/rabbitmq/templates/_names.tpl b/deploy/k8s/archived/helm/rabbitmq/templates/_names.tpl
new file mode 100644
index 000000000..be0a9b800
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/templates/_names.tpl
@@ -0,0 +1,8 @@
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "rabbitmq" -}}
+{{- end -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/rabbitmq/templates/deployment.yaml b/deploy/k8s/archived/helm/rabbitmq/templates/deployment.yaml
new file mode 100644
index 000000000..9819a6455
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/templates/deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "rabbitmq.fullname" . }}
+  labels:
+    app: {{ template "rabbitmq.name" . }}
+    chart: {{ template "rabbitmq.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "rabbitmq.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "rabbitmq.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 5672
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/deploy/k8s/archived/helm/rabbitmq/templates/service.yaml b/deploy/k8s/archived/helm/rabbitmq/templates/service.yaml
new file mode 100644
index 000000000..5de39e0a8
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.inf.eventbus.svc }}
+  labels:
+    app: {{ template "rabbitmq.name" . }}
+    chart: {{ template "rabbitmq.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "rabbitmq.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/rabbitmq/values.yaml b/deploy/k8s/archived/helm/rabbitmq/values.yaml
new file mode 100644
index 000000000..5e9efd521
--- /dev/null
+++ b/deploy/k8s/archived/helm/rabbitmq/values.yaml
@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: rabbitmq
+  tag: 3-management
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 5672
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deploy/k8s/archived/helm/sql-data/.helmignore b/deploy/k8s/archived/helm/sql-data/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/sql-data/Chart.yaml b/deploy/k8s/archived/helm/sql-data/Chart.yaml
new file mode 100644
index 000000000..6e5d726c5
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: sql-data
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/sql-data/templates/NOTES.txt b/deploy/k8s/archived/helm/sql-data/templates/NOTES.txt
new file mode 100644
index 000000000..468a155b0
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop SQL Server Installed
+--------------------------
+
+SQL server is not exposed outside the cluster. If need to access it from outside, use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "sql-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/sql-data/templates/_helpers.tpl b/deploy/k8s/archived/helm/sql-data/templates/_helpers.tpl
new file mode 100644
index 000000000..ee953f2f8
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "sql-data.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "sql-data.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "sql-data.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/sql-data/templates/_names.tpl b/deploy/k8s/archived/helm/sql-data/templates/_names.tpl
new file mode 100644
index 000000000..dc35d62fe
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/templates/_names.tpl
@@ -0,0 +1,8 @@
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/sql-data/templates/deployment.yaml b/deploy/k8s/archived/helm/sql-data/templates/deployment.yaml
new file mode 100644
index 000000000..4b2f589ef
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/templates/deployment.yaml
@@ -0,0 +1,50 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "sql-data.fullname" . }}
+  labels:
+    app: {{ template "sql-data.name" . }}
+    chart: {{ template "sql-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "sql-data.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "sql-data.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+          - name: ACCEPT_EULA
+            value: "Y"
+          - name: MSSQL_PID
+            value: {{ .Values.inf.sql.common.pid }}
+          - name: MSSQL_SA_PASSWORD
+            value: {{ .Values.inf.sql.common.pwd }}
+          ports:
+            - name: http
+              containerPort: 1433
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/deploy/k8s/archived/helm/sql-data/templates/service.yaml b/deploy/k8s/archived/helm/sql-data/templates/service.yaml
new file mode 100644
index 000000000..b9b8d59fc
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "sql-name" . }}
+  labels:
+    app: {{ template "sql-data.name" . }}
+    chart: {{ template "sql-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "sql-data.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/sql-data/values.yaml b/deploy/k8s/archived/helm/sql-data/values.yaml
new file mode 100644
index 000000000..0ed76556a
--- /dev/null
+++ b/deploy/k8s/archived/helm/sql-data/values.yaml
@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: microsoft/mssql-server-linux
+  tag: 2017-CU7
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 1433
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/deploy/k8s/archived/helm/tls-support/.helmignore b/deploy/k8s/archived/helm/tls-support/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/tls-support/Chart.yaml b/deploy/k8s/archived/helm/tls-support/Chart.yaml
new file mode 100644
index 000000000..e21e04e95
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: tt-ssl
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/tls-support/templates/_helpers.tpl b/deploy/k8s/archived/helm/tls-support/templates/_helpers.tpl
new file mode 100644
index 000000000..5088703f0
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "tt-tls.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "tt-tls.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "tt-tls.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/tls-support/templates/issuer.yaml b/deploy/k8s/archived/helm/tls-support/templates/issuer.yaml
new file mode 100644
index 000000000..ae9587198
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/templates/issuer.yaml
@@ -0,0 +1,17 @@
+apiVersion: cert-manager.io/v1alpha2
+kind: Issuer
+metadata:
+  name: {{ .Values.issuerName }}
+  namespace: default
+  environment: {{ .Values.environment }}
+  app: {{ .Values.applicationName }}
+spec:
+  acme:
+    server: {{ .Values.server }}
+    email: not@used.com
+    privateKeySecretRef:
+      name: {{ .Values.issuerSecretName }}
+    solvers:
+    - http01:
+        ingress:
+          class: {{ .Values.ingressClass }}      
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/tls-support/values-prod.yaml b/deploy/k8s/archived/helm/tls-support/values-prod.yaml
new file mode 100644
index 000000000..fb577b9b7
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/values-prod.yaml
@@ -0,0 +1,8 @@
+applicationName: eshop
+issuerName: letsencrypt-prod
+certName: eshop-cert-prod
+environment: prod
+server: https://acme-v02.api.letsencrypt.org/directory
+certSecretName: eshop-letsencrypt-prod
+issuerSecretName: letsencrypt-prod
+ingressClass: addon-http-application-routing
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/tls-support/values-staging.yaml b/deploy/k8s/archived/helm/tls-support/values-staging.yaml
new file mode 100644
index 000000000..89dcd6654
--- /dev/null
+++ b/deploy/k8s/archived/helm/tls-support/values-staging.yaml
@@ -0,0 +1,8 @@
+applicationName: eshop
+issuerName: letsencrypt-staging
+certName: eshop-cert-staging
+environment: staging
+server: https://acme-staging-v02.api.letsencrypt.org/directory
+certSecretName: eshop-letsencrypt-staging
+issuerSecretName: letsencrypt-staging
+ingressClass: addon-http-application-routing
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webhooks-api/.helmignore b/deploy/k8s/archived/helm/webhooks-api/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webhooks-api/Chart.yaml b/deploy/k8s/archived/helm/webhooks-api/Chart.yaml
new file mode 100644
index 000000000..f8e950782
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webhooks-api
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/NOTES.txt b/deploy/k8s/archived/helm/webhooks-api/templates/NOTES.txt
new file mode 100644
index 000000000..818b99d1b
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Ordering API installed.
+-----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "webhooks-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/_helpers.tpl b/deploy/k8s/archived/helm/webhooks-api/templates/_helpers.tpl
new file mode 100644
index 000000000..3742516b7
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webhooks-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webhooks-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webhooks-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/_names.tpl b/deploy/k8s/archived/helm/webhooks-api/templates/_names.tpl
new file mode 100644
index 000000000..752355276
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/configmap.yaml b/deploy/k8s/archived/helm/webhooks-api/templates/configmap.yaml
new file mode 100644
index 000000000..05b9b7f57
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/configmap.yaml
@@ -0,0 +1,21 @@
+{{- $name := include "webhooks-api.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webhooks-api.name" . }}
+    chart: {{ template "webhooks-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  webhooks__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.webhooks.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  urls__IdentityUrl: http://{{ $identity }}
+  urls__IdentityUrlExternal: {{ $protocol }}://{{ $identity }}
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/deployment.yaml b/deploy/k8s/archived/helm/webhooks-api/templates/deployment.yaml
new file mode 100644
index 000000000..2ecb885bf
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/deployment.yaml
@@ -0,0 +1,75 @@
+{{- $name := include "webhooks-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webhooks-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "webhooks-api.name" . }}
+    chart: {{ template "webhooks-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webhooks-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webhooks-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/ingress.yaml b/deploy/k8s/archived/helm/webhooks-api/templates/ingress.yaml
new file mode 100644
index 000000000..c7c096b77
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webhooks }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "webhooks-api.fullname" . }}
+  labels:
+    app: {{ template "webhooks-api.name" . }}
+    chart: {{ template "webhooks-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/webhooks-api/templates/service.yaml b/deploy/k8s/archived/helm/webhooks-api/templates/service.yaml
new file mode 100644
index 000000000..d8a02ba65
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webhooks }}
+  labels:
+    app: {{ template "webhooks-api.name" . }}
+    chart: {{ template "webhooks-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webhooks-api.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webhooks-api/values.yaml b/deploy/k8s/archived/helm/webhooks-api/values.yaml
new file mode 100644
index 000000000..f6b1957e9
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-api/values.yaml
@@ -0,0 +1,53 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webhooks-api
+
+image:
+  repository: eshop/webhooks.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: webhooks__ConnectionString
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrlExternal
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+
diff --git a/deploy/k8s/archived/helm/webhooks-web/.helmignore b/deploy/k8s/archived/helm/webhooks-web/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webhooks-web/Chart.yaml b/deploy/k8s/archived/helm/webhooks-web/Chart.yaml
new file mode 100644
index 000000000..420b4f16d
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webhooks-web
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/NOTES.txt b/deploy/k8s/archived/helm/webhooks-web/templates/NOTES.txt
new file mode 100644
index 000000000..b7f7f97ba
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Ordering API installed.
+-----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "webhooks-web.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/_helpers.tpl b/deploy/k8s/archived/helm/webhooks-web/templates/_helpers.tpl
new file mode 100644
index 000000000..cbc856713
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webhooks-web.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webhooks-web.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webhooks-web.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/_names.tpl b/deploy/k8s/archived/helm/webhooks-web/templates/_names.tpl
new file mode 100644
index 000000000..752355276
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/configmap.yaml b/deploy/k8s/archived/helm/webhooks-web/templates/configmap.yaml
new file mode 100644
index 000000000..bd09c7c62
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/configmap.yaml
@@ -0,0 +1,20 @@
+{{- $name := include "webhooks-web.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webhooksweb := include "url-of" (list .Values.app.ingress.entries.webhooksweb .) -}}
+{{- $webhooks := include "url-of" (list .Values.app.ingress.entries.webhooks .) -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webhooks-web.name" . }}
+    chart: {{ template "webhooks-web.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  urls__webhooks: {{ $protocol }}://{{ $webhooks }}
+  identity_e: {{ $protocol }}://{{ $identity }}
+  webhooksweb_e: {{ $protocol }}://{{ $webhooksweb }}
+  urls_webhooksweb: http://{{ .Values.app.svc.webhooksweb }}
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/deployment.yaml b/deploy/k8s/archived/helm/webhooks-web/templates/deployment.yaml
new file mode 100644
index 000000000..43d406524
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/deployment.yaml
@@ -0,0 +1,75 @@
+{{- $name := include "webhooks-web.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webhooks-web.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "webhooks-web.name" . }}
+    chart: {{ template "webhooks-web.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webhooks-web.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webhooks-web.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/ingress.yaml b/deploy/k8s/archived/helm/webhooks-web/templates/ingress.yaml
new file mode 100644
index 000000000..1e5df8c45
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/ingress.yaml
@@ -0,0 +1,45 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "webhooks-web.fullname" . }}
+  labels:
+    app: {{ template "webhooks-web.name" . }}
+    chart: {{ template "webhooks-web.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $.Values.app.svc.webhooksweb }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/webhooks-web/templates/service.yaml b/deploy/k8s/archived/helm/webhooks-web/templates/service.yaml
new file mode 100644
index 000000000..873ebcc0e
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webhooksweb }}
+  labels:
+    app: {{ template "webhooks-web.name" . }}
+    chart: {{ template "webhooks-web.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webhooks-web.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webhooks-web/values.yaml b/deploy/k8s/archived/helm/webhooks-web/values.yaml
new file mode 100644
index 000000000..0e5b04b57
--- /dev/null
+++ b/deploy/k8s/archived/helm/webhooks-web/values.yaml
@@ -0,0 +1,52 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webhooks-web
+
+image:
+  repository: eshop/webhooks.client
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {}
+  hosts:
+    - chart-example.local
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: WebhooksUrl
+      key: urls__webhooks
+    - name: IdentityUrl
+      key: identity_e
+    - name: CallbackUrl
+      key: webhooksweb_e
+    - name: SelfUrl
+      key: webhooksweb_e
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Production
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: Token
+      value: "WebHooks-Demo-Web"       # Can use whatever you want
+
+
diff --git a/deploy/k8s/archived/helm/webmvc/.helmignore b/deploy/k8s/archived/helm/webmvc/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webmvc/Chart.yaml b/deploy/k8s/archived/helm/webmvc/Chart.yaml
new file mode 100644
index 000000000..c63e8924a
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webmvc
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webmvc/templates/NOTES.txt b/deploy/k8s/archived/helm/webmvc/templates/NOTES.txt
new file mode 100644
index 000000000..06e02a45d
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop WebMVC installed.
+-----------------------
diff --git a/deploy/k8s/archived/helm/webmvc/templates/_helpers.tpl b/deploy/k8s/archived/helm/webmvc/templates/_helpers.tpl
new file mode 100644
index 000000000..2e3bcef56
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webmvc.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webmvc.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webmvc.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webmvc/templates/_names.tpl b/deploy/k8s/archived/helm/webmvc/templates/_names.tpl
new file mode 100644
index 000000000..605e92e7e
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webmvc/templates/configmap.yaml b/deploy/k8s/archived/helm/webmvc/templates/configmap.yaml
new file mode 100644
index 000000000..2aa06fc7f
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/configmap.yaml
@@ -0,0 +1,26 @@
+{{- $name := include "webmvc.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $mvc := include "url-of" (list .Values.app.ingress.entries.mvc .) -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webmvc.name" . }}
+    chart: {{ template "webmvc.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  webmvc__keystore: {{ .Values.inf.redis.keystore.constr }}
+  internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }}
+  internalurls__apigwwm: http://{{ .Values.app.svc.webmarketingapigw }}
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  urls__apigwws: {{ $protocol }}://{{ $webshoppingapigw }}
+  urls__mvc: {{ $protocol }}://{{ $mvc }}
+  urls__IdentityUrl: {{ $protocol }}://{{ $identity }}
diff --git a/deploy/k8s/archived/helm/webmvc/templates/deployment.yaml b/deploy/k8s/archived/helm/webmvc/templates/deployment.yaml
new file mode 100644
index 000000000..2889dc757
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/deployment.yaml
@@ -0,0 +1,75 @@
+{{- $name := include "webmvc.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webmvc.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "webmvc.name" . }}
+    chart: {{ template "webmvc.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webmvc.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webmvc.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webmvc/templates/ingress-dockerk8s.yaml b/deploy/k8s/archived/helm/webmvc/templates/ingress-dockerk8s.yaml
new file mode 100644
index 000000000..72e043039
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/ingress-dockerk8s.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.ingress.enabled -}}
+{{- if .Values.inf.k8s.local -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mvc }}
+{{- $name := include "webmvc.fullname" . -}} 
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $name }}-local
+  labels:
+    app: {{ template "webmvc.name" . }}
+    chart: {{ template "webmvc.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}    
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+  rules:
+  - http:
+      paths:
+      - backend:
+          serviceName: {{ $serviceName }}
+          servicePort: http
+        path: {{ $ingressPath }}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webmvc/templates/ingress.yaml b/deploy/k8s/archived/helm/webmvc/templates/ingress.yaml
new file mode 100644
index 000000000..1899f5a18
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mvc -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "webmvc.fullname" . }}
+  labels:
+    app: {{ template "webmvc.name" . }}
+    chart: {{ template "webmvc.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/webmvc/templates/service.yaml b/deploy/k8s/archived/helm/webmvc/templates/service.yaml
new file mode 100644
index 000000000..74d87673f
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.mvc }}
+  labels:
+    app: {{ template "webmvc.name" . }}
+    chart: {{ template "webmvc.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webmvc.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webmvc/values.yaml b/deploy/k8s/archived/helm/webmvc/values.yaml
new file mode 100644
index 000000000..973f187f5
--- /dev/null
+++ b/deploy/k8s/archived/helm/webmvc/values.yaml
@@ -0,0 +1,61 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webmvc
+
+image:
+  repository: eshop/webmvc
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: UseLoadTest
+      key: all_EnableLoadTest
+    - name: DPConnectionString
+      key: webmvc__keystore
+    - name: PurchaseUrl
+      key: internalurls__apigwws
+    - name: ExternalPurchaseUrl
+      key: urls__apigwws
+    - name: CallBackUrl
+      key: urls__mvc
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+    - name: MarketingUrl
+      key: internalurls__apigwwm
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc      
+    - name: SignalrHubUrl
+      key: urls__apigwws
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      value: 'True'
+
diff --git a/deploy/k8s/archived/helm/webshoppingagg/.helmignore b/deploy/k8s/archived/helm/webshoppingagg/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webshoppingagg/Chart.yaml b/deploy/k8s/archived/helm/webshoppingagg/Chart.yaml
new file mode 100644
index 000000000..cd7541025
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webshoppingagg
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/NOTES.txt b/deploy/k8s/archived/helm/webshoppingagg/templates/NOTES.txt
new file mode 100644
index 000000000..f55946f36
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/NOTES.txt
@@ -0,0 +1,8 @@
+eShop Web Shopping Aggregator installed.
+----------------------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "webshoppingagg.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/_helpers.tpl b/deploy/k8s/archived/helm/webshoppingagg/templates/_helpers.tpl
new file mode 100644
index 000000000..f13dc791d
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webshoppingagg.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webshoppingagg.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webshoppingagg.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/_names.tpl b/deploy/k8s/archived/helm/webshoppingagg/templates/_names.tpl
new file mode 100644
index 000000000..d44859fea
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/_names.tpl
@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/configmap.yaml b/deploy/k8s/archived/helm/webshoppingagg/templates/configmap.yaml
new file mode 100644
index 000000000..d01de8dcd
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/configmap.yaml
@@ -0,0 +1,29 @@
+{{- $name := include "webshoppingagg.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webshoppingagg.name" . }}
+    chart: {{ template "webshoppingagg.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  webshoppingagg__keystore: {{ .Values.inf.redis.keystore.constr }}
+  internalurls__basket: http://{{ .Values.app.svc.basket }}
+  internalurls__catalog: http://{{ .Values.app.svc.catalog }}
+  internalurls__identity: http://{{ .Values.app.svc.identity }}
+  internalurls__ordering: http://{{ .Values.app.svc.ordering }}
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
+  internalurls__grpcBasket: "http://{{ .Values.app.svc.basket }}:{{ .Values.service.grpcPort }}"
+  internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
+  internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/deployment.yaml b/deploy/k8s/archived/helm/webshoppingagg/templates/deployment.yaml
new file mode 100644
index 000000000..ab5bfc0c9
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/deployment.yaml
@@ -0,0 +1,95 @@
+{{- $name := include "webshoppingagg.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webshoppingagg.fullname" . }}
+  labels:
+    app: {{ template "webshoppingagg.name" . }}
+    chart: {{ template "webshoppingagg.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}    
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webshoppingagg.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webshoppingagg.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}              
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webshoppingagg/templates/service.yaml b/deploy/k8s/archived/helm/webshoppingagg/templates/service.yaml
new file mode 100644
index 000000000..8f0cb8bd5
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webshoppingagg }}
+  labels:
+    app: {{ template "webshoppingagg.name" . }}
+    chart: {{ template "webshoppingagg.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webshoppingagg.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webshoppingagg/values.yaml b/deploy/k8s/archived/helm/webshoppingagg/values.yaml
new file mode 100644
index 000000000..15501c727
--- /dev/null
+++ b/deploy/k8s/archived/helm/webshoppingagg/values.yaml
@@ -0,0 +1,87 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webshoppingagg
+
+image:
+  repository: eshop/webshoppingagg
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: urls__basket
+      key: internalurls__basket
+    - name: urls__catalog
+      key: internalurls__catalog
+    - name: urls__orders
+      key: internalurls__ordering
+    - name: urls__identity
+      key: internalurls__identity
+    - name: CatalogUrlHC
+      key: internalurls__catalog__hc
+    - name: BasketUrlHC
+      key: internalurls__basket__hc
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc
+    - name: OrderingUrlHC
+      key: internalurls__ordering__hc
+    - name: MarketingUrlHC
+      key: internalurls__marketing__hc
+    - name: PaymentUrlHC
+      key: internalurls__payment__hc
+    - name: LocationUrlHC
+      key: internalurls__location__hc
+    - name: urls__grpcBasket
+      key: internalurls__grpcBasket
+    - name: urls__grpcCatalog
+      key: internalurls__grpcCatalog
+    - name: urls__grpcOrdering
+      key: internalurls__grpcOrdering
+
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: ASPNETCORE_URLS
+      value: http://0.0.0.0:80
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      value: 'True'
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60      
+    port: 80
+
diff --git a/deploy/k8s/archived/helm/webspa/.helmignore b/deploy/k8s/archived/helm/webspa/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webspa/Chart.yaml b/deploy/k8s/archived/helm/webspa/Chart.yaml
new file mode 100644
index 000000000..c16616489
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webspa
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webspa/templates/NOTES.txt b/deploy/k8s/archived/helm/webspa/templates/NOTES.txt
new file mode 100644
index 000000000..c8e1622db
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop WebSPA installed
+----------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webspa/templates/_helpers.tpl b/deploy/k8s/archived/helm/webspa/templates/_helpers.tpl
new file mode 100644
index 000000000..585f9f001
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webspa.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webspa.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webspa.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webspa/templates/_names.tpl b/deploy/k8s/archived/helm/webspa/templates/_names.tpl
new file mode 100644
index 000000000..605e92e7e
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/_names.tpl
@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webspa/templates/configmap.yaml b/deploy/k8s/archived/helm/webspa/templates/configmap.yaml
new file mode 100644
index 000000000..ecdbf8b63
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/configmap.yaml
@@ -0,0 +1,27 @@
+{{- $name := include "webspa.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $webmarketingapigw := include "url-of" (list .Values.app.ingress.entries.webmarketingapigw .) -}}
+{{- $spa := include "url-of" (list .Values.app.ingress.entries.spa .) -}}
+{{- $mongo := include "mongo-name" . -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webspa.name" . }}
+    chart: {{ template "webspa.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  webspa__keystore: {{ .Values.inf.redis.keystore.constr }}
+  internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }}
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  urls__apigwws: {{ $protocol }}://{{ $webshoppingapigw }}
+  urls__spa: {{ $protocol }}://{{ $spa }}
+  urls__IdentityUrl: {{ $protocol }}://{{ $identity }}
+  urls__apigwwm: {{ $protocol }}://{{ $webmarketingapigw }}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webspa/templates/deployment.yaml b/deploy/k8s/archived/helm/webspa/templates/deployment.yaml
new file mode 100644
index 000000000..20dc696bf
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/deployment.yaml
@@ -0,0 +1,75 @@
+{{- $name := include "webspa.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webspa.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "webspa.name" . }}
+    chart: {{ template "webspa.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webspa.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webspa.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}          
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webspa/templates/ingress.yaml b/deploy/k8s/archived/helm/webspa/templates/ingress.yaml
new file mode 100644
index 000000000..2b9fdd703
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/ingress.yaml
@@ -0,0 +1,45 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "webspa.fullname" . }}
+  labels:
+    app: {{ template "webspa.name" . }}
+    chart: {{ template "webspa.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $.Values.app.svc.spa }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/webspa/templates/service.yaml b/deploy/k8s/archived/helm/webspa/templates/service.yaml
new file mode 100644
index 000000000..2eab5d02e
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.spa }}
+  labels:
+    app: {{ template "webspa.name" . }}
+    chart: {{ template "webspa.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webspa.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webspa/values.yaml b/deploy/k8s/archived/helm/webspa/values.yaml
new file mode 100644
index 000000000..e1547ed39
--- /dev/null
+++ b/deploy/k8s/archived/helm/webspa/values.yaml
@@ -0,0 +1,61 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /
+
+image:
+  repository: eshop/webspa
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: UseLoadTest
+      key: all_EnableLoadTest
+    - name: DPConnectionString
+      key: webspa__keystore
+    - name: PurchaseUrl
+      key: urls__apigwws
+    - name: CallBackUrl
+      key: urls__spa
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+    - name: MarketingUrl
+      key: urls__apigwwm
+    - name: IdentityUrlHC
+      key: internalurls__identity__hc      
+    - name: SignalrHubUrl
+      key: urls__apigwws
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: ASPNETCORE_URLS
+      value: http://0.0.0.0:80
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: IsClusterEnv
+      value: 'True'
+
diff --git a/deploy/k8s/archived/helm/webstatus/.helmignore b/deploy/k8s/archived/helm/webstatus/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/deploy/k8s/archived/helm/webstatus/Chart.yaml b/deploy/k8s/archived/helm/webstatus/Chart.yaml
new file mode 100644
index 000000000..9ee2783f4
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: webstatus
+version: 0.1.0
diff --git a/deploy/k8s/archived/helm/webstatus/templates/NOTES.txt b/deploy/k8s/archived/helm/webstatus/templates/NOTES.txt
new file mode 100644
index 000000000..5d9d4570d
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/NOTES.txt
@@ -0,0 +1,2 @@
+eShop WebStatus installed.
+--------------------------
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webstatus/templates/_helpers.tpl b/deploy/k8s/archived/helm/webstatus/templates/_helpers.tpl
new file mode 100644
index 000000000..65b290af7
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "webstatus.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "webstatus.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "webstatus.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/k8s/archived/helm/webstatus/templates/_names.tpl b/deploy/k8s/archived/helm/webstatus/templates/_names.tpl
new file mode 100644
index 000000000..49455d135
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/_names.tpl
@@ -0,0 +1,50 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/deploy/k8s/archived/helm/webstatus/templates/configmap.yaml b/deploy/k8s/archived/helm/webstatus/templates/configmap.yaml
new file mode 100644
index 000000000..bf40d2a7d
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/configmap.yaml
@@ -0,0 +1,54 @@
+{{- $name := include "webstatus.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $mvc := include "url-of" (list .Values.app.ingress.entries.mvc .) -}}
+{{- $mongo := include "mongo-name" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "webstatus.name" . }}
+    chart: {{ template "webstatus.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  webstatus__keystore: {{ .Values.inf.redis.keystore.constr }}
+  name__mvc__hc: WebMVC HTTP Check
+  internalurls__mvc__hc: http://{{ .Values.app.svc.mvc }}/hc
+  name__spa__hc: WebSPA HTTP Check
+  internalurls__spa__hc: http://{{ .Values.app.svc.spa }}/hc
+  name__apigwws__hc: Web Shopping API GW HTTP Check
+  internalurls__apigwws__hc: http://{{ .Values.app.svc.webshoppingapigw }}:8001/ready
+  name__apigwwm__hc: Web Marketing API GW HTTP Check
+  internalurls__apigwwm__hc: http://{{ .Values.app.svc.webmarketingapigw }}:8001/ready
+  name__apigwms__hc: Mobile Shopping API GW HTTP Check
+  internalurls__apigwms__hc: http://{{ .Values.app.svc.mobileshoppingapigw }}:8001/ready
+  name__apigwmm__hc: Mobile Marketing API GW HTTP Check
+  internalurls__apigwmm__hc: http://{{ .Values.app.svc.mobilemarketingapigw }}:8001/ready
+  name__apigwwsagg__hc: Web Shopping Aggregator GW HTTP Check
+  internalurls__apigwwsagg__hc: http://{{ .Values.app.svc.webshoppingagg }}/hc
+  name__apigwmsagg__hc: Mobile Shopping Aggregator HTTP Check
+  internalurls__apigwmsagg__hc: http://{{ .Values.app.svc.mobileshoppingagg }}/hc
+  name__ordering__hc: Ordering HTTP Check
+  internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
+  name__orderingbackground__hc: Ordering HTTP Background Check
+  internalurls__orderingbackground__hc: http://{{ .Values.app.svc.orderingbackgroundtasks }}/hc
+  name__basket__hc: Basket HTTP Check
+  internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
+  name__catalog__hc: Catalog HTTP Check
+  internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
+  name__identity__hc: Identity HTTP Check
+  internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
+  name__marketing__hc: Marketing HTTP Check
+  internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
+  name__locations__hc: Locations HTTP Check
+  internalurls__locations__hc: http://{{ .Values.app.svc.locations }}/hc
+  name__payment__hc: Payment HTTP Check
+  internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
+  name__signalrhub__hc: Ordering SignalR Hub HTTP Check
+  internalurls__signalrhub__hc: http://{{ .Values.app.svc.orderingsignalrhub }}/hc
diff --git a/deploy/k8s/archived/helm/webstatus/templates/deployment.yaml b/deploy/k8s/archived/helm/webstatus/templates/deployment.yaml
new file mode 100644
index 000000000..70b953577
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/deployment.yaml
@@ -0,0 +1,75 @@
+{{- $name := include "webstatus.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "webstatus.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "webstatus.name" . }}
+    chart: {{ template "webstatus.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "webstatus.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "webstatus.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
diff --git a/deploy/k8s/archived/helm/webstatus/templates/ingress.yaml b/deploy/k8s/archived/helm/webstatus/templates/ingress.yaml
new file mode 100644
index 000000000..9902b86b5
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/ingress.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "webstatus.fullname" . -}}
+{{- $ingressPath := include "pathBase" . -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "webstatus.fullname" . }}
+  labels:
+    app: {{ template "webstatus.name" . }}
+    chart: {{ template "webstatus.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $.Values.app.svc.status }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/deploy/k8s/archived/helm/webstatus/templates/service.yaml b/deploy/k8s/archived/helm/webstatus/templates/service.yaml
new file mode 100644
index 000000000..37fff50c6
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/templates/service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.status }}
+  labels:
+    app: {{ template "webstatus.name" . }}
+    chart: {{ template "webstatus.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "webstatus.name" . }}
+    release: {{ .Release.Name }}
diff --git a/deploy/k8s/archived/helm/webstatus/values.yaml b/deploy/k8s/archived/helm/webstatus/values.yaml
new file mode 100644
index 000000000..e5a23ec85
--- /dev/null
+++ b/deploy/k8s/archived/helm/webstatus/values.yaml
@@ -0,0 +1,95 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webstatus
+
+image:
+  repository: eshop/webstatus
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations: {
+
+  }
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: HealthChecks-UI__HealthChecks__0__Name
+      key: name__mvc__hc
+    - name: HealthChecks-UI__HealthChecks__0__Uri
+      key: internalurls__mvc__hc
+    - name: HealthChecks-UI__HealthChecks__1__Name
+      key: name__spa__hc
+    - name: HealthChecks-UI__HealthChecks__1__Uri
+      key: internalurls__spa__hc
+    - name: HealthChecks-UI__HealthChecks__2__Name
+      key: name__apigwwsagg__hc
+    - name: HealthChecks-UI__HealthChecks__2__Uri
+      key: internalurls__apigwwsagg__hc
+    - name: HealthChecks-UI__HealthChecks__3__Name
+      key: name__apigwmsagg__hc
+    - name: HealthChecks-UI__HealthChecks__3__Uri
+      key: internalurls__apigwmsagg__hc
+    - name: HealthChecks-UI__HealthChecks__4__Name
+      key: name__ordering__hc
+    - name: HealthChecks-UI__HealthChecks__4__Uri
+      key: internalurls__ordering__hc
+    - name: HealthChecks-UI__HealthChecks__5__Name
+      key: name__basket__hc
+    - name: HealthChecks-UI__HealthChecks__5__Uri
+      key: internalurls__basket__hc
+    - name: HealthChecks-UI__HealthChecks__6__Name
+      key: name__catalog__hc
+    - name: HealthChecks-UI__HealthChecks__6__Uri
+      key: internalurls__catalog__hc
+    - name: HealthChecks-UI__HealthChecks__7__Name
+      key: name__identity__hc
+    - name: HealthChecks-UI__HealthChecks__7__Uri
+      key: internalurls__identity__hc
+    - name: HealthChecks-UI__HealthChecks__8__Name
+      key: name__marketing__hc
+    - name: HealthChecks-UI__HealthChecks__8__Uri
+      key: internalurls__marketing__hc
+    - name: HealthChecks-UI__HealthChecks__9__Name
+      key: name__locations__hc
+    - name: HealthChecks-UI__HealthChecks__9__Uri
+      key: internalurls__locations__hc
+    - name: HealthChecks-UI__HealthChecks__10__Name
+      key: name__payment__hc
+    - name: HealthChecks-UI__HealthChecks__10__Uri
+      key: internalurls__payment__hc
+    - name: HealthChecks-UI__HealthChecks__11__Name
+      key: name__signalrhub__hc
+    - name: HealthChecks-UI__HealthChecks__11__Uri
+      key: internalurls__signalrhub__hc
+    - name: HealthChecks-UI__HealthChecks__12__Name
+      key: name__orderingbackground__hc
+    - name: HealthChecks-UI__HealthChecks__12__Uri
+      key: internalurls__orderingbackground__hc
+
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
diff --git a/deploy/k8s/archived/linkerd/basket-api-sp.yaml b/deploy/k8s/archived/linkerd/basket-api-sp.yaml
new file mode 100644
index 000000000..6b23bdb9f
--- /dev/null
+++ b/deploy/k8s/archived/linkerd/basket-api-sp.yaml
@@ -0,0 +1,42 @@
+apiVersion: linkerd.io/v1alpha2
+kind: ServiceProfile
+metadata:
+  creationTimestamp: null
+  name: basket-api.default.svc.cluster.local
+  namespace: default
+spec:
+  routes:
+  - condition:
+      method: GET
+      pathRegex: /basket-api/api/v1/basket/[^/]*
+    name: GET Basket {id}
+    isRetryable: true
+  - condition:
+      method: GET
+      pathRegex: /hc
+    name: GET /hc
+    isRetryable: false
+  - condition:
+      method: GET
+      pathRegex: /liveness
+    name: GET /liveness
+    isRetryable: false
+  - condition:
+      method: POST
+      pathRegex: /BasketApi\.Basket/GetBasketById
+    name: POST /BasketApi.Basket/GetBasketById
+    isRetryable: true
+  - condition:
+      method: POST
+      pathRegex: /BasketApi\.Basket/UpdateBasket
+    name: POST /BasketApi.Basket/UpdateBasket
+    isRetryable: true
+  - condition:
+      method: POST
+      pathRegex: /basket-api/api/v1/basket/checkout
+    name: POST /v1/basket/checkout
+    isRetryable: true
+  retryBudget:
+    retryRatio: 0.2
+    minRetriesPerSecond: 10
+    ttl: 10s
\ No newline at end of file
diff --git a/deploy/k8s/archived/linkerd/catalog-api-sp.yaml b/deploy/k8s/archived/linkerd/catalog-api-sp.yaml
new file mode 100644
index 000000000..6e9afa472
--- /dev/null
+++ b/deploy/k8s/archived/linkerd/catalog-api-sp.yaml
@@ -0,0 +1,47 @@
+apiVersion: linkerd.io/v1alpha2
+kind: ServiceProfile
+metadata:
+  creationTimestamp: null
+  name: catalog-api.default.svc.cluster.local
+  namespace: default
+spec:
+  routes:
+  - condition:
+      method: GET
+      pathRegex: /catalog-api/api/v1/catalog/catalogbrands
+    name: GET /v1/catalog/catalogbrands
+    isRetryable: true
+  - condition:
+      method: GET
+      pathRegex: /catalog-api/api/v1/catalog/catalogtypes
+    name: GET /v1/catalog/catalogtypes
+    isRetryable: true
+  - condition:
+      method: GET
+      pathRegex: /catalog-api/api/v1/catalog/items
+    name: GET /v1/catalog/items
+    isRetryable: true
+  - condition:
+      method: GET
+      pathRegex: /api/v1/catalog/items/[^/]*/pic/
+    name: GET /v1/catalog/items/{id}/pic/
+    isRetryable: false
+  - condition:
+      method: GET
+      pathRegex: /hc
+    name: GET /hc
+    isRetryable: false
+  - condition:
+      method: GET
+      pathRegex: /liveness
+    isRetryable: false
+    name: GET /liveness
+  - condition:
+      method: POST
+      pathRegex: /CatalogApi\.Catalog/GetItemsByIds
+    name: POST /CatalogApi.Catalog/GetItemsByIds
+    isRetryable: true
+  retryBudget:
+    retryRatio: 0.2
+    minRetriesPerSecond: 10
+    ttl: 10s
\ No newline at end of file
diff --git a/deploy/k8s/archived/nginx-ingress/local-cm.yaml b/deploy/k8s/archived/nginx-ingress/local-cm.yaml
new file mode 100644
index 000000000..02906afc1
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/local-cm.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+  name: nginx-configuration
+  namespace: ingress-nginx
+data:
+  proxy-buffer-size: "128k"
+  proxy-buffers: "4 256k"
\ No newline at end of file
diff --git a/deploy/k8s/archived/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml
new file mode 100644
index 000000000..3a3fcf5a5
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml
@@ -0,0 +1,3 @@
+data:
+  mvc_e: http://10.0.75.1/webmvc
+  
\ No newline at end of file
diff --git a/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml
new file mode 100644
index 000000000..1475deec1
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml
@@ -0,0 +1,3 @@
+data:
+  urls__IdentityUrl: http://10.0.75.1/identity
+  urls__mvc: http://10.0.75.1/webmvc
diff --git a/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-fix.yaml b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-fix.yaml
new file mode 100644
index 000000000..b9ecd4cba
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/local-dockerk8s/mvc-fix.yaml
@@ -0,0 +1,39 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/ssl-redirect: "false"
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+  labels:
+    app: webmvc
+  name: eshop-webmvc-loopback
+  namespace: default
+spec:
+  rules:
+  - http: 
+      paths:
+      - backend:
+          serviceName: webmvc
+          servicePort: http
+        path: /webmvc
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.kubernetes.io/ssl-redirect: "false"
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+  labels:
+    app: identity-api
+  name: eshop-identity-api-loopback
+  namespace: default
+spec:
+  rules:
+  - http:
+      paths:
+      - backend:
+          serviceName: identity
+          servicePort: http
+        path: /identity
\ No newline at end of file
diff --git a/deploy/k8s/archived/nginx-ingress/local-svc.yaml b/deploy/k8s/archived/nginx-ingress/local-svc.yaml
new file mode 100644
index 000000000..945441ab8
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/local-svc.yaml
@@ -0,0 +1,21 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: ingress-nginx
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+spec:
+  externalTrafficPolicy: Local
+  type: LoadBalancer
+  selector:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+  ports:
+    - name: http
+      port: 80
+      targetPort: http
+    - name: https
+      port: 443
+      targetPort: https
\ No newline at end of file
diff --git a/deploy/k8s/archived/nginx-ingress/mandatory.yaml b/deploy/k8s/archived/nginx-ingress/mandatory.yaml
new file mode 100644
index 000000000..56b1cc3b5
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/mandatory.yaml
@@ -0,0 +1,238 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-nginx
+
+---
+
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: nginx-configuration
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: nginx-ingress-serviceaccount
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: nginx-ingress-clusterrole
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - endpoints
+      - nodes
+      - pods
+      - secrets
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: Role
+metadata:
+  name: nginx-ingress-role
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - pods
+      - secrets
+      - namespaces
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    resourceNames:
+      # Defaults to "<election-id>-<ingress-class>"
+      # Here: "<ingress-controller-leader>-<nginx>"
+      # This has to be adapted if you change either parameter
+      # when launching the nginx-ingress-controller.
+      - "ingress-controller-leader-nginx"
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+    verbs:
+      - get
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: nginx-ingress-role-nisa-binding
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: nginx-ingress-role
+subjects:
+  - kind: ServiceAccount
+    name: nginx-ingress-serviceaccount
+    namespace: ingress-nginx
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: nginx-ingress-clusterrole-nisa-binding
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: nginx-ingress-clusterrole
+subjects:
+  - kind: ServiceAccount
+    name: nginx-ingress-serviceaccount
+    namespace: ingress-nginx
+
+---
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: nginx-ingress-controller
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: ingress-nginx
+      app.kubernetes.io/part-of: ingress-nginx
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+      annotations:
+        prometheus.io/port: "10254"
+        prometheus.io/scrape: "true"
+    spec:
+      serviceAccountName: nginx-ingress-serviceaccount
+      containers:
+        - name: nginx-ingress-controller
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.20.0
+          args:
+            - /nginx-ingress-controller
+            - --configmap=$(POD_NAMESPACE)/nginx-configuration
+            - --publish-service=$(POD_NAMESPACE)/ingress-nginx
+            - --annotations-prefix=nginx.ingress.kubernetes.io
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+              add:
+                - NET_BIND_SERVICE
+            # www-data -> 33
+            runAsUser: 33
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          ports:
+            - name: http
+              containerPort: 80
+            - name: https
+              containerPort: 443
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /healthz
+              port: 10254
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /healthz
+              port: 10254
+              scheme: HTTP
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
diff --git a/deploy/k8s/archived/nginx-ingress/service-nodeport.yaml b/deploy/k8s/archived/nginx-ingress/service-nodeport.yaml
new file mode 100644
index 000000000..dd82ed3ed
--- /dev/null
+++ b/deploy/k8s/archived/nginx-ingress/service-nodeport.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: ingress-nginx
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+spec:
+  type: NodePort
+  ports:
+    - name: http
+      port: 80
+      targetPort: 80
+      protocol: TCP
+    - name: https
+      port: 443
+      targetPort: 443
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
diff --git a/deploy/k8s/archived/nodeports/rabbitmq-admin.yaml b/deploy/k8s/archived/nodeports/rabbitmq-admin.yaml
new file mode 100644
index 000000000..30d2facf1
--- /dev/null
+++ b/deploy/k8s/archived/nodeports/rabbitmq-admin.yaml
@@ -0,0 +1,12 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: rabbitmq-admin
+spec:
+  type: NodePort
+  selector:
+    app: rabbitmq
+  ports:
+    - port: 15672
+      nodePort: 31672
+      name: rabbitmq-port
diff --git a/deploy/k8s/archived/nodeports/sql-service.yaml b/deploy/k8s/archived/nodeports/sql-service.yaml
new file mode 100644
index 000000000..7b0233b68
--- /dev/null
+++ b/deploy/k8s/archived/nodeports/sql-service.yaml
@@ -0,0 +1,12 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: sql-service
+spec:
+  type: NodePort
+  selector:
+    app: sql-data
+  ports:
+    - port: 1433
+      nodePort: 31433
+      name: sql-port
diff --git a/deploy/k8s/helm/apigwmm/templates/deployment.yaml b/deploy/k8s/helm/apigwmm/templates/deployment.yaml
index f93706bb9..70b4ffa8f 100644
--- a/deploy/k8s/helm/apigwmm/templates/deployment.yaml
+++ b/deploy/k8s/helm/apigwmm/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{- $name := include "apigwmm.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwmm.fullname" . }}
diff --git a/deploy/k8s/helm/apigwms/templates/deployment.yaml b/deploy/k8s/helm/apigwms/templates/deployment.yaml
index 2c5703103..c62751f1c 100644
--- a/deploy/k8s/helm/apigwms/templates/deployment.yaml
+++ b/deploy/k8s/helm/apigwms/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{- $name := include "apigwms.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwms.fullname" . }}
diff --git a/deploy/k8s/helm/apigwwm/templates/deployment.yaml b/deploy/k8s/helm/apigwwm/templates/deployment.yaml
index 6ceb1fa1b..8c8619f8a 100644
--- a/deploy/k8s/helm/apigwwm/templates/deployment.yaml
+++ b/deploy/k8s/helm/apigwwm/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{- $name := include "apigwwm.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwwm.fullname" . }}
diff --git a/deploy/k8s/helm/apigwws/templates/deployment.yaml b/deploy/k8s/helm/apigwws/templates/deployment.yaml
index 3aedde6dd..bbe7fedf8 100644
--- a/deploy/k8s/helm/apigwws/templates/deployment.yaml
+++ b/deploy/k8s/helm/apigwws/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{- $name := include "apigwws.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwws.fullname" . }}
diff --git a/deploy/k8s/helm/basket-api/templates/deployment.yaml b/deploy/k8s/helm/basket-api/templates/deployment.yaml
index dc90666f5..b9fd26204 100644
--- a/deploy/k8s/helm/basket-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/basket-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "basket-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "basket-api.fullname" . }}
diff --git a/deploy/k8s/helm/basket-data/templates/deployment.yaml b/deploy/k8s/helm/basket-data/templates/deployment.yaml
index 8ccceceeb..00f3a8cd0 100644
--- a/deploy/k8s/helm/basket-data/templates/deployment.yaml
+++ b/deploy/k8s/helm/basket-data/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "basket-data.fullname" . }}
diff --git a/deploy/k8s/helm/catalog-api/templates/deployment.yaml b/deploy/k8s/helm/catalog-api/templates/deployment.yaml
index 33a0ad5b4..266d89407 100644
--- a/deploy/k8s/helm/catalog-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/catalog-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "catalog-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "catalog-api.fullname" . }}
diff --git a/deploy/k8s/helm/deploy-all-mac.ps1 b/deploy/k8s/helm/deploy-all-mac.ps1
new file mode 100644
index 000000000..c74b7e05e
--- /dev/null
+++ b/deploy/k8s/helm/deploy-all-mac.ps1
@@ -0,0 +1,156 @@
+Param(
+    [parameter(Mandatory=$false)][string]$registry,
+    [parameter(Mandatory=$false)][string]$dockerUser,
+    [parameter(Mandatory=$false)][string]$dockerPassword,
+    [parameter(Mandatory=$false)][string]$externalDns,
+    [parameter(Mandatory=$false)][string]$appName="eshop",
+    [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
+    [parameter(Mandatory=$false)][bool]$deployCharts=$true,
+    [parameter(Mandatory=$false)][bool]$clean=$true,
+    [parameter(Mandatory=$false)][string]$aksName="",
+    [parameter(Mandatory=$false)][string]$aksRg="",
+    [parameter(Mandatory=$false)][string]$imageTag="latest",
+    [parameter(Mandatory=$false)][bool]$useLocalk8s=$false,
+    [parameter(Mandatory=$false)][bool]$useMesh=$false,
+    [parameter(Mandatory=$false)][string][ValidateSet('Always','IfNotPresent','Never', IgnoreCase=$false)]$imagePullPolicy="Always",
+    [parameter(Mandatory=$false)][string][ValidateSet('prod','staging','none','custom', IgnoreCase=$false)]$sslSupport = "none",
+    [parameter(Mandatory=$false)][string]$tlsSecretName = "eshop-tls-custom",
+    [parameter(Mandatory=$false)][string]$chartsToDeploy="*",
+    [parameter(Mandatory=$false)][string]$ingressMeshAnnotationsFile="ingress_values_linkerd.yaml"
+    )
+
+function Install-Chart  {
+    Param([string]$chart,[string]$initialOptions, [bool]$customRegistry)
+    $options=$initialOptions
+    if ($sslEnabled) {
+        $options = "$options --set ingress.tls[0].secretName=$tlsSecretName --set ingress.tls[0].hosts=`{$dns`}" 
+        if ($sslSupport -ne "custom") {
+            $options = "$options --set inf.tls.issuer=$sslIssuer"
+        }
+    }
+    if ($customRegistry) {
+        $options = "$options --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret"
+    }
+    
+    if ($chart -ne "eshop-common" -or $customRegistry)  {       # eshop-common is ignored when no secret must be deployed        
+        
+        $command = "helm install $appName-$chart $options $chart"
+        Write-Host "Helm Command: $command" -ForegroundColor Gray        
+        Invoke-Expression $command
+    }
+}
+
+$dns = $externalDns
+$sslEnabled=$false
+$sslIssuer=""
+
+if ($sslSupport -eq "staging") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-staging"
+    $sslIssuer="letsencrypt-staging"
+}
+elseif ($sslSupport -eq "prod") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-prod"
+    $sslIssuer="letsencrypt-prod"
+}
+elseif ($sslSupport -eq "custom") {
+    $sslEnabled=$true
+}
+
+$ingressValuesFile="ingress_values.yaml"
+
+if ($useLocalk8s -eq $true) {
+    $ingressValuesFile="ingress_values_dockerk8s.yaml"
+    $dns="localhost"
+}
+
+if ($externalDns -eq "aks") {
+    if  ([string]::IsNullOrEmpty($aksName) -or [string]::IsNullOrEmpty($aksRg)) {
+        Write-Host "Error: When using -dns aks, MUST set -aksName and -aksRg too." -ForegroundColor Red
+        exit 1
+    }
+    Write-Host "Getting DNS of AKS of AKS $aksName (in resource group $aksRg)..." -ForegroundColor Green
+    $dns = $(az aks show -n $aksName  -g $aksRg --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName)
+    if ([string]::IsNullOrEmpty($dns)) {
+        Write-Host "Error getting DNS of AKS $aksName (in resource group $aksRg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged & in version 2.0.37 or higher" -ForegroundColor Red
+        exit 1
+    }
+    $dns = $dns -replace '[\"]'
+    Write-Host "DNS base found is $dns. Will use $appName.$dns for the app!" -ForegroundColor Green
+    $dns = "$appName.$dns"
+}
+
+# Initialization & check commands
+if ([string]::IsNullOrEmpty($dns)) {
+    Write-Host "No DNS specified. Ingress resources will be bound to public ip" -ForegroundColor Yellow
+    if ($sslEnabled) {
+        Write-Host "Can't bound SSL to public IP. DNS is mandatory when using TLS" -ForegroundColor Red
+        exit 1
+    }
+}
+
+if ($useLocalk8s -and $sslEnabled) {
+    Write-Host "SSL can'be enabled on local K8s." -ForegroundColor Red
+    exit 1
+}
+
+if ($clean) {    
+    $listOfReleases=$(helm ls --filter eshop -q)    
+    if ([string]::IsNullOrEmpty($listOfReleases)) {
+        Write-Host "No previous releases found!" -ForegroundColor Green
+	}else{
+        Write-Host "Previous releases found" -ForegroundColor Green
+        Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
+        helm uninstall $listOfReleases
+        Write-Host "Previous releases deleted" -ForegroundColor Green
+	}        
+}
+
+$useCustomRegistry=$false
+
+if (-not [string]::IsNullOrEmpty($registry)) {
+    $useCustomRegistry=$true
+    if ([string]::IsNullOrEmpty($dockerUser) -or [string]::IsNullOrEmpty($dockerPassword)) {
+        Write-Host "Error: Must use -dockerUser AND -dockerPassword if specifying custom registry" -ForegroundColor Red
+        exit 1
+    }
+}
+
+Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
+
+$infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
+$charts = ("eshop-common", "basket-api","catalog-api", "identity-api", "locations-api", "marketing-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
+$gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
+
+if ($deployInfrastructure) {
+    foreach ($infra in $infras) {
+        Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
+        helm install "$appName-$infra" --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" $infra     
+    }
+}
+else {
+    Write-Host "eShopOnContainers infrastructure (bbdd, redis, ...) charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+if ($deployCharts) {
+    foreach ($chart in $charts) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing: $chart" -ForegroundColor Green
+            Install-Chart $chart "--values app.yaml --values inf.yaml --values $ingressValuesFile --values $ingressMeshAnnotationsFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts=``{$dns``} --set image.tag=$imageTag --set image.pullPolicy=$imagePullPolicy --set inf.tls.enabled=$sslEnabled --set inf.mesh.enabled=$useMesh --set inf.k8s.local=$useLocalk8s" $useCustomRegistry
+        }
+    }
+
+    foreach ($chart in $gateways) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing Api Gateway Chart: $chart" -ForegroundColor Green
+            Install-Chart $chart "--values app.yaml --values inf.yaml --values $ingressValuesFile  --set app.name=$appName --set inf.k8s.dns=$dns  --set image.pullPolicy=$imagePullPolicy --set inf.mesh.enabled=$useMesh --set ingress.hosts=``{$dns``} --set inf.tls.enabled=$sslEnabled" $false
+            
+        }
+    }
+}
+else {
+    Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+Write-Host "helm charts installed." -ForegroundColor Green
diff --git a/deploy/k8s/helm/deploy-all.ps1 b/deploy/k8s/helm/deploy-all.ps1
index 1711c0c2c..da0424195 100644
--- a/deploy/k8s/helm/deploy-all.ps1
+++ b/deploy/k8s/helm/deploy-all.ps1
@@ -33,7 +33,7 @@ function Install-Chart  {
     }
     
     if ($chart -ne "eshop-common" -or $customRegistry)  {       # eshop-common is ignored when no secret must be deployed        
-        $command = "install $options --name=$appName-$chart $chart"
+        $command = "install $appName-$chart $options $chart"
         Write-Host "Helm Command: helm $command" -ForegroundColor Gray
         Invoke-Expression 'cmd /c "helm $command"'
     }
@@ -94,10 +94,16 @@ if ($useLocalk8s -and $sslEnabled) {
     exit 1
 }
 
-if ($clean) {
-    Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
-    helm delete --purge $(helm ls -q eshop) 
-    Write-Host "Previous releases deleted" -ForegroundColor Green
+if ($clean) {    
+    $listOfReleases=$(helm ls --filter eshop -q)    
+    if ([string]::IsNullOrEmpty($listOfReleases)) {
+        Write-Host "No previous releases found!" -ForegroundColor Green
+	}else{
+        Write-Host "Previous releases found" -ForegroundColor Green
+        Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
+        helm uninstall $listOfReleases
+        Write-Host "Previous releases deleted" -ForegroundColor Green
+	}        
 }
 
 $useCustomRegistry=$false
@@ -119,7 +125,7 @@ $gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
 if ($deployInfrastructure) {
     foreach ($infra in $infras) {
         Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
-        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" --name="$appName-$infra" $infra     
+        helm install "$appName-$infra" --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" $infra     
     }
 }
 else {
diff --git a/deploy/k8s/helm/deploy-all.sh b/deploy/k8s/helm/deploy-all.sh
index 6f6d868aa..bf07105ef 100644
--- a/deploy/k8s/helm/deploy-all.sh
+++ b/deploy/k8s/helm/deploy-all.sh
@@ -201,7 +201,7 @@ if [[ $clean ]]; then
   if [[ -z $(helm ls -q --namespace $namespace) ]]; then
     echo "No previous releases found"
   else
-    helm delete --purge $(helm ls -q --namespace $namespace)
+    helm uninstall $(helm ls -q --namespace $namespace)
     echo "Previous releases deleted"
     waitsecs=10; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
   fi
@@ -215,7 +215,7 @@ if [[ !$skip_infrastructure ]]; then
   for infra in "${infras[@]}"
   do
     echo "Installing infrastructure: $infra"
-    helm install --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 --name="$app_name-$infra" $infra     
+    helm install "$app_name-$infra" --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 $infra     
   done  
 fi
 
@@ -223,9 +223,9 @@ for chart in "${charts[@]}"
 do
     echo "Installing: $chart"
     if [[ $use_custom_registry ]]; then 
-      helm install --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 --name="$app_name-$chart" $chart 
+      helm 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 
     elif [[ $chart != "eshop-common" ]]; then  # eshop-common is ignored when no secret must be deployed
-      helm install --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 --name="$app_name-$chart" $chart 
+      helm 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
 done
 
diff --git a/deploy/k8s/helm/identity-api/templates/deployment.yaml b/deploy/k8s/helm/identity-api/templates/deployment.yaml
index c6ad69067..f2e7d6078 100644
--- a/deploy/k8s/helm/identity-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/identity-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "identity-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "identity-api.fullname" . }}
diff --git a/deploy/k8s/helm/keystore-data/templates/deployment.yaml b/deploy/k8s/helm/keystore-data/templates/deployment.yaml
index 34f1fe074..d3604c212 100644
--- a/deploy/k8s/helm/keystore-data/templates/deployment.yaml
+++ b/deploy/k8s/helm/keystore-data/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "keystore-data.fullname" . }}
diff --git a/deploy/k8s/helm/locations-api/templates/deployment.yaml b/deploy/k8s/helm/locations-api/templates/deployment.yaml
index 9a5bb608c..1dba5d166 100644
--- a/deploy/k8s/helm/locations-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/locations-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "locations-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "locations-api.fullname" . }}
diff --git a/deploy/k8s/helm/marketing-api/templates/deployment.yaml b/deploy/k8s/helm/marketing-api/templates/deployment.yaml
index 60d4cd1a3..6b833eb8c 100644
--- a/deploy/k8s/helm/marketing-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/marketing-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "marketing-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "marketing-api.fullname" . }}
diff --git a/deploy/k8s/helm/mobileshoppingagg/templates/deployment.yaml b/deploy/k8s/helm/mobileshoppingagg/templates/deployment.yaml
index 41e1fa75c..eb0f4f536 100644
--- a/deploy/k8s/helm/mobileshoppingagg/templates/deployment.yaml
+++ b/deploy/k8s/helm/mobileshoppingagg/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "mobileshoppingagg.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "mobileshoppingagg.fullname" . }}
diff --git a/deploy/k8s/helm/nosql-data/templates/deployment.yaml b/deploy/k8s/helm/nosql-data/templates/deployment.yaml
index 9b1f32319..c1f5c9a8e 100644
--- a/deploy/k8s/helm/nosql-data/templates/deployment.yaml
+++ b/deploy/k8s/helm/nosql-data/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "nosql-data.fullname" . }}
diff --git a/deploy/k8s/helm/ordering-api/templates/deployment.yaml b/deploy/k8s/helm/ordering-api/templates/deployment.yaml
index 327040701..4e25dcbb6 100644
--- a/deploy/k8s/helm/ordering-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/ordering-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "ordering-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-api.fullname" . }}
diff --git a/deploy/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml b/deploy/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
index d93c7f764..cbb06ffdc 100644
--- a/deploy/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
+++ b/deploy/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{- $name := include "ordering-backgroundtasks.fullname" . -}}
 {{- $cfgname :=  printf "cfg-%s" $name | trunc 63  }}
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-backgroundtasks.fullname" . }}
diff --git a/deploy/k8s/helm/ordering-signalrhub/templates/deployment.yaml b/deploy/k8s/helm/ordering-signalrhub/templates/deployment.yaml
index af3867ea5..87fd51da6 100644
--- a/deploy/k8s/helm/ordering-signalrhub/templates/deployment.yaml
+++ b/deploy/k8s/helm/ordering-signalrhub/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "ordering-signalrhub.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-signalrhub.fullname" . }}
diff --git a/deploy/k8s/helm/payment-api/templates/deployment.yaml b/deploy/k8s/helm/payment-api/templates/deployment.yaml
index f83eb37da..df0bbe7d1 100644
--- a/deploy/k8s/helm/payment-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/payment-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "payment-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "payment-api.fullname" . }}
diff --git a/deploy/k8s/helm/rabbitmq/templates/deployment.yaml b/deploy/k8s/helm/rabbitmq/templates/deployment.yaml
index 9819a6455..1e81d34c5 100644
--- a/deploy/k8s/helm/rabbitmq/templates/deployment.yaml
+++ b/deploy/k8s/helm/rabbitmq/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
diff --git a/deploy/k8s/helm/sql-data/templates/deployment.yaml b/deploy/k8s/helm/sql-data/templates/deployment.yaml
index 4b2f589ef..bc94d2e9e 100644
--- a/deploy/k8s/helm/sql-data/templates/deployment.yaml
+++ b/deploy/k8s/helm/sql-data/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "sql-data.fullname" . }}
diff --git a/deploy/k8s/helm/webhooks-api/templates/deployment.yaml b/deploy/k8s/helm/webhooks-api/templates/deployment.yaml
index 2ecb885bf..16aeecd91 100644
--- a/deploy/k8s/helm/webhooks-api/templates/deployment.yaml
+++ b/deploy/k8s/helm/webhooks-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webhooks-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webhooks-api.fullname" . }}
diff --git a/deploy/k8s/helm/webhooks-web/templates/deployment.yaml b/deploy/k8s/helm/webhooks-web/templates/deployment.yaml
index 43d406524..7ee3572f5 100644
--- a/deploy/k8s/helm/webhooks-web/templates/deployment.yaml
+++ b/deploy/k8s/helm/webhooks-web/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webhooks-web.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webhooks-web.fullname" . }}
diff --git a/deploy/k8s/helm/webmvc/templates/deployment.yaml b/deploy/k8s/helm/webmvc/templates/deployment.yaml
index 2889dc757..2e1162be1 100644
--- a/deploy/k8s/helm/webmvc/templates/deployment.yaml
+++ b/deploy/k8s/helm/webmvc/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webmvc.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webmvc.fullname" . }}
diff --git a/deploy/k8s/helm/webshoppingagg/templates/deployment.yaml b/deploy/k8s/helm/webshoppingagg/templates/deployment.yaml
index ab5bfc0c9..3e82f1a0e 100644
--- a/deploy/k8s/helm/webshoppingagg/templates/deployment.yaml
+++ b/deploy/k8s/helm/webshoppingagg/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webshoppingagg.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webshoppingagg.fullname" . }}
diff --git a/deploy/k8s/helm/webspa/templates/deployment.yaml b/deploy/k8s/helm/webspa/templates/deployment.yaml
index 20dc696bf..4cffcdb8f 100644
--- a/deploy/k8s/helm/webspa/templates/deployment.yaml
+++ b/deploy/k8s/helm/webspa/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webspa.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webspa.fullname" . }}
diff --git a/deploy/k8s/helm/webstatus/templates/deployment.yaml b/deploy/k8s/helm/webstatus/templates/deployment.yaml
index 70b953577..33ab7e056 100644
--- a/deploy/k8s/helm/webstatus/templates/deployment.yaml
+++ b/deploy/k8s/helm/webstatus/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{- $name := include "webstatus.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webstatus.fullname" . }}
diff --git a/deploy/k8s/nginx-ingress/mandatory.yaml b/deploy/k8s/nginx-ingress/mandatory.yaml
index 56b1cc3b5..2e63edd59 100644
--- a/deploy/k8s/nginx-ingress/mandatory.yaml
+++ b/deploy/k8s/nginx-ingress/mandatory.yaml
@@ -163,7 +163,7 @@ subjects:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-ingress-controller

From 17e838263fcf6dd112c30827fb4c9b859c10592d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2020 16:25:09 +0530
Subject: [PATCH 11/44] Bump elliptic from 6.4.1 to 6.5.3 in /src/Web/WebSPA
 (#1381)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Web/WebSPA/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index eba515ab7..43ab8fbcd 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -6860,9 +6860,9 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",

From 736320b92064d5bc7f90cc9e2bb4ae57f5b0d13d Mon Sep 17 00:00:00 2001
From: Viswanatha Swamy <vishipayyallore@yahoo.com>
Date: Tue, 4 Aug 2020 16:26:29 +0530
Subject: [PATCH 12/44] Swamy/remove unused using and refactoring entity
 classes (#1371)

* Removed Unused Usings

* Code Refactoring for readbility. Added spaces and moved the classes to separate file
---
 .../aggregator/Config/UrlsConfig.cs           | 12 +++++++----
 .../aggregator/Controllers/HomeController.cs  |  4 ----
 .../Filters/AuthorizeCheckOperationFilter.cs  | 13 ++++++------
 .../aggregator/Models/AddBasketItemRequest.cs |  8 ++-----
 .../aggregator/Models/BasketData.cs           | 13 +-----------
 .../aggregator/Models/BasketDataItem.cs       | 21 +++++++++++++++++++
 .../aggregator/Models/OrderData.cs            | 17 +++++++++++++++
 .../aggregator/Models/OrderItemData.cs        |  7 +++++++
 .../aggregator/Models/UpdateBasketItemData.cs | 16 ++++++++++++++
 .../Models/UpdateBasketItemsRequest.cs        | 11 +---------
 .../aggregator/Models/UpdateBasketRequest.cs  |  7 +------
 .../Models/UpdateBasketRequestItemData.cs     | 13 ++++++++++++
 .../Mobile.Bff.Shopping/aggregator/Program.cs |  2 --
 .../aggregator/Services/BasketService.cs      |  4 +---
 .../aggregator/Services/CatalogService.cs     |  1 -
 .../aggregator/Services/GrpcCallerService.cs  |  9 ++++----
 .../aggregator/Services/OrderingService.cs    |  3 +--
 .../aggregator/Config/UrlsConfig.cs           | 16 ++++++++++----
 .../Controllers/BasketController.cs           |  3 ---
 .../aggregator/Controllers/HomeController.cs  |  4 ----
 .../aggregator/Controllers/OrderController.cs |  3 ---
 .../Filters/AuthorizeCheckOperationFilter.cs  | 14 ++++++-------
 .../aggregator/Models/AddBasketItemRequest.cs | 10 ++++-----
 .../aggregator/Models/BasketData.cs           | 13 +-----------
 .../aggregator/Models/BasketDataItem.cs       | 21 +++++++++++++++++++
 .../aggregator/Models/CatalogItem.cs          |  2 ++
 .../aggregator/Models/OrderData.cs            | 19 +++++++++++++++--
 .../aggregator/Models/OrderItemData.cs        | 14 +++++++------
 .../aggregator/Models/UpdateBasketItemData.cs | 16 ++++++++++++++
 .../Models/UpdateBasketItemsRequest.cs        | 17 ++-------------
 .../aggregator/Models/UpdateBasketRequest.cs  | 12 ++---------
 .../Models/UpdateBasketRequestItemData.cs     | 11 ++++++++++
 .../aggregator/Services/BasketService.cs      |  7 +++----
 .../aggregator/Services/CatalogService.cs     |  8 +++----
 .../aggregator/Services/GrpcCallerService.cs  |  8 +++----
 .../aggregator/Services/OrderingService.cs    |  5 +----
 .../Web.Bff.Shopping/aggregator/Startup.cs    |  1 -
 37 files changed, 214 insertions(+), 151 deletions(-)
 create mode 100644 src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketDataItem.cs
 create mode 100644 src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
 create mode 100644 src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs
 create mode 100644 src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketDataItem.cs
 create mode 100644 src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
 create mode 100644 src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs

diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
index c0bb9502e..90fa010cd 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config
 {
@@ -10,12 +7,14 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config
         public class CatalogOperations
         {
             public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
+
             public static string GetItemsById(IEnumerable<int> ids) => $"/api/v1/catalog/items?ids={string.Join(',', ids)}";
         }
 
         public class BasketOperations
         {
             public static string GetItemById(string id) => $"/api/v1/basket/{id}";
+
             public static string UpdateBasket() => "/api/v1/basket";
         }
 
@@ -25,10 +24,15 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config
         }
 
         public string Basket { get; set; }
+
         public string Catalog { get; set; }
+
         public string Orders { get; set; }
+
         public string GrpcBasket { get; set; }
+
         public string GrpcCatalog { get; set; }
+
         public string GrpcOrdering { get; set; }
     }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs
index 48a71480a..e72e23ca7 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs
@@ -1,8 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
index 3b8298bfe..e975edb23 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
@@ -1,10 +1,11 @@
-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Filters
 {
-    using Microsoft.AspNetCore.Authorization;
-    using Microsoft.OpenApi.Models;
-    using Swashbuckle.AspNetCore.SwaggerGen;
-    using System.Collections.Generic;
-    using System.Linq;
 
     namespace Basket.API.Infrastructure.Filters
     {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
index f81842c09..d0271d84b 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
     public class AddBasketItemRequest
     {
         public int CatalogItemId { get; set; }
+
         public string BasketId { get; set; }
 
         public int Quantity { get; set; }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
index 426b8d2b5..7a43d58e5 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
+
     public class BasketData
     {
         public string BuyerId { get; set; }
@@ -10,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 
         public BasketData()
         {
-
         }
 
         public BasketData(string buyerId)
@@ -19,15 +19,4 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
         }
     }
 
-    public class BasketDataItem
-    {
-        public string Id { get; set; }
-        public int ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal OldUnitPrice { get; set; }
-        public int Quantity { get; set; }
-        public string PictureUrl { get; set; }
-
-    }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketDataItem.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketDataItem.cs
new file mode 100644
index 000000000..3ff91df4f
--- /dev/null
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketDataItem.cs
@@ -0,0 +1,21 @@
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
+{
+
+    public class BasketDataItem
+    {
+        public string Id { get; set; }
+
+        public int ProductId { get; set; }
+
+        public string ProductName { get; set; }
+
+        public decimal UnitPrice { get; set; }
+
+        public decimal OldUnitPrice { get; set; }
+
+        public int Quantity { get; set; }
+
+        public string PictureUrl { get; set; }
+    }
+
+}
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
index e63b453a4..44749ff6c 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
@@ -3,23 +3,39 @@ using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
+
     public class OrderData
     {
         public string OrderNumber { get; set; }
+
         public DateTime Date { get; set; }
+
         public string Status { get; set; }
+
         public decimal Total { get; set; }
+
         public string Description { get; set; }
+
         public string City { get; set; }
+
         public string Street { get; set; }
+
         public string State { get; set; }
+
         public string Country { get; set; }
+
         public string ZipCode { get; set; }
+
         public string CardNumber { get; set; }
+
         public string CardHolderName { get; set; }
+
         public bool IsDraft { get; set; }
+
         public DateTime CardExpiration { get; set; }
+
         public string CardExpirationShort { get; set; }
+
         public string CardSecurityNumber { get; set; }
 
         public int CardTypeId { get; set; }
@@ -28,4 +44,5 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 
         public List<OrderItemData> OrderItems { get;  } = new List<OrderItemData>();
     }
+
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs
index 023cf20e5..b3832fa21 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs
@@ -1,12 +1,19 @@
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
+
     public class OrderItemData
     {
         public int ProductId { get; set; }
+
         public string ProductName { get; set; }
+
         public decimal UnitPrice { get; set; }
+
         public decimal Discount { get; set; }
+
         public int Units { get; set; }
+
         public string PictureUrl { get; set; }
     }
+
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
new file mode 100644
index 000000000..f8ec70d5f
--- /dev/null
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
@@ -0,0 +1,16 @@
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
+{
+
+    public class UpdateBasketItemData
+    {
+        public string BasketItemId { get; set; }
+
+        public int NewQty { get; set; }
+
+        public UpdateBasketItemData()
+        {
+            NewQty = 0;
+        }
+    }
+
+}
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
index 35b3e76c0..c5a6ccb3e 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
+
     public class UpdateBasketItemsRequest
     {
         
@@ -15,14 +16,4 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
         }
     }
 
-    public class UpdateBasketItemData
-    {
-        public string BasketItemId { get; set; }
-        public int NewQty { get; set; }
-
-        public UpdateBasketItemData()
-        {
-            NewQty = 0;
-        }
-    }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
index b377921be..a1c255551 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
+    
     public class UpdateBasketRequest
     {
         public string BuyerId { get; set; }
@@ -9,10 +10,4 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
         public IEnumerable<UpdateBasketRequestItemData> Items { get; set; }
     }
 
-    public class UpdateBasketRequestItemData
-    {
-        public string Id { get; set; }          // Basket id
-        public int ProductId { get; set; }      // Catalog item id
-        public int Quantity { get; set; }       // Quantity
-    }
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs
new file mode 100644
index 000000000..af28e0157
--- /dev/null
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs
@@ -0,0 +1,13 @@
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
+{
+
+    public class UpdateBasketRequestItemData
+    {
+        public string Id { get; set; }          // Basket id
+
+        public int ProductId { get; set; }      // Catalog item id
+
+        public int Quantity { get; set; }       // Quantity
+    }
+
+}
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs
index f536ec19a..2fc86c51f 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs
@@ -1,10 +1,8 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using System.IO;
-using System.Net;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
index 609b6cdd9..8bd4c8948 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
@@ -1,14 +1,12 @@
 using Grpc.Net.Client;
+using GrpcBasket;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using GrpcBasket;
-using Grpc.Core;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
index 2cf160d80..f98b90989 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
@@ -1,5 +1,4 @@
 using CatalogApi;
-using Grpc.Net.Client;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Options;
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
index fe857c6cc..55f3df3ee 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
@@ -1,9 +1,8 @@
-using System.Net.Http;
-using System.Threading.Tasks;
-using System;
-using Grpc.Core;
-using Serilog;
+using Grpc.Core;
 using Grpc.Net.Client;
+using Serilog;
+using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs
index a48c942de..d34a5338a 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderingService.cs
@@ -1,4 +1,4 @@
-using Grpc.Net.Client;
+using GrpcOrdering;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
@@ -6,7 +6,6 @@ using Microsoft.Extensions.Options;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using GrpcOrdering;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
index dccccab35..b16530e1b 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
 {
+
     public class UrlsConfig
     {
+
         public class CatalogOperations
         {
             // grpc call under REST must go trough port 80
             public static string GetItemById(int id) => $"/api/v1/catalog/items/{id}";
+
             public static string GetItemById(string ids) => $"/api/v1/catalog/items/ids/{string.Join(',', ids)}";
+
             // REST call standard must go through port 5000
             public static string GetItemsById(IEnumerable<int> ids) => $":5000/api/v1/catalog/items?ids={string.Join(',', ids)}";
         }
@@ -19,6 +20,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
         public class BasketOperations
         {
             public static string GetItemById(string id) => $"/api/v1/basket/{id}";
+            
             public static string UpdateBasket() => "/api/v1/basket";
         }
 
@@ -28,10 +30,16 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
         }
 
         public string Basket { get; set; }
+
         public string Catalog { get; set; }
+
         public string Orders { get; set; }
+
         public string GrpcBasket { get; set; }
+
         public string GrpcCatalog { get; set; }
+
         public string GrpcOrdering { get; set; }
     }
+
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs
index dd5d4e85c..9471c6e09 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs
@@ -3,12 +3,9 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Serilog;
-using Newtonsoft.Json;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs
index 58ed48d1a..e742e2bd6 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs
@@ -1,8 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs
index 4b88c45b6..e528b478f 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs
@@ -2,9 +2,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
index 45c191104..c273fd19e 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
@@ -1,11 +1,11 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
-{
-    using Microsoft.AspNetCore.Authorization;
-    using Microsoft.OpenApi.Models;
-    using Swashbuckle.AspNetCore.SwaggerGen;
-    using System.Collections.Generic;
-    using System.Linq;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Collections.Generic;
+using System.Linq;
 
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
+{
     namespace Basket.API.Infrastructure.Filters
     {
         public class AuthorizeCheckOperationFilter : IOperationFilter
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
index 88aff245f..e9a6492c0 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class AddBasketItemRequest
     {
         public int CatalogItemId { get; set; }
+
         public string BasketId { get; set; }
 
         public int Quantity { get; set; }
@@ -17,4 +14,5 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
             Quantity = 1;
         }
     }
+
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
index 507c7cdb7..18e855837 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class BasketData
     {
         public string BuyerId { get; set; }
@@ -10,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 
         public BasketData()
         {
-
         }
 
         public BasketData(string buyerId)
@@ -19,15 +19,4 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
         }
     }
 
-    public class BasketDataItem
-    {
-        public string Id { get; set; }
-        public int ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal OldUnitPrice { get; set; }
-        public int Quantity { get; set; }
-        public string PictureUrl { get; set; }
-
-    }
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketDataItem.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketDataItem.cs
new file mode 100644
index 000000000..05fed054e
--- /dev/null
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketDataItem.cs
@@ -0,0 +1,21 @@
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+{
+
+    public class BasketDataItem
+    {
+        public string Id { get; set; }
+
+        public int ProductId { get; set; }
+
+        public string ProductName { get; set; }
+
+        public decimal UnitPrice { get; set; }
+
+        public decimal OldUnitPrice { get; set; }
+
+        public int Quantity { get; set; }
+
+        public string PictureUrl { get; set; }
+    }
+
+}
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs
index 43e8e1cd1..68c856970 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs
@@ -1,5 +1,6 @@
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class CatalogItem
     {
         public int Id { get; set; }
@@ -10,4 +11,5 @@
 
         public string PictureUri { get; set; }
     }
+
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs
index e9d5982b9..c4536d697 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs
@@ -1,27 +1,41 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class OrderData
     {
         public string OrderNumber { get; set; }
+
         public DateTime Date { get; set; }
+
         public string Status { get; set; }
+
         public decimal Total { get; set; }
+
         public string Description { get; set; }
+
         public string City { get; set; }
+
         public string Street { get; set; }
+
         public string State { get; set; }
+
         public string Country { get; set; }
+
         public string ZipCode { get; set; }
+
         public string CardNumber { get; set; }
+
         public string CardHolderName { get; set; }
+
         public bool IsDraft { get; set; }
+
         public DateTime CardExpiration { get; set; }
+
         public string CardExpirationShort { get; set; }
+
         public string CardSecurityNumber { get; set; }
 
         public int CardTypeId { get; set; }
@@ -30,4 +44,5 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 
         public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
     }
+
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs
index 1a40cb8cb..0c2082fa2 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs
@@ -1,17 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class OrderItemData
     {
         public int ProductId { get; set; }
+
         public string ProductName { get; set; }
+
         public decimal UnitPrice { get; set; }
+
         public decimal Discount { get; set; }
+
         public int Units { get; set; }
+
         public string PictureUrl { get; set; }
     }
+
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
new file mode 100644
index 000000000..b75784aa2
--- /dev/null
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs
@@ -0,0 +1,16 @@
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+{
+
+    public class UpdateBasketItemData
+    {
+        public string BasketItemId { get; set; }
+
+        public int NewQty { get; set; }
+
+        public UpdateBasketItemData()
+        {
+            NewQty = 0;
+        }
+    }
+
+}
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
index b41c069bc..3e356dfe1 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class UpdateBasketItemsRequest
     {
-        
         public string BasketId { get; set; }
 
         public ICollection<UpdateBasketItemData> Updates { get; set; }
@@ -18,14 +15,4 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
         }
     }
 
-    public class UpdateBasketItemData
-    {
-        public string BasketItemId { get; set; }
-        public int NewQty { get; set; }
-
-        public UpdateBasketItemData()
-        {
-            NewQty = 0;
-        }
-    }
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
index 9beeeade4..070016f70 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 {
+
     public class UpdateBasketRequest
     {
         public string BuyerId { get; set; }
@@ -12,10 +10,4 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
         public IEnumerable<UpdateBasketRequestItemData> Items { get; set; }
     }
 
-    public class UpdateBasketRequestItemData
-    {
-        public string Id { get; set; }          // Basket id
-        public int ProductId { get; set; }      // Catalog item id
-        public int Quantity { get; set; }       // Quantity
-    }
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs
new file mode 100644
index 000000000..90800374d
--- /dev/null
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs
@@ -0,0 +1,11 @@
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+{
+    public class UpdateBasketRequestItemData
+    {
+        public string Id { get; set; }          // Basket id
+
+        public int ProductId { get; set; }      // Catalog item id
+
+        public int Quantity { get; set; }       // Quantity
+    }
+}
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs
index b289e98d6..7e85132cd 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs
@@ -1,12 +1,11 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
+using GrpcBasket;
+using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System.Threading.Tasks;
-using Grpc.Net.Client;
 using System.Linq;
-using GrpcBasket;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs
index c10094928..059e1d046 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs
@@ -1,15 +1,13 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
+using CatalogApi;
+using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using CatalogApi;
-using Grpc.Net.Client;
-using System;
 using static CatalogApi.Catalog;
-using System.Linq;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
index 43138f987..2039c7c4f 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
-using System;
-using Grpc.Core;
-using Serilog;
+using Grpc.Core;
 using Grpc.Net.Client;
+using Serilog;
+using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderingService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderingService.cs
index 8075a507c..b460f4864 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderingService.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderingService.cs
@@ -1,14 +1,11 @@
-using Grpc.Net.Client;
+using GrpcOrdering;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using GrpcOrdering;
-using Grpc.Core;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
index f9cd93819..1ea6c0f4f 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters.Basket.API.Infrastructure.Filters;
 using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;

From ae01a5c1763ad1e6e50cfacad863e8ab1587b6ad Mon Sep 17 00:00:00 2001
From: Mark Harwood <47503138+markharwood101@users.noreply.github.com>
Date: Tue, 4 Aug 2020 11:56:56 +0100
Subject: [PATCH 13/44] Removed unused usings from ModelDTOs (#1373)

---
 src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs        | 7 +------
 src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs           | 3 +--
 src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs | 7 +------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs
index 40c9f07a8..0bff03604 100644
--- a/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs
+++ b/src/Web/WebMVC/Services/ModelDTOs/LocationDTO.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebMVC.Services.ModelDTOs
+namespace WebMVC.Services.ModelDTOs
 {
     public class LocationDTO
     {
diff --git a/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs b/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs
index 5f925a8ee..aabfb5b5f 100644
--- a/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs
+++ b/src/Web/WebMVC/Services/ModelDTOs/OrderDTO.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace WebMVC.Services.ModelDTOs
 {
diff --git a/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs b/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs
index c1309d59b..065f53dbc 100644
--- a/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs
+++ b/src/Web/WebMVC/Services/ModelDTOs/OrderProcessAction.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebMVC.Services.ModelDTOs
+namespace WebMVC.Services.ModelDTOs
 {
     public class OrderProcessAction
     {

From 7161f547941af095c022a2a44ff4f4af82258081 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 4 Aug 2020 16:27:37 +0530
Subject: [PATCH 14/44] Updated dot-prop version to 5.1.1 (#1382)

---
 src/Web/WebSPA/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 43ab8fbcd..61a0ffda1 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -6812,8 +6812,8 @@
       "integrity": "sha512-l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.1.1.tgz",
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {

From 5644d8eeeb6fe1db0df9e619fd376b1961ae7c1a Mon Sep 17 00:00:00 2001
From: Nish Anil <nish@microsoft.com>
Date: Tue, 4 Aug 2020 16:30:52 +0530
Subject: [PATCH 15/44] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c6f869f1e..c8f1969f5 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 
 _**Dev** branch contains the latest **beta** code and their images are tagged with `:linux-dev` in our [Docker Hub](https://hub.docker.com/u/eshop)_
 
-## New to **microservices** and **cloud-native development** !! 
+## Are you new to **microservices** and **cloud-native development**? 
 Please take a look at this free course : [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/). This MS Learn module will explain microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`.
 
 ## Getting Started

From 15c80dab3838fa3913247491252addfb5a06fb3d Mon Sep 17 00:00:00 2001
From: Nish Anil <nish@microsoft.com>
Date: Tue, 4 Aug 2020 16:32:43 +0530
Subject: [PATCH 16/44] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c8f1969f5..d296203a7 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 _**Dev** branch contains the latest **beta** code and their images are tagged with `:linux-dev` in our [Docker Hub](https://hub.docker.com/u/eshop)_
 
 ## Are you new to **microservices** and **cloud-native development**? 
-Please take a look at this free course : [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/). This MS Learn module will explain microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`.
+Take a look at the free course [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/) on MS Learn.  This module explains microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`.
 
 ## Getting Started
 

From 87552cf73a8d04cc6d4bb851a2c30af6cbc3d79c Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <13281246+sughosneo@users.noreply.github.com>
Date: Wed, 5 Aug 2020 11:00:18 +0530
Subject: [PATCH 17/44] Updated Readme.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83832b343..d1a3d2e87 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Take a look at the free course [Create and deploy a cloud-native ASP.NET Core mi
 
 ### Basic scenario
 
-The basic scenario can be run locally using docker compose, and also deployed to a local Kubernetes cluster. Refer to these Wiki pages to Get Started:
+The basic scenario can be run locally using docker-compose, and also deployed to a local Kubernetes cluster. Refer to these Wiki pages to Get Started:
 
 - [CLI or Visual Studio Code](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup)
 - [Visual Studio (F5 experience)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Windows-setup#optional---use-visual-studio)

From 6c3ab903ed82d3331bf7091d9593bec87302617c Mon Sep 17 00:00:00 2001
From: edmondshtogu <edmondshtogu@gmail.com>
Date: Fri, 7 Aug 2020 13:20:34 +0200
Subject: [PATCH 18/44] Fixed firewall rules check and improved the script

the check shall be like ~ Get-NetFirewallRule -DisplayName eShopOnContainers-* -ErrorAction Stop
---
 ...irewall-rules-for-sts-auth-thru-docker.ps1 | 63 +++++++++++++------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1 b/deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
index 271b6a77d..9aad3e45c 100644
--- a/deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
+++ b/deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
@@ -1,26 +1,53 @@
-param([switch]$Elevated)
+param(
+  [string]$Name = "eShopOnContainers",
+  [string]$InboundDisplayName = "eShopOnContainers-Inbound",
+  [string]$OutboundDisplayName = "eShopOnContainers-Outbound",
+  [switch]$Elevated
+  )
+
 function Check-Admin {
-$currentUser = New-Object Security.Principal.WindowsPrincipal $([Security.Principal.WindowsIdentity]::GetCurrent())
-$currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
+  $currentUser = New-Object Security.Principal.WindowsPrincipal $([Security.Principal.WindowsIdentity]::GetCurrent())
+  $currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
 }
-if ((Check-Admin) -eq $false)  {
-if ($elevated)
-{
-# could not elevate, quit
+function Add-InboundRule {
+  New-NetFirewallRule -DisplayName $InboundDisplayName -Confirm -Description "$Name Inbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
 }
- 
-else {
- 
-Start-Process powershell.exe -Verb RunAs -ArgumentList ('-noprofile -noexit -file "{0}" -elevated' -f ($myinvocation.MyCommand.Definition))
+function Add-OutboundRule {
+  New-NetFirewallRule -DisplayName $OutboundDisplayName -Confirm -Description "$Name Outbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
 }
-exit
+
+if ((Check-Admin) -eq $false) {
+  if ($elevated)
+  {
+  # could not elevate, quit
+  } 
+  else {  
+    Start-Process powershell.exe -Verb RunAs -ArgumentList ('-noprofile -noexit -file "{0}" -elevated' -f ($myinvocation.MyCommand.Definition))
+  }
+  exit
 }
 
+
 try {
-  Get-NetFirewallRule -DisplayName EshopDocker -ErrorAction Stop
-  Write-Host "Rule found"
+  $rules = $(Get-NetFirewallRule -DisplayName $Name-* -ErrorAction Stop | Out-String)
+  if (!$rules.Contains($InboundDisplayName) -and !$rules.Contains($OutboundDisplayName))
+  {
+    Add-InboundRule
+    Add-OutboundRule
+  } 
+  elseif (!$rules.Contains($InboundDisplayName))
+  {
+    Add-InboundRule
+  }  
+  elseif (!$rules.Contains($OutboundDisplayName))
+  {
+    Add-OutboundRule
+  }
+  else{
+    Write-Host "Rules found!"
+  }
+}
+catch [Exception] {
+  Add-InboundRule
+  Add-OutboundRule
 }
-  catch [Exception] {
-  New-NetFirewallRule -DisplayName eShopOnContainers-Inbound -Confirm -Description "eShopOnContainers Inbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
-  New-NetFirewallRule -DisplayName eShopOnContainers-Outbound -Confirm -Description "eShopOnContainers Outbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
-}
\ No newline at end of file

From 3a693de9dd655c6f5bb298d3928cd96c4788b9b1 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Wed, 12 Aug 2020 20:51:36 +0530
Subject: [PATCH 19/44] Updated serialize-javascript version to 3.1.0 (#1396)

---
 src/Web/WebSPA/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 61a0ffda1..da6088a58 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -1478,8 +1478,8 @@
           }
         },
         "serialize-javascript": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
           "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
           "dev": true
         },

From 8c0da9ab28e09f35070d6adbc0b351cee8558c83 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Thu, 13 Aug 2020 02:05:11 +0530
Subject: [PATCH 20/44] Update "minimist" version to 1.2.5 (#1398)

---
 src/Web/WebSPA/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index da6088a58..c3e6ed779 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -687,7 +687,7 @@
               }
             },
             "minimist": {
-              "version": "0.0.8",
+              "version": "1.2.5",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -10185,8 +10185,8 @@
       }
     },
     "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },

From 844348c48b8c627fdd265eb425f524480787f26b Mon Sep 17 00:00:00 2001
From: InstanceFactory <InstanceFactory@users.noreply.github.com>
Date: Tue, 18 Aug 2020 14:01:58 +0200
Subject: [PATCH 21/44] #1397: Replaced deprecated docker.for.win.localhost by
 host.docker.internal in src/.env (#1400)

---
 src/.env | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/.env b/src/.env
index c802f18eb..96b801650 100644
--- a/src/.env
+++ b/src/.env
@@ -5,9 +5,9 @@
 # The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices
 
 # Use this values to run the app locally in Windows
-ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.win.localhost
-ESHOP_STORAGE_CATALOG_URL=http://docker.for.win.localhost:5202/c/api/v1/catalog/items/[0]/pic/
-ESHOP_STORAGE_MARKETING_URL=http://docker.for.win.localhost:5110/api/v1/campaigns/[0]/pic/
+ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
+ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
+ESHOP_STORAGE_MARKETING_URL=http://host.docker.internal:5110/api/v1/campaigns/[0]/pic/
 
 # Use this values to run the app locally in Mac
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost

From 7dad5c0c2724cb282f0fc7edea509bad710e8844 Mon Sep 17 00:00:00 2001
From: Yosef Herskovitz <34112131+H3RSKO@users.noreply.github.com>
Date: Thu, 20 Aug 2020 05:20:20 -0400
Subject: [PATCH 22/44] Updated Readme (#1402)

Fixed sentence structure in Readme.

Changed "and a several" to "with several."
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d1a3d2e87..ad35a6d2b 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Do you want to be up-to-date on .NET Architecture guidance and reference apps li
 
 ## Updated for .NET Core 3.1 (LTS)
 
-eShopOnContainers is updated to .NET Core 3.1  "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions and a several significant changes.
+eShopOnContainers is updated to .NET Core 3.1  "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
 
 **See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**.
 

From b426909d3619b27589aff0f1771c198b13262435 Mon Sep 17 00:00:00 2001
From: Dmytro Hridin <dmytro.hridin@gmail.com>
Date: Thu, 20 Aug 2020 16:25:04 +0300
Subject: [PATCH 23/44] CatalogService: Fix issue with Status set when items
 list is empty (#1304)

* Fix issue with Status set when items list is empty

* Change method Count() call to Count property

Co-authored-by: Dmytro Hridin <v-dmytro.hridin@lionbridge.com>
---
 .../Catalog/Catalog.API/Grpc/CatalogService.cs        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs b/src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs
index 13c7c8d2e..ef22b5be2 100644
--- a/src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs
+++ b/src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs
@@ -68,11 +68,10 @@ namespace Catalog.API.Grpc
             {
                 var items = await GetItemsByIdsAsync(request.Ids);
 
-                if (!items.Any())
-                {
-                    context.Status = new Status(StatusCode.NotFound, $"ids value invalid. Must be comma-separated list of numbers");
-                }
-                context.Status = new Status(StatusCode.OK, string.Empty);
+                context.Status = !items.Any() ?
+                    new Status(StatusCode.NotFound, $"ids value invalid. Must be comma-separated list of numbers") :
+                    new Status(StatusCode.OK, string.Empty);
+
                 return this.MapToResponse(items);
             }
 
@@ -104,7 +103,7 @@ namespace Catalog.API.Grpc
 
         private PaginatedItemsResponse MapToResponse(List<CatalogItem> items)
         {
-            return this.MapToResponse(items, items.Count(), 1, items.Count());
+            return this.MapToResponse(items, items.Count, 1, items.Count);
         }
 
         private PaginatedItemsResponse MapToResponse(List<CatalogItem> items, long count, int pageIndex, int pageSize)

From 921de69418e3e980bea1bf69c2c72a2cf90b50e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrefilipegsilva@outlook.com>
Date: Tue, 25 Aug 2020 11:52:08 +0100
Subject: [PATCH 24/44] refactored Equals() method on ValueObject (#1316)

---
 .../AggregatesModel/OrderAggregate/Address.cs |   2 +-
 .../Ordering.Domain/SeedWork/ValueObject.cs   |  23 +--
 .../Domain/SeedWork/ValueObjectTests.cs       | 190 ++++++++++++++++++
 3 files changed, 197 insertions(+), 18 deletions(-)
 create mode 100644 src/Services/Ordering/Ordering.UnitTests/Domain/SeedWork/ValueObjectTests.cs

diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
index b552f5546..e2c78094d 100644
--- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
@@ -23,7 +23,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
             ZipCode = zipcode;
         }
 
-        protected override IEnumerable<object> GetAtomicValues()
+        protected override IEnumerable<object> GetEqualityComponents()
         {
             // Using a yield return statement to return each element one at a time
             yield return Street;
diff --git a/src/Services/Ordering/Ordering.Domain/SeedWork/ValueObject.cs b/src/Services/Ordering/Ordering.Domain/SeedWork/ValueObject.cs
index 40fb117e1..5f36900ee 100644
--- a/src/Services/Ordering/Ordering.Domain/SeedWork/ValueObject.cs
+++ b/src/Services/Ordering/Ordering.Domain/SeedWork/ValueObject.cs
@@ -19,7 +19,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork
             return !(EqualOperator(left, right));
         }
 
-        protected abstract IEnumerable<object> GetAtomicValues();
+        protected abstract IEnumerable<object> GetEqualityComponents();
 
         public override bool Equals(object obj)
         {
@@ -27,26 +27,15 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork
             {
                 return false;
             }
-            ValueObject other = (ValueObject)obj;
-            IEnumerator<object> thisValues = GetAtomicValues().GetEnumerator();
-            IEnumerator<object> otherValues = other.GetAtomicValues().GetEnumerator();
-            while (thisValues.MoveNext() && otherValues.MoveNext())
-            {
-                if (ReferenceEquals(thisValues.Current, null) ^ ReferenceEquals(otherValues.Current, null))
-                {
-                    return false;
-                }
-                if (thisValues.Current != null && !thisValues.Current.Equals(otherValues.Current))
-                {
-                    return false;
-                }
-            }
-            return !thisValues.MoveNext() && !otherValues.MoveNext();
+
+            var other = (ValueObject)obj;
+
+            return this.GetEqualityComponents().SequenceEqual(other.GetEqualityComponents());
         }
 
         public override int GetHashCode()
         {
-            return GetAtomicValues()
+            return GetEqualityComponents()
              .Select(x => x != null ? x.GetHashCode() : 0)
              .Aggregate((x, y) => x ^ y);
         }
diff --git a/src/Services/Ordering/Ordering.UnitTests/Domain/SeedWork/ValueObjectTests.cs b/src/Services/Ordering/Ordering.UnitTests/Domain/SeedWork/ValueObjectTests.cs
new file mode 100644
index 000000000..7eed01fe6
--- /dev/null
+++ b/src/Services/Ordering/Ordering.UnitTests/Domain/SeedWork/ValueObjectTests.cs
@@ -0,0 +1,190 @@
+using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace Ordering.UnitTests.Domain.SeedWork
+{
+    public class ValueObjectTests
+    {
+        public ValueObjectTests()
+        { }
+
+        [Theory]
+        [MemberData(nameof(EqualValueObjects))]
+        public void Equals_EqualValueObjects_ReturnsTrue(ValueObject instanceA, ValueObject instanceB, string reason)
+        {
+            // Act
+            var result = EqualityComparer<ValueObject>.Default.Equals(instanceA, instanceB);
+
+            // Assert
+            Assert.True(result, reason);
+        }
+
+        [Theory]
+        [MemberData(nameof(NonEqualValueObjects))]
+        public void Equals_NonEqualValueObjects_ReturnsFalse(ValueObject instanceA, ValueObject instanceB, string reason)
+        {
+            // Act
+            var result = EqualityComparer<ValueObject>.Default.Equals(instanceA, instanceB);
+
+            // Assert
+            Assert.False(result, reason);
+        }
+
+        private static readonly ValueObject APrettyValueObject = new ValueObjectA(1, "2", Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), new ComplexObject(2, "3"));
+
+        public static readonly TheoryData<ValueObject, ValueObject, string> EqualValueObjects = new TheoryData<ValueObject, ValueObject, string>
+        {
+            {
+                null,
+                null,
+                "they should be equal because they are both null"
+            },
+            {
+                APrettyValueObject,
+                APrettyValueObject,
+                "they should be equal because they are the same object"
+            },
+            {
+                new ValueObjectA(1, "2", Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), new ComplexObject(2, "3")),
+                new ValueObjectA(1, "2", Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), new ComplexObject(2, "3")),
+                "they should be equal because they have equal members"
+            },
+            {
+                new ValueObjectA(1, "2", Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), new ComplexObject(2, "3"), notAnEqualityComponent: "xpto"),
+                new ValueObjectA(1, "2", Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), new ComplexObject(2, "3"), notAnEqualityComponent: "xpto2"),
+                "they should be equal because all equality components are equal, even though an additional member was set"
+            },
+            {
+                new ValueObjectB(1, "2",  1, 2, 3 ),
+                new ValueObjectB(1, "2",  1, 2, 3 ),
+                "they should be equal because all equality components are equal, including the 'C' list"
+            }
+        };
+
+        public static readonly TheoryData<ValueObject, ValueObject, string> NonEqualValueObjects = new TheoryData<ValueObject, ValueObject, string>
+        {
+            {
+                new ValueObjectA(a: 1, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(2, "3")),
+                new ValueObjectA(a: 2, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(2, "3")),
+                "they should not be equal because the 'A' member on ValueObjectA is different among them"
+            },
+            {
+                new ValueObjectA(a: 1, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(2, "3")),
+                new ValueObjectA(a: 1, b: null, c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(2, "3")),
+                "they should not be equal because the 'B' member on ValueObjectA is different among them"
+            },
+            {
+                new ValueObjectA(a: 1, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(a: 2, b: "3")),
+                new ValueObjectA(a: 1, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(a: 3, b: "3")),
+                "they should not be equal because the 'A' member on ValueObjectA's 'D' member is different among them"
+            },
+            {
+                new ValueObjectA(a: 1, b: "2", c: Guid.Parse("97ea43f0-6fef-4fb7-8c67-9114a7ff6ec0"), d: new ComplexObject(a: 2, b: "3")),
+                new ValueObjectB(a: 1, b: "2"),
+                "they should not be equal because they are not of the same type"
+            },
+            {
+                new ValueObjectB(1, "2",  1, 2, 3 ),
+                new ValueObjectB(1, "2",  1, 2, 3, 4 ),
+                "they should be not be equal because the 'C' list contains one additional value"
+            },
+            {
+                new ValueObjectB(1, "2",  1, 2, 3, 5 ),
+                new ValueObjectB(1, "2",  1, 2, 3 ),
+                "they should be not be equal because the 'C' list contains one additional value"
+            },
+            {
+                new ValueObjectB(1, "2",  1, 2, 3, 5 ),
+                new ValueObjectB(1, "2",  1, 2, 3, 4 ),
+                "they should be not be equal because the 'C' lists are not equal"
+            }
+
+        };
+
+        private class ValueObjectA : ValueObject
+        {
+            public ValueObjectA(int a, string b, Guid c, ComplexObject d, string notAnEqualityComponent = null)
+            {
+                A = a;
+                B = b;
+                C = c;
+                D = d;
+                NotAnEqualityComponent = notAnEqualityComponent;
+            }
+
+            public int A { get; }
+            public string B { get; }
+            public Guid C { get; }
+            public ComplexObject D { get; }
+            public string NotAnEqualityComponent { get; }
+
+            protected override IEnumerable<object> GetEqualityComponents()
+            {
+                yield return A;
+                yield return B;
+                yield return C;
+                yield return D;
+            }
+        }
+
+        private class ValueObjectB : ValueObject
+        {
+            public ValueObjectB(int a, string b, params int[] c)
+            {
+                A = a;
+                B = b;
+                C = c.ToList();
+            }
+
+            public int A { get; }
+            public string B { get; }
+
+            public List<int> C { get; }
+
+            protected override IEnumerable<object> GetEqualityComponents()
+            {
+                yield return A;
+                yield return B;
+
+                foreach (var c in C)
+                {
+                    yield return c;
+                }
+            }
+        }
+
+        private class ComplexObject : IEquatable<ComplexObject>
+        {
+            public ComplexObject(int a, string b)
+            {
+                A = a;
+                B = b;
+            }
+
+            public int A { get; set; }
+
+            public string B { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                return Equals(obj as ComplexObject);
+            }
+
+            public bool Equals(ComplexObject other)
+            {
+                return other != null &&
+                       A == other.A &&
+                       B == other.B;
+            }
+
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(A, B);
+            }
+        }
+    }
+}

From df2c2bb10ee9942e98aecb1be2d15c8404262bd4 Mon Sep 17 00:00:00 2001
From: InstanceFactory <InstanceFactory@users.noreply.github.com>
Date: Wed, 26 Aug 2020 16:36:44 +0200
Subject: [PATCH 25/44] Fix/1403and1404 removed duplicate Key
 SubscriptionClientName and added app.UseAuthorization() call (#1406)

* #1403 removed duplicate Key SubscriptionClientName

Removed duplicate key SubscriptionClientName from Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json and sorted its content in asc order.

* #1404 Added app.UseAuthorization() call

Added app.UseAuthorization() call to BasketTestsStartup, LocationsTestsStartup, and MarketingTestsStartup to fix failed unit tests IntegrationEventsScenarios.Post_update_product_price_and_catalog_and_basket_list_modified and MarketingScenarios.Set_new_user_location_and_get_location_campaign_by_user_id (see #1404)
---
 .../Services/Basket/BasketTestsStartup.cs                | 1 +
 .../Services/Location/LocationsTestsStartup.cs           | 1 +
 .../Services/Marketing/MarketingTestsStartup.cs          | 1 +
 .../Services/Marketing/appsettings.json                  | 9 ++++-----
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs b/src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs
index cfb91fd40..6043a7ab3 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs
@@ -16,6 +16,7 @@ namespace FunctionalTests.Services.Basket
             if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant())
             {
                 app.UseMiddleware<AutoAuthorizeMiddleware>();
+                app.UseAuthorization();
             }
             else
             {
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs b/src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs
index fce808759..709c4e7eb 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs
@@ -19,6 +19,7 @@
             if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant())
             {
                 app.UseMiddleware<LocationAuthorizeMiddleware>();
+                app.UseAuthorization();
             }
             else
             {
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs b/src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
index ae5f4453b..d5d824867 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
@@ -16,6 +16,7 @@
             if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant())
             {
                 app.UseMiddleware<AutoAuthorizeMiddleware>();
+                app.UseAuthorization();
             }
             else
             {
diff --git a/src/Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json b/src/Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json
index 2aa46abe6..6d2d7870d 100644
--- a/src/Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json
+++ b/src/Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json
@@ -1,12 +1,11 @@
 {
+  "AzureServiceBusEnabled": false,
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word",
-  "MongoConnectionString": "mongodb://localhost:27017",
-  "MongoDatabase": "MarketingDb",
+  "EventBusConnection": "localhost",
   "IdentityUrl": "http://localhost:5105",
   "isTest": "true",
-  "EventBusConnection": "localhost",
-  "AzureServiceBusEnabled": false,
-  "SubscriptionClientName": "Marketing",
+  "MongoConnectionString": "mongodb://localhost:27017",
+  "MongoDatabase": "MarketingDb",
   "PicBaseUrl": "http://localhost:5110/api/v1/campaigns/[0]/pic/",
   "SubscriptionClientName": "Marketing"
 }

From 85aea20046ef495ba44c5d6031c75960aa316eb4 Mon Sep 17 00:00:00 2001
From: hfz-r <39443205+hfz-r@users.noreply.github.com>
Date: Thu, 27 Aug 2020 17:57:18 +0800
Subject: [PATCH 26/44] Fix for Campaigns exception and SignalR 401
 Unauthorized (#1374)

* update API Gateway - /locations-api/ @ webmarketing/envoy.yaml

* updated signalr services

- envoy: webmarketingapigw
- latest client: webmvc
- service hub: ordering-signalrhub

Co-authored-by: hfz-r <hafiz.roslan@hartalega.com.my>
---
 .../Envoy/config/webmarketing/envoy.yaml      | 13 ++++++++++++
 .../Envoy/config/webshopping/envoy.yaml       |  3 +++
 .../Ordering/Ordering.SignalrHub/Startup.cs   | 21 ++++++++++++++++---
 .../WebMVC/Controllers/AccountController.cs   |  3 ++-
 src/Web/WebMVC/Services/LocationService.cs    |  2 +-
 src/Web/WebMVC/libman.json                    |  2 +-
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/ApiGateways/Envoy/config/webmarketing/envoy.yaml b/src/ApiGateways/Envoy/config/webmarketing/envoy.yaml
index c6f3421de..11ef504da 100644
--- a/src/ApiGateways/Envoy/config/webmarketing/envoy.yaml
+++ b/src/ApiGateways/Envoy/config/webmarketing/envoy.yaml
@@ -36,6 +36,19 @@ static_resources:
                 route:
                   auto_host_rewrite: true
                   cluster: marketing
+              - name: "l-short"
+                match:
+                  prefix: "/l/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/locations-api/"
+                  cluster: locations
+              - name: "l-long"
+                match:
+                  prefix: "/locations-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: locations
           http_filters:
           - name: envoy.router      
           access_log:
diff --git a/src/ApiGateways/Envoy/config/webshopping/envoy.yaml b/src/ApiGateways/Envoy/config/webshopping/envoy.yaml
index 1ae8c45a1..688fb740c 100644
--- a/src/ApiGateways/Envoy/config/webshopping/envoy.yaml
+++ b/src/ApiGateways/Envoy/config/webshopping/envoy.yaml
@@ -56,6 +56,9 @@ static_resources:
                   auto_host_rewrite: true
                   cluster: signalr-hub
                   timeout: 300s
+                  upgrade_configs:
+                    upgrade_type: "websocket"
+                    enabled: true
               - name: "b-short"
                 match:
                   prefix: "/b/"
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs
index a20a1a196..23aaa7c78 100644
--- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs
+++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs
@@ -19,6 +19,7 @@ using Ordering.SignalrHub.IntegrationEvents.EventHandling;
 using Ordering.SignalrHub.IntegrationEvents.Events;
 using RabbitMQ.Client;
 using System;
+using System.Threading.Tasks;
 using System.IdentityModel.Tokens.Jwt;
 
 namespace Ordering.SignalrHub
@@ -109,7 +110,7 @@ namespace Ordering.SignalrHub
             RegisterEventBus(services);
 
             services.AddOptions();
-            
+
             //configure autofac
             var container = new ContainerBuilder();
             container.RegisterModule(new ApplicationModule());
@@ -133,7 +134,7 @@ namespace Ordering.SignalrHub
                 loggerFactory.CreateLogger<Startup>().LogDebug("Using PATH BASE '{pathBase}'", pathBase);
                 app.UsePathBase(pathBase);
             }
-            
+
             app.UseRouting();
             app.UseCors("CorsPolicy");
             app.UseAuthentication();
@@ -150,7 +151,7 @@ namespace Ordering.SignalrHub
                 {
                     Predicate = r => r.Name.Contains("self")
                 });
-                endpoints.MapHub<NotificationsHub>("/hub/notificationhub", options => options.Transports = Microsoft.AspNetCore.Http.Connections.HttpTransports.All);
+                endpoints.MapHub<NotificationsHub>("/hub/notificationhub");
             });
 
             ConfigureEventBus(app);
@@ -185,6 +186,20 @@ namespace Ordering.SignalrHub
                 options.Authority = identityUrl;
                 options.RequireHttpsMetadata = false;
                 options.Audience = "orders.signalrhub";
+                options.Events = new JwtBearerEvents
+                {
+                    OnMessageReceived = context =>
+                    {
+                        var accessToken = context.Request.Query["access_token"];
+
+                        var path = context.HttpContext.Request.Path;
+                        if (!string.IsNullOrEmpty(accessToken) && (path.StartsWithSegments("/hub/notificationhub")))
+                        {
+                            context.Token = accessToken;
+                        }
+                        return Task.CompletedTask;
+                    }
+                };
             });
         }
 
diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs
index 8b82498ba..68dd166db 100644
--- a/src/Web/WebMVC/Controllers/AccountController.cs
+++ b/src/Web/WebMVC/Controllers/AccountController.cs
@@ -20,7 +20,8 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
-        [Authorize(AuthenticationSchemes = "OpenIdConnect")]        public async Task<IActionResult> SignIn(string returnUrl)
+        [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+        public async Task<IActionResult> SignIn(string returnUrl)
         {
             var user = User as ClaimsPrincipal;
             var token = await HttpContext.GetTokenAsync("access_token");
diff --git a/src/Web/WebMVC/Services/LocationService.cs b/src/Web/WebMVC/Services/LocationService.cs
index 8d81cbd22..4619cfd6a 100644
--- a/src/Web/WebMVC/Services/LocationService.cs
+++ b/src/Web/WebMVC/Services/LocationService.cs
@@ -23,7 +23,7 @@ namespace WebMVC.Services
             _settings = settings;
             _logger = logger;
 
-            _remoteServiceBaseUrl = $"{_settings.Value.MarketingUrl}/api/v1/l/locations/";
+            _remoteServiceBaseUrl = $"{_settings.Value.MarketingUrl}/l/api/v1/locations/";
         }
 
         public async Task CreateOrUpdateUserLocation(LocationDTO location)
diff --git a/src/Web/WebMVC/libman.json b/src/Web/WebMVC/libman.json
index f7b9d3763..b80fb4ecc 100644
--- a/src/Web/WebMVC/libman.json
+++ b/src/Web/WebMVC/libman.json
@@ -37,7 +37,7 @@
     },
     {
       "provider": "unpkg",
-      "library": "@microsoft/signalr@3.0.1",
+      "library": "@microsoft/signalr@latest",
       "destination": "wwwroot/lib/@microsoft/signalr/",
       "files": [
         "dist/browser/signalr.js",

From 7617ee48805a989b328cb837820529d303d379d3 Mon Sep 17 00:00:00 2001
From: Majid Ali Khan Quaid <contactmakq@gmail.com>
Date: Thu, 27 Aug 2020 15:00:59 +0500
Subject: [PATCH 27/44] Mis-Spelled 'client' (#1411)

---
 src/Services/Location/Locations.API/appsettings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Services/Location/Locations.API/appsettings.json b/src/Services/Location/Locations.API/appsettings.json
index 7fbe98b3e..3ee24b242 100644
--- a/src/Services/Location/Locations.API/appsettings.json
+++ b/src/Services/Location/Locations.API/appsettings.json
@@ -23,7 +23,7 @@
   "UseVault": false,
   "Vault": {
     "Name": "eshop",
-    "ClientId": "your-clien-id",
+    "ClientId": "your-client-id",
     "ClientSecret": "your-client-secret"
   }
-}
\ No newline at end of file
+}

From 66d81f6ea9c47c88096df4c48ea2b858498451b8 Mon Sep 17 00:00:00 2001
From: Javier Vela <fjvela@gmail.com>
Date: Fri, 28 Aug 2020 08:00:02 +0200
Subject: [PATCH 28/44] fix parameter error in multiarch job (#1413)

---
 build/azure-devops/multiarch.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index 162128d0a..1639fff87 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -26,7 +26,7 @@ jobs:
       mkdir -p ~/.docker
       sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
       echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:{{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }}
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }}
       docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest
       docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
       docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest

From 8f84bd3d09773fc28426e9f58cc538f492031404 Mon Sep 17 00:00:00 2001
From: Facundo La Rocca <facundo_larocca@yahoo.com.ar>
Date: Fri, 28 Aug 2020 07:37:41 -0300
Subject: [PATCH 29/44] Private readonly string changed to private const string
 (#1288)

---
 .../EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
index 5623549d5..6ee3032a8 100644
--- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
+++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
@@ -21,12 +21,12 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
     public class EventBusRabbitMQ : IEventBus, IDisposable
     {
         const string BROKER_NAME = "eshop_event_bus";
+        const string AUTOFAC_SCOPE_NAME = "eshop_event_bus";
 
         private readonly IRabbitMQPersistentConnection _persistentConnection;
         private readonly ILogger<EventBusRabbitMQ> _logger;
         private readonly IEventBusSubscriptionsManager _subsManager;
         private readonly ILifetimeScope _autofac;
-        private readonly string AUTOFAC_SCOPE_NAME = "eshop_event_bus";
         private readonly int _retryCount;
 
         private IModel _consumerChannel;
@@ -86,7 +86,6 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
 
             using (var channel = _persistentConnection.CreateModel())
             {
-
                 _logger.LogTrace("Declaring RabbitMQ exchange to publish event: {EventId}", @event.Id);
 
                 channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct");

From 313879e52b7e80490860470885f2b2da973bbf8d Mon Sep 17 00:00:00 2001
From: Nabil Sedoud <nsedoud@gmail.com>
Date: Mon, 31 Aug 2020 09:42:34 +0100
Subject: [PATCH 30/44] fix disposing of direct instantiated objects in calalog
 service #1392 (#1395)

---
 .../Services/IntegrationEventLogService.cs    | 23 ++++++++++++++++++-
 .../CatalogIntegrationEventService.cs         | 22 +++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs
index 800b99a38..22c5e1fba 100644
--- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs
+++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs
@@ -15,11 +15,12 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services
 {
-    public class IntegrationEventLogService : IIntegrationEventLogService
+    public class IntegrationEventLogService : IIntegrationEventLogService,IDisposable
     {
         private readonly IntegrationEventLogContext _integrationEventLogContext;
         private readonly DbConnection _dbConnection;
         private readonly List<Type> _eventTypes;
+        private volatile bool disposedValue;
 
         public IntegrationEventLogService(DbConnection dbConnection)
         {
@@ -89,5 +90,25 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Servi
 
             return _integrationEventLogContext.SaveChangesAsync();
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    _integrationEventLogContext?.Dispose();
+                }
+
+               
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }
diff --git a/src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs b/src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs
index bb3a23d40..3e7ba9868 100644
--- a/src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs
+++ b/src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs
@@ -14,13 +14,14 @@ using System.Threading.Tasks;
 
 namespace Catalog.API.IntegrationEvents
 {
-    public class CatalogIntegrationEventService : ICatalogIntegrationEventService
+    public class CatalogIntegrationEventService : ICatalogIntegrationEventService,IDisposable
     {
         private readonly Func<DbConnection, IIntegrationEventLogService> _integrationEventLogServiceFactory;
         private readonly IEventBus _eventBus;
         private readonly CatalogContext _catalogContext;
         private readonly IIntegrationEventLogService _eventLogService;
         private readonly ILogger<CatalogIntegrationEventService> _logger;
+        private volatile bool disposedValue;
 
         public CatalogIntegrationEventService(
             ILogger<CatalogIntegrationEventService> logger,
@@ -65,5 +66,24 @@ namespace Catalog.API.IntegrationEvents
                 await _eventLogService.SaveEventAsync(evt, _catalogContext.Database.CurrentTransaction);
             });
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    (_eventLogService as IDisposable)?.Dispose();
+                }
+               
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

From 0cb8424fdca35f99e859cfdd72f6311469545fe4 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 8 Sep 2020 17:15:02 +0530
Subject: [PATCH 31/44] Updated version of different packages. (#1420)

---
 src/Web/WebSPA/package-lock.json | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index c3e6ed779..4514d955f 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -1863,8 +1863,8 @@
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
           "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
@@ -2943,9 +2943,9 @@
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -8541,13 +8541,20 @@
       "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w=="
     },
     "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
         "requires-port": "^1.0.0"
+      },
+      "dependencies": {
+        "eventemitter3": {
+          "version": "4.0.7",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+          "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+        }
       }
     },
     "http-proxy-agent": {
@@ -17255,9 +17262,9 @@
       }
     },
     "yargs-parser": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-      "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "requires": {
         "camelcase": "^4.1.0"
       }

From 7c1261bf6983ee6c04f181c60455d483791b3e62 Mon Sep 17 00:00:00 2001
From: jeremiahflaga <flaga.jeremiah@gmail.com>
Date: Mon, 14 Sep 2020 17:26:22 +0800
Subject: [PATCH 32/44] for issue #1423: changed literal string "OpenIdConnect"
 to constant string (#1424)

Co-authored-by: Jeremiah Flaga <j.flaga@arcanys.com>
---
 src/Web/WebMVC/Controllers/AccountController.cs         | 4 ++--
 src/Web/WebMVC/Controllers/CampaignsController.cs       | 3 ++-
 src/Web/WebMVC/Controllers/CartController.cs            | 3 ++-
 src/Web/WebMVC/Controllers/OrderController.cs           | 3 ++-
 src/Web/WebMVC/Controllers/OrderManagementController.cs | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs
index 68dd166db..fba04f26d 100644
--- a/src/Web/WebMVC/Controllers/AccountController.cs
+++ b/src/Web/WebMVC/Controllers/AccountController.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
-    [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+    [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class AccountController : Controller
     {
         private readonly ILogger<AccountController> _logger;
@@ -20,7 +20,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
-        [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+        [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
         public async Task<IActionResult> SignIn(string returnUrl)
         {
             var user = User as ClaimsPrincipal;
diff --git a/src/Web/WebMVC/Controllers/CampaignsController.cs b/src/Web/WebMVC/Controllers/CampaignsController.cs
index cf210318b..920269467 100644
--- a/src/Web/WebMVC/Controllers/CampaignsController.cs
+++ b/src/Web/WebMVC/Controllers/CampaignsController.cs
@@ -11,8 +11,9 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
     using System.Threading.Tasks;
     using ViewModels;
     using ViewModels.Pagination;
+    using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
-    [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+    [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class CampaignsController : Controller
     {
         private readonly ICampaignService _campaignService;
diff --git a/src/Web/WebMVC/Controllers/CartController.cs b/src/Web/WebMVC/Controllers/CartController.cs
index 78cec5670..d7e577c25 100644
--- a/src/Web/WebMVC/Controllers/CartController.cs
+++ b/src/Web/WebMVC/Controllers/CartController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Services;
@@ -8,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
-    [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+    [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class CartController : Controller
     {
         private readonly IBasketService _basketSvc;
diff --git a/src/Web/WebMVC/Controllers/OrderController.cs b/src/Web/WebMVC/Controllers/OrderController.cs
index f308d0bdc..d5e98552a 100644
--- a/src/Web/WebMVC/Controllers/OrderController.cs
+++ b/src/Web/WebMVC/Controllers/OrderController.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Services;
@@ -7,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
-    [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+    [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class OrderController : Controller
     {
         private IOrderingService _orderSvc;
diff --git a/src/Web/WebMVC/Controllers/OrderManagementController.cs b/src/Web/WebMVC/Controllers/OrderManagementController.cs
index a488dc4ae..6963c469d 100644
--- a/src/Web/WebMVC/Controllers/OrderManagementController.cs
+++ b/src/Web/WebMVC/Controllers/OrderManagementController.cs
@@ -7,10 +7,11 @@ using WebMVC.Services.ModelDTOs;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
 namespace WebMVC.Controllers
 {
-    [Authorize(AuthenticationSchemes = "OpenIdConnect")]
+    [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class OrderManagementController : Controller
     {
         private IOrderingService _orderSvc;

From 6a9a78132310abb54c4fbaccfc8dcc55c2b24ac7 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 15 Sep 2020 16:34:07 +0530
Subject: [PATCH 33/44] Updated node-fetch package version. (#1426)

* Updated node-fetch package version.

* Updated node-forge version.
---
 src/Web/WebSPA/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 4514d955f..052f24469 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -1236,8 +1236,8 @@
           "dev": true
         },
         "node-forge": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
           "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
           "dev": true
         },
@@ -10388,8 +10388,8 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
       "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
       "requires": {
         "encoding": "^0.1.11",
@@ -10408,8 +10408,8 @@
       }
     },
     "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
       "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="
     },
     "node-libs-browser": {

From 04ab1279d92f1dcda64e1e40468bd4680a0223c8 Mon Sep 17 00:00:00 2001
From: Wojciech Rak <wojciechrak@users.noreply.github.com>
Date: Fri, 18 Sep 2020 20:59:57 +0200
Subject: [PATCH 34/44] Fixes #1474: webspa container does not build when
 running docker-compose up.Updated sha hashes in packages-lock.json (#1475)

---
 src/Web/WebSPA/package-lock.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 052f24469..09a5d0707 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -1238,8 +1238,7 @@
         "node-forge": {
           "version": "0.10.0",
           "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-          "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
-          "dev": true
+          "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
         },
         "node-libs-browser": {
           "version": "2.2.1",
@@ -10410,7 +10409,7 @@
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
     },
     "node-libs-browser": {
       "version": "2.2.1",

From 0b4f44659dc7e8fc6e2a942b16caf02c87532b9a Mon Sep 17 00:00:00 2001
From: Zakaria <23211915+zakaria-c@users.noreply.github.com>
Date: Wed, 23 Sep 2020 07:45:53 +0200
Subject: [PATCH 35/44] Change ReadAllBytes to ReadAllBytesAsync in
 PicController (#1425)

---
 src/Services/Catalog/Catalog.API/Controllers/PicController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Services/Catalog/Catalog.API/Controllers/PicController.cs b/src/Services/Catalog/Catalog.API/Controllers/PicController.cs
index 0aa376832..31c93683c 100644
--- a/src/Services/Catalog/Catalog.API/Controllers/PicController.cs
+++ b/src/Services/Catalog/Catalog.API/Controllers/PicController.cs
@@ -46,7 +46,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers
                 string imageFileExtension = Path.GetExtension(item.PictureFileName);
                 string mimetype = GetImageMimeTypeFromImageFileExtension(imageFileExtension);
 
-                var buffer = System.IO.File.ReadAllBytes(path);
+                var buffer = await System.IO.File.ReadAllBytesAsync(path);
 
                 return File(buffer, mimetype);
             }

From 78db4b758c57cb2767131b5f434b3e3232b91ed2 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Wed, 21 Oct 2020 16:33:29 +0530
Subject: [PATCH 36/44] Fixed parameter bug create resource script (#1494)

---
 deploy/azure/az/createresources.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/azure/az/createresources.sh b/deploy/azure/az/createresources.sh
index 3a71ca8fd..096befe6c 100644
--- a/deploy/azure/az/createresources.sh
+++ b/deploy/azure/az/createresources.sh
@@ -51,8 +51,8 @@ if [ ! -f "$1.json" ]; then
 	exit 1
 fi
 
-if [ ! -f "$2.parameters.json" ]; then
-	echo "$2.parameters.json doesn't exist"
+if [ ! -f "$1.parameters.json" ]; then
+	echo "$1.parameters.json doesn't exist"
 	exit 1
 fi
 

From d910eb416d0f36fc36558e7b4832c93b910401ac Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Wed, 21 Oct 2020 16:34:21 +0530
Subject: [PATCH 37/44] Fixed invalid number format in webspa (#1496)

---
 src/Web/WebSPA/Client/modules/catalog/catalog.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
index 96f05db56..d03b8433b 100644
--- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
+++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.html
@@ -40,7 +40,7 @@
                     <span>{{item.name}}</span>
                 </div>
                 <div class="esh-catalog-price">
-                    <span>{{item.price | number:'3.2-2'}}</span>
+                    <span>{{item.price | number:'.2-2'}}</span>
                 </div>
             </div>
         </div>

From b196622846ec9de2309d22e4ae91232edc7cf9a1 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Wed, 21 Oct 2020 16:34:55 +0530
Subject: [PATCH 38/44] Updated package version of
 webpack-subresource-integrity (#1497)

---
 src/Web/WebSPA/package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 09a5d0707..3c3a97fda 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -74,7 +74,7 @@
         "webpack-dev-server": "3.9.0",
         "webpack-merge": "4.2.1",
         "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.1.0-rc.6",
+        "webpack-subresource-integrity": "1.5.1",
         "worker-plugin": "3.2.0"
       },
       "dependencies": {
@@ -16876,9 +16876,9 @@
       }
     },
     "webpack-subresource-integrity": {
-      "version": "1.1.0-rc.6",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-      "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz",
+      "integrity": "sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q==",
       "dev": true,
       "requires": {
         "webpack-core": "^0.6.8"

From 388d0b7b5d6f983728dca3d9e1fb8fb9fc9f450e Mon Sep 17 00:00:00 2001
From: ansonzhang <3143422472@qq.com>
Date: Thu, 5 Nov 2020 06:12:21 -0600
Subject: [PATCH 39/44] Fixed #1495 bug : UseLoadTest missing claimsType
 (#1508)

* Update ByPassAuthMiddleware.cs

* Update ByPassAuthMiddleware.cs

* remove WebMVC/ByPassAuthMiddleware duplicate cliam

* remove Ordering.API/ByPassAuthMid  duplicate cliam

* remove Location.API/ByPassAuthMid  duplicate cliam

* remove Market.API/ByPassAuthMid  duplicate cliam

* change webmvc bypassauth: claimType of sub

* change ordering bypassauth: claimType of sub

* change location bypassauth: claimType of sub

* change market bypassauth: claimType of sub
---
 .../Infrastructure/Middlewares/ByPassAuthMiddleware.cs      | 6 +++---
 .../Infrastructure/Middlewares/ByPassAuthMiddleware.cs      | 6 +++---
 .../Infrastructure/Middlewares/ByPassAuthMiddleware.cs      | 6 +++---
 .../Infrastructure/Middlewares/ByPassAuthMiddleware.cs      | 4 ++--
 .../Infrastructure/Middlewares/ByPassAuthMiddleware.cs      | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index dfe690f6f..2f5eb28b6 100644
--- a/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -61,11 +61,11 @@ namespace Basket.API.Infrastructure.Middlewares
                     var user = new ClaimsIdentity(new[] {
                     new Claim("emails", currentUserId),
                     new Claim("name", "Test user"),
+                    new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name", "Test user"),
                     new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
-                    new Claim("nonce", Guid.NewGuid().ToString()),
+                    new Claim("http://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),                  
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"),
-                    new Claim("sub", "1234"),
+                    new Claim("sub", currentUserId),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")}
                     , "ByPassAuth");
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index ae21d10cc..e6b43d109 100644
--- a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -61,10 +61,10 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Midd
                     var user = new ClaimsIdentity(new[] {
                     new Claim("emails", currentUserId),
                     new Claim("name", "Test user"),
+                    new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name", "Test user"),
                     new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
-                    new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("sub", "1234"),
+                    new Claim("http://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
+                    new Claim("sub", currentUserId),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")}
                     , "ByPassAuth");
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index d89e15a7c..6f4ff16e2 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -60,10 +60,10 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Midd
                     var user = new ClaimsIdentity(new[] {
                     new Claim("emails", currentUserId),
                     new Claim("name", "Test user"),
+                    new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name", "Test user"),
                     new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
-                    new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("sub", "1234"),
+                    new Claim("http://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
+                    new Claim("sub", currentUserId),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")}
                     , "ByPassAuth");
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index 5a419e7fc..a76b79a21 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -61,10 +61,10 @@ namespace Ordering.API.Infrastructure.Middlewares
                     var user = new ClaimsIdentity(new[] {
                     new Claim("emails", currentUserId),
                     new Claim("name", "Test user"),
+                    new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name", "Test user"),
                     new Claim("nonce", Guid.NewGuid().ToString()),
                     new Claim("http://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
-                    new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("sub", "1234"),
+                    new Claim("sub", currentUserId),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")}
                     , "ByPassAuth");
diff --git a/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index 72adaaa4d..e39ebfc0a 100644
--- a/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -62,10 +62,10 @@ namespace WebMVC.Infrastructure.Middlewares
                     new Claim("emails", currentUserId),
                     new Claim("name", "Test user"),
                     new Claim("nonce", Guid.NewGuid().ToString()),
-                    new Claim("ttp://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),
-                    new Claim("nonce", Guid.NewGuid().ToString()),
+                    new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name", "Test user"),
+                    new Claim("http://schemas.microsoft.com/identity/claims/identityprovider", "ByPassAuthMiddleware"),                    
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname","User"),
-                    new Claim("sub", "1234"),
+                    new Claim("sub", currentUserId),
                     new Claim("card_expiration", "12/20"),
                     new Claim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname","Microsoft")}
                     , "ByPassAuth");

From 385318c00f035ddedd9ea9a2f50b7830164c469b Mon Sep 17 00:00:00 2001
From: m-knet <10815022+m-knet@users.noreply.github.com>
Date: Tue, 10 Nov 2020 11:40:35 +0100
Subject: [PATCH 40/44] Update solution items (#1515)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Manuel Cañete <mcanete@protonmail.com>
---
 src/Mobile/eShopOnContainers-Android.sln     | 5 ++---
 src/Mobile/eShopOnContainers-MobileApps.sln  | 5 ++---
 src/eShopOnContainers-ServicesAndWebApps.sln | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Mobile/eShopOnContainers-Android.sln b/src/Mobile/eShopOnContainers-Android.sln
index 1ef76e772..3782286c0 100644
--- a/src/Mobile/eShopOnContainers-Android.sln
+++ b/src/Mobile/eShopOnContainers-Android.sln
@@ -7,9 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
 	ProjectSection(SolutionItems) = preProject
-		docker-compose.yml = docker-compose.yml
-		global.json = global.json
-		NuGet.config = NuGet.config
+		..\docker-compose.yml = ..\docker-compose.yml
+		..\NuGet.config = ..\NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{F61357CE-1CC2-410E-8776-B16EEBC98EB8}"
diff --git a/src/Mobile/eShopOnContainers-MobileApps.sln b/src/Mobile/eShopOnContainers-MobileApps.sln
index 04a0fa223..b10b8a818 100644
--- a/src/Mobile/eShopOnContainers-MobileApps.sln
+++ b/src/Mobile/eShopOnContainers-MobileApps.sln
@@ -7,9 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
 	ProjectSection(SolutionItems) = preProject
-		docker-compose.yml = docker-compose.yml
-		global.json = global.json
-		NuGet.config = NuGet.config
+		..\docker-compose.yml = ..\docker-compose.yml
+		..\NuGet.config = ..\NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{F61357CE-1CC2-410E-8776-B16EEBC98EB8}"
diff --git a/src/eShopOnContainers-ServicesAndWebApps.sln b/src/eShopOnContainers-ServicesAndWebApps.sln
index 3a1dec68a..55d5b7359 100644
--- a/src/eShopOnContainers-ServicesAndWebApps.sln
+++ b/src/eShopOnContainers-ServicesAndWebApps.sln
@@ -10,7 +10,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AF739CD-81D8-428D-A08A-0A58372DEBF6}"
 	ProjectSection(SolutionItems) = preProject
 		.env = .env
-		Local.testsettings = Local.testsettings
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject

From 07d36e3188f8e22d5d8d3010b5e1b23472fb5df6 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 10 Nov 2020 19:33:28 +0530
Subject: [PATCH 41/44] Updated solution file. (#1514)

---
 src/eShopOnContainers-ServicesAndWebApps.sln | 143 +++++++++----------
 1 file changed, 64 insertions(+), 79 deletions(-)

diff --git a/src/eShopOnContainers-ServicesAndWebApps.sln b/src/eShopOnContainers-ServicesAndWebApps.sln
index 55d5b7359..95a8ad397 100644
--- a/src/eShopOnContainers-ServicesAndWebApps.sln
+++ b/src/eShopOnContainers-ServicesAndWebApps.sln
@@ -73,27 +73,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost.Customization", "Bu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGateways", "ApiGateways", "{77849D35-37D4-4802-81DC-9477B2775A40}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Marketing", "Mobile.Bff.Marketing", "{DB813A36-11BA-41FE-B258-CA9A7152247B}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Mobile.Bff.Marketing\apigw\configuration.json = ApiGateways\Mobile.Bff.Marketing\apigw\configuration.json
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Mobile.Bff.Shopping\apigw\configuration.json = ApiGateways\Mobile.Bff.Shopping\apigw\configuration.json
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Bff.Marketing", "Web.Bff.Marketing", "{F8F0921C-EE5D-4AED-A4D6-5BF5FAE02CB5}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Web.Bff.Marketing\apigw\configuration.json = ApiGateways\Web.Bff.Marketing\apigw\configuration.json
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Bff.Shopping", "Web.Bff.Shopping", "{28C0F5C8-4849-4035-80AB-45639424E73F}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Web.Bff.Shopping\apigw\configuration.json = ApiGateways\Web.Bff.Shopping\apigw\configuration.json
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Shopping.HttpAggregator", "ApiGateways\Web.Bff.Shopping\aggregator\Web.Shopping.HttpAggregator.csproj", "{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}"
 EndProject
@@ -142,19 +122,24 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Devspaces.Support", "BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj", "{56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Envoy", "Envoy", "{882A8F3A-C61F-4C44-86DD-A5A258714BF2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3ABEEE8C-35E0-4185-9825-C44326151F5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webmarketing", "webmarketing", "{4AB8D97B-1A96-434D-A10F-2A646A687859}"
 	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Envoy\Dockerfile = ApiGateways\Envoy\Dockerfile
+		ApiGateways\Envoy\config\webmarketing\envoy.yaml = ApiGateways\Envoy\config\webmarketing\envoy.yaml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3ABEEE8C-35E0-4185-9825-C44326151F5B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webshopping", "webshopping", "{966B1B0B-2AE0-4438-8741-1C5A05556095}"
 	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Envoy\config\catalog.proto = ApiGateways\Envoy\config\catalog.proto
-		ApiGateways\Envoy\config\catalog.proto-descriptor.pb = ApiGateways\Envoy\config\catalog.proto-descriptor.pb
-		ApiGateways\Envoy\Dockerfile = ApiGateways\Envoy\Dockerfile
-		ApiGateways\Envoy\config\envoy.yaml = ApiGateways\Envoy\config\envoy.yaml
+		ApiGateways\Envoy\config\webshopping\envoy.yaml = ApiGateways\Envoy\config\webshopping\envoy.yaml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{798BFC44-2CCD-45FA-B37A-5173B03C2B30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{B62E859F-825E-4C8B-93EC-5966EACFD026}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -890,54 +875,6 @@ Global
 		{15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x64.Build.0 = Release|Any CPU
 		{15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x86.ActiveCfg = Release|Any CPU
 		{15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x86.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x64.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x86.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x64.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x86.Build.0 = Debug|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|ARM.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhone.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x64.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x64.Build.0 = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x86.ActiveCfg = Release|Any CPU
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x86.Build.0 = Release|Any CPU
 		{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -1706,6 +1643,54 @@ Global
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}.Release|x64.Build.0 = Release|Any CPU
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}.Release|x86.ActiveCfg = Release|Any CPU
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}.Release|x86.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|x64.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|x64.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Debug|x86.Build.0 = Debug|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|ARM.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|iPhone.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|x64.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|x64.Build.0 = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|x86.ActiveCfg = Release|Any CPU
+		{B62E859F-825E-4C8B-93EC-5966EACFD026}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1740,11 +1725,7 @@ Global
 		{1815B651-941C-466B-AE33-D1D7EEB8F77F} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
 		{15F4B3AA-89B6-4A0D-9051-414305974781} = {1815B651-941C-466B-AE33-D1D7EEB8F77F}
 		{77849D35-37D4-4802-81DC-9477B2775A40} = {932D8224-11F6-4D07-B109-DA28AD288A63}
-		{DB813A36-11BA-41FE-B258-CA9A7152247B} = {77849D35-37D4-4802-81DC-9477B2775A40}
-		{0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB} = {77849D35-37D4-4802-81DC-9477B2775A40}
-		{F8F0921C-EE5D-4AED-A4D6-5BF5FAE02CB5} = {77849D35-37D4-4802-81DC-9477B2775A40}
 		{28C0F5C8-4849-4035-80AB-45639424E73F} = {77849D35-37D4-4802-81DC-9477B2775A40}
-		{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0} = {0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB}
 		{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1} = {28C0F5C8-4849-4035-80AB-45639424E73F}
 		{E1D2B260-4E7F-4A88-BC13-9910F7C44623} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{9D9CE4E4-1DD0-4961-861F-219731DE06CE} = {2751AC5C-D148-4D7A-AE8F-149B47C9A82D}
@@ -1771,6 +1752,10 @@ Global
 		{882A8F3A-C61F-4C44-86DD-A5A258714BF2} = {77849D35-37D4-4802-81DC-9477B2775A40}
 		{3ABEEE8C-35E0-4185-9825-C44326151F5B} = {882A8F3A-C61F-4C44-86DD-A5A258714BF2}
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
+		{4AB8D97B-1A96-434D-A10F-2A646A687859} = {3ABEEE8C-35E0-4185-9825-C44326151F5B}
+		{966B1B0B-2AE0-4438-8741-1C5A05556095} = {3ABEEE8C-35E0-4185-9825-C44326151F5B}
+		{798BFC44-2CCD-45FA-B37A-5173B03C2B30} = {77849D35-37D4-4802-81DC-9477B2775A40}
+		{B62E859F-825E-4C8B-93EC-5966EACFD026} = {798BFC44-2CCD-45FA-B37A-5173B03C2B30}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

From 7e59cd1ffc7c7c7c6af7f823451819e09881476e Mon Sep 17 00:00:00 2001
From: ansonzhang <3143422472@qq.com>
Date: Mon, 23 Nov 2020 19:26:09 +0800
Subject: [PATCH 42/44] Fixed #1518 bug (#1520)

* Update CatalogContextModelSnapshot.cs

* Update CatalogContextSeed.cs

* Modify CSV data

* Give PictureFileName assignment
---
 .../Catalog.API/Infrastructure/CatalogContextSeed.cs     | 4 ++--
 .../CatalogMigrations/CatalogContextModelSnapshot.cs     | 9 +++++----
 src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv  | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
index cd1ea4ab1..e425072e0 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
@@ -181,7 +181,7 @@
             string[] csvheaders;
             try
             {
-                string[] requiredHeaders = { "catalogtypename", "catalogbrandname", "description", "name", "price", "pictureFileName" };
+                string[] requiredHeaders = { "catalogtypename", "catalogbrandname", "description", "name", "price", "picturefilename" };
                 string[] optionalheaders = { "availablestock", "restockthreshold", "maxstockthreshold", "onreorder" };
                 csvheaders = GetHeaders(csvFileCatalogItems, requiredHeaders, optionalheaders );
             }
@@ -234,7 +234,7 @@
                 Description = column[Array.IndexOf(headers, "description")].Trim('"').Trim(),
                 Name = column[Array.IndexOf(headers, "name")].Trim('"').Trim(),
                 Price = price,
-                PictureUri = column[Array.IndexOf(headers, "pictureuri")].Trim('"').Trim(),
+                PictureFileName = column[Array.IndexOf(headers, "picturefilename")].Trim('"').Trim(),
             };
 
             int availableStockIndex = Array.IndexOf(headers, "availablestock");
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogMigrations/CatalogContextModelSnapshot.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogMigrations/CatalogContextModelSnapshot.cs
index 851cfefe6..7b72f3388 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogMigrations/CatalogContextModelSnapshot.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogMigrations/CatalogContextModelSnapshot.cs
@@ -14,9 +14,10 @@ namespace Catalog.API.Infrastructure.Migrations
         {
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1")
-                .HasAnnotation("SqlServer:Sequence:.catalog_brand_hilo", "'catalog_brand_hilo', '', '1', '10', '', '', 'Int64', 'False'")
-                .HasAnnotation("SqlServer:Sequence:.catalog_hilo", "'catalog_hilo', '', '1', '10', '', '', 'Int64', 'False'")
-                .HasAnnotation("SqlServer:Sequence:.catalog_type_hilo", "'catalog_type_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("Relational:Sequence:.catalog_brand_hilo", "'catalog_brand_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("Relational:Sequence:.catalog_hilo", "'catalog_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("Relational:Sequence:.catalog_type_hilo", "'catalog_type_hilo', '', '1', '10', '', '', 'Int64', 'False'")
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
             modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Catalog.API.Model.CatalogBrand", b =>
@@ -58,7 +59,7 @@ namespace Catalog.API.Infrastructure.Migrations
 
                     b.Property<bool>("OnReorder");
 
-                    b.Property<string>("PictureUri");
+                    b.Property<string>("PictureFileName");
 
                     b.Property<decimal>("Price");
 
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
index 0257216d4..430d52f20 100644
--- a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
+++ b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
@@ -5,7 +5,7 @@ T-Shirt,Other,Prism White T-Shirt,Prism White T-Shirt,12,3.png,56,false
 T-Shirt,.NET,.NET Foundation T-shirt,.NET Foundation T-shirt,12,4.png,120,false
 Sheet,Other,Roslyn Red Sheet,Roslyn Red Sheet,8.5,5.png,55,false
 T-Shirt,.NET,.NET Blue Hoodie,.NET Blue Hoodie,12,6.png,17,false
-T-Shirt,Other,Roslyn Red T-Shirt,Roslyn Red T-Shirt",12,7.png,8,false
+T-Shirt,Other,Roslyn Red T-Shirt,Roslyn Red T-Shirt,12,7.png,8,false
 T-Shirt,Other,Kudu Purple Hoodie,Kudu Purple Hoodie,8.5,8.png,34,false
 Mug,Other,Cup<T> White Mug,Cup<T> White Mug,12,9.png,76,false
 Sheet,.NET,.NET Foundation Sheet,.NET Foundation Sheet,12,10.png,11,false

From 9dec3b16e826d91e64f2c33a4c5ae043bf0e9a98 Mon Sep 17 00:00:00 2001
From: n-stefan <38526229+n-stefan@users.noreply.github.com>
Date: Tue, 24 Nov 2020 12:54:31 +0200
Subject: [PATCH 43/44] Fix PurchaseUrl port in WebSPA appsettings.json (#1525)

---
 src/Web/WebSPA/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/WebSPA/appsettings.json b/src/Web/WebSPA/appsettings.json
index 5a65eecc0..4c829aad0 100644
--- a/src/Web/WebSPA/appsettings.json
+++ b/src/Web/WebSPA/appsettings.json
@@ -2,7 +2,7 @@
   "IdentityUrl": "http://localhost:5105",
   "MarketingUrl": "http://localhost:5110",
   "CallBackUrl": "http://localhost:5104/",
-  "PurchaseUrl": "http://localhost:5200",
+  "PurchaseUrl": "http://localhost:5202",
   "PurchaseUrlHC": "http://localhost:5202/hc",
   "MarketingUrlHC": "http://localhost:5203/hc",
   "IdentityUrlHC": "http://localhost:5105/hc",

From 0a4110a1e9145c56bb1752d09da65cf1f1e036ee Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Tue, 1 Dec 2020 17:16:37 +0530
Subject: [PATCH 44/44] Updated highlight version to latest. (#1531)

---
 src/Web/WebSPA/package-lock.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json
index 3c3a97fda..f4d8c16b2 100644
--- a/src/Web/WebSPA/package-lock.json
+++ b/src/Web/WebSPA/package-lock.json
@@ -8474,10 +8474,9 @@
       }
     },
     "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==",
-      "dev": true
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.0.tgz",
+      "integrity": "sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA=="
     },
     "hmac-drbg": {
       "version": "1.0.1",