## Setting up your development environment for eShopOnContainers
-### Visual Studio 2017 and Windows based
+### Visual Studio 2017 (or above) and Windows based
This is the more straightforward way to get started:
https://github.com/dotnet-architecture/eShopOnContainers/wiki/02.-Setting-eShopOnContainers-in-a-Visual-Studio-2017-environment
@@ -194,5 +149,5 @@ As mentioned, we'd appreciate your feedback, improvements and ideas.
You can create new issues at the issues section, do pull requests and/or send emails to **eshop_feedback@service.microsoft.com**
## Questions
-[QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):
+[QUESTION] Answer +1 if the solution is working for you (Through VS or CLI environment):
https://github.com/dotnet/eShopOnContainers/issues/107
diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml
index d2f4708f6..adf00e4d0 100644
--- a/build/azure-devops/apigws/azure-pipelines.yml
+++ b/build/azure-devops/apigws/azure-pipelines.yml
@@ -1,5 +1,3 @@
-pool:
- vmImage: 'ubuntu-16.04'
variables:
registryEndpoint: eshop-registry
trigger:
@@ -17,34 +15,66 @@ trigger:
exclude:
- src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
- src/ApiGateways/Web.Bff.Shopping/aggregator/*
-steps:
-- task: DockerCompose@0
- displayName: Compose build apigws
- inputs:
- dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
- containerregistrytype: Container Registry
- dockerRegistryEndpoint: $(registryEndpoint)
- dockerComposeFile: docker-compose.yml
- qualifyImageNames: true
- projectName: ""
- dockerComposeFileArgs: |
- TAG=$(Build.SourceBranchName)
-- task: DockerCompose@0
- displayName: Compose push apigws
- inputs:
- dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
- containerregistrytype: Container Registry
- dockerRegistryEndpoint: $(registryEndpoint)
- dockerComposeFile: docker-compose.yml
- qualifyImageNames: true
- projectName: ""
- dockerComposeFileArgs: |
- TAG=$(Build.SourceBranchName)
-- task: CopyFiles@2
- inputs:
- sourceFolder: $(Build.SourcesDirectory)/k8s/helm
- targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
-- task: PublishBuildArtifacts@1
- inputs:
- pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
- artifactName: helm
+jobs:
+- job: BuildLinux
+ pool:
+ vmImage: 'ubuntu-16.04'
+ steps:
+ - task: DockerCompose@0
+ displayName: Compose build apigws
+ inputs:
+ dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+ containerregistrytype: Container Registry
+ dockerRegistryEndpoint: $(registryEndpoint)
+ dockerComposeFile: docker-compose.yml
+ qualifyImageNames: true
+ projectName: ""
+ dockerComposeFileArgs: |
+ TAG=$(Build.SourceBranchName)
+ - task: DockerCompose@0
+ displayName: Compose push apigws
+ inputs:
+ dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+ containerregistrytype: Container Registry
+ dockerRegistryEndpoint: $(registryEndpoint)
+ dockerComposeFile: docker-compose.yml
+ qualifyImageNames: true
+ projectName: ""
+ dockerComposeFileArgs: |
+ TAG=$(Build.SourceBranchName)
+ - task: CopyFiles@2
+ inputs:
+ sourceFolder: $(Build.SourcesDirectory)/k8s/helm
+ targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm
+ - task: PublishBuildArtifacts@1
+ inputs:
+ pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm
+ artifactName: helm
+- job: BuildWindows
+ pool:
+ vmImage: 'vs2017-win2016'
+ steps:
+ - task: DockerCompose@0
+ displayName: Compose build apigws
+ inputs:
+ dockerComposeCommand: 'build mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+ containerregistrytype: Container Registry
+ dockerRegistryEndpoint: $(registryEndpoint)
+ dockerComposeFile: docker-compose.yml
+ qualifyImageNames: true
+ projectName: ""
+ dockerComposeFileArgs: |
+ TAG=$(Build.SourceBranchName)
+ PLATFORM=win
+ - task: DockerCompose@0
+ displayName: Compose push apigws
+ inputs:
+ dockerComposeCommand: 'push mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw'
+ containerregistrytype: Container Registry
+ dockerRegistryEndpoint: $(registryEndpoint)
+ dockerComposeFile: docker-compose.yml
+ qualifyImageNames: true
+ projectName: ""
+ dockerComposeFileArgs: |
+ TAG=$(Build.SourceBranchName)
+ PLATFORM=win
\ No newline at end of file
diff --git a/build/multiarch-manifests/create-manifests.ps1 b/build/multiarch-manifests/create-manifests.ps1
new file mode 100644
index 000000000..cc7f05194
--- /dev/null
+++ b/build/multiarch-manifests/create-manifests.ps1
@@ -0,0 +1,26 @@
+Param(
+ [parameter(Mandatory=$true)][string]$registry
+)
+
+if ([String]::IsNullOrEmpty($registry)) {
+ Write-Host "Registry must be set to docker registry to use" -ForegroundColor Red
+ exit 1
+}
+
+Write-Host "This script creates the local manifests, for pushing the multi-arch manifests" -ForegroundColor Yellow
+Write-Host "Tags used are linux-master, win-master, linux-dev, win-dev, linux-latest, win-latest" -ForegroundColor Yellow
+Write-Host "Multiarch images tags will be master, dev, latest" -ForegroundColor Yellow
+
+
+$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "ordering.backgroundtasks", "marketing.api", "payment.api", "locations.api", "webhooks.api", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub", "webstatus", "webspa", "webmvc", "webhooks.client"
+
+foreach ($svc in $services) {
+ Write-Host "Creating manifest for $svc and tags :latest, :master, and :dev"
+ docker manifest create $registry/${svc}:master $registry/${svc}:linux-master $registry/${svc}:win-master
+ docker manifest create $registry/${svc}:dev $registry/${svc}:linux-dev $registry/${svc}:win-dev
+ docker manifest create $registry/${svc}:latest $registry/${svc}:linux-latest $registry/${svc}:win-latest
+ Write-Host "Pushing manifest for $svc and tags :latest, :master, and :dev"
+ docker manifest push $registry/${svc}:latest
+ docker manifest push $registry/${svc}:dev
+ docker manifest push $registry/${svc}:master
+}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 2a0448bad..8c523e122 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
image: rabbitmq:3-management-alpine
identity.api:
- image: ${REGISTRY:-eshop}/identity.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Identity/Identity.API/Dockerfile
@@ -26,7 +26,7 @@ services:
- sql.data
basket.api:
- image: ${REGISTRY:-eshop}/basket.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Basket/Basket.API/Dockerfile
@@ -36,7 +36,7 @@ services:
- rabbitmq
catalog.api:
- image: ${REGISTRY:-eshop}/catalog.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
@@ -45,7 +45,7 @@ services:
- rabbitmq
ordering.api:
- image: ${REGISTRY:-eshop}/ordering.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
@@ -54,7 +54,7 @@ services:
- rabbitmq
ordering.backgroundtasks:
- image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
@@ -63,7 +63,7 @@ services:
- rabbitmq
marketing.api:
- image: ${REGISTRY:-eshop}/marketing.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Marketing/Marketing.API/Dockerfile
@@ -74,7 +74,7 @@ services:
- rabbitmq
payment.api:
- image: ${REGISTRY:-eshop}/payment.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Payment/Payment.API/Dockerfile
@@ -82,7 +82,7 @@ services:
- rabbitmq
locations.api:
- image: ${REGISTRY:-eshop}/locations.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Location/Locations.API/Dockerfile
@@ -91,7 +91,7 @@ services:
- rabbitmq
webhooks.api:
- image: ${REGISTRY:-eshop}/webhooks.api:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Webhooks/Webhooks.API/Dockerfile
@@ -99,7 +99,7 @@ services:
- sql.data
mobileshoppingapigw:
- image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -114,7 +114,7 @@ services:
- basket.api
mobilemarketingapigw:
- image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -129,7 +129,7 @@ services:
- basket.api
webshoppingapigw:
- image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -144,7 +144,7 @@ services:
- basket.api
webmarketingapigw:
- image: ${REGISTRY:-eshop}/ocelotapigw:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
@@ -159,7 +159,7 @@ services:
- basket.api
mobileshoppingagg:
- image: ${REGISTRY:-eshop}/mobileshoppingagg:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -174,7 +174,7 @@ services:
- basket.api
webshoppingagg:
- image: ${REGISTRY:-eshop}/webshoppingagg:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
@@ -189,7 +189,7 @@ services:
- basket.api
ordering.signalrhub:
- image: ${REGISTRY:-eshop}/ordering.signalrhub:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -204,13 +204,13 @@ services:
- basket.api
webstatus:
- image: ${REGISTRY:-eshop}/webstatus:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebStatus/Dockerfile
webspa:
- image: ${REGISTRY:-eshop}/webspa:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebSPA/Dockerfile
@@ -220,7 +220,7 @@ services:
# - webmarketingapigw
webmvc:
- image: ${REGISTRY:-eshop}/webmvc:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebMVC/Dockerfile
@@ -230,7 +230,7 @@ services:
- webmarketingapigw
webhooks.client:
- image: ${REGISTRY:-eshop}/webhooks.client:${TAG:-latest}
+ image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
dockerfile: src/Web/WebhookClient/Dockerfile
diff --git a/docker-scripts/linux/install-node.sh b/docker-scripts/linux/install-node.sh
deleted file mode 100644
index 73407aae9..000000000
--- a/docker-scripts/linux/install-node.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-export NODE_DOWNLOAD_SHA 0e20787e2eda4cc31336d8327556ebc7417e8ee0a6ba0de96a09b0ec2b841f60
-curl -SL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" --output nodejs.tar.gz \
- && echo "$NODE_DOWNLOAD_SHA nodejs.tar.gz" | sha256sum -c - \
- && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 \
- && rm nodejs.tar.gz \
- && ln -s /usr/local/bin/node /usr/local/bin/nodejs
diff --git a/docker-scripts/win/install-node.cmd b/docker-scripts/win/install-node.cmd
deleted file mode 100644
index eaa4e356c..000000000
--- a/docker-scripts/win/install-node.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-set NODE_VERSION=8.11.1
-curl -SL "https://nodejs.org/dist/v%NODE_VERSION%/node-v%NODE_VERSION%-win-x64.zip" --output nodejs.zip
-tar -xf nodejs.zip -C c:\
-setx PATH "%PATH%;c:\node-v%NODE_VERSION%-win-x64"
\ No newline at end of file
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
index 447b73073..882bca09f 100644
--- a/eShopOnContainers-ServicesAndWebApps.sln
+++ b/eShopOnContainers-ServicesAndWebApps.sln
@@ -142,9 +142,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Payment.API", "src\Services
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Webhooks", "Webhooks", "{E0AA11C4-2873-461D-8F82-53392530FB7A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Webhooks.API", "src\Services\Webhooks\Webhooks.API\Webhooks.API.csproj", "{84E2016E-0435-44C6-8020-3D288AA38B2C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webhooks.API", "src\Services\Webhooks\Webhooks.API\Webhooks.API.csproj", "{84E2016E-0435-44C6-8020-3D288AA38B2C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebhookClient", "src\Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebhookClient", "src\Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Devspace.Support", "Devspace.Support", "{68F5041D-51F2-4630-94B6-B49789F5E51A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Devspaces.Support", "src\BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj", "{56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1744,6 +1748,54 @@ Global
{766D7E92-6AF0-476C-ADD5-282BF4D8C576}.Release|x64.Build.0 = Release|Any CPU
{766D7E92-6AF0-476C-ADD5-282BF4D8C576}.Release|x86.ActiveCfg = Release|Any CPU
{766D7E92-6AF0-476C-ADD5-282BF4D8C576}.Release|x86.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|ARM.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|x64.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|x64.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|x86.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.AppStore|x86.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|ARM.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|x64.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Debug|x86.Build.0 = Debug|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|Any CPU.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|ARM.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|ARM.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|iPhone.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|x64.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|x64.Build.0 = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|x86.ActiveCfg = Release|Any CPU
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1808,6 +1860,8 @@ Global
{E0AA11C4-2873-461D-8F82-53392530FB7A} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
{84E2016E-0435-44C6-8020-3D288AA38B2C} = {E0AA11C4-2873-461D-8F82-53392530FB7A}
{766D7E92-6AF0-476C-ADD5-282BF4D8C576} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
+ {68F5041D-51F2-4630-94B6-B49789F5E51A} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
+ {56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35} = {68F5041D-51F2-4630-94B6-B49789F5E51A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}
diff --git a/k8s/helm/apigwmm/templates/_names.tpl b/k8s/helm/apigwmm/templates/_names.tpl
index a6eeb9965..d44859fea 100644
--- a/k8s/helm/apigwmm/templates/_names.tpl
+++ b/k8s/helm/apigwmm/templates/_names.tpl
@@ -33,14 +33,13 @@
{{- end -}}
+
{{- define "pathBase" -}}
-{{- $name := first .}}
-{{- $ctx := last .}}
-{{- if $ctx.Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" $ctx -}}
-{{- printf "/%s-%s" $name $suffix -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
-{{- printf "/%s" $name -}}
+{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml
index 6dc58bf50..c9abb0b62 100644
--- a/k8s/helm/apigwmm/templates/deployment.yaml
+++ b/k8s/helm/apigwmm/templates/deployment.yaml
@@ -61,10 +61,10 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: config
- mountPath: /app/configuration
+ mountPath: {{ .Values.ocelot.configPath }}
env:
- name: PATH_BASE
- value: {{ include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw .) }}
+ value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
diff --git a/k8s/helm/apigwmm/templates/ingress.yaml b/k8s/helm/apigwmm/templates/ingress.yaml
index 28e2aa84d..290aac0b3 100644
--- a/k8s/helm/apigwmm/templates/ingress.yaml
+++ b/k8s/helm/apigwmm/templates/ingress.yaml
@@ -1,5 +1,6 @@
{{- if .Values.ingress.enabled -}}
-{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw .) -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobilemarketingapigw -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +24,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.mobilemarketingapigw }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/apigwmm/values.yaml b/k8s/helm/apigwmm/values.yaml
index 501266780..ea87a6c05 100644
--- a/k8s/helm/apigwmm/values.yaml
+++ b/k8s/helm/apigwmm/values.yaml
@@ -62,3 +62,5 @@ probes:
initialDelaySeconds: 90
periodSeconds: 60
port: 80
+ocelot:
+ configPath: /app/configuration
diff --git a/k8s/helm/apigwms/templates/_names.tpl b/k8s/helm/apigwms/templates/_names.tpl
index 1e840c56c..d44859fea 100644
--- a/k8s/helm/apigwms/templates/_names.tpl
+++ b/k8s/helm/apigwms/templates/_names.tpl
@@ -35,13 +35,11 @@
{{- define "pathBase" -}}
-{{- $name := first .}}
-{{- $ctx := last .}}
-{{- if $ctx.Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" $ctx -}}
-{{- printf "/%s-%s" $name $suffix -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
-{{- printf "/%s" $name -}}
+{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
diff --git a/k8s/helm/apigwms/templates/deployment.yaml b/k8s/helm/apigwms/templates/deployment.yaml
index 8a4fd8942..b22922f89 100644
--- a/k8s/helm/apigwms/templates/deployment.yaml
+++ b/k8s/helm/apigwms/templates/deployment.yaml
@@ -61,10 +61,10 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: config
- mountPath: /app/configuration
+ mountPath: {{ .Values.ocelot.configPath }}
env:
- name: PATH_BASE
- value: {{ include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw .) }}
+ value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
diff --git a/k8s/helm/apigwms/templates/ingress.yaml b/k8s/helm/apigwms/templates/ingress.yaml
index 7dd50d8dd..e93ddc2c6 100644
--- a/k8s/helm/apigwms/templates/ingress.yaml
+++ b/k8s/helm/apigwms/templates/ingress.yaml
@@ -1,5 +1,7 @@
{{- if .Values.ingress.enabled -}}
-{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw .) -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobileshoppingapigw -}}
+
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +25,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.mobileshoppingapigw }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/apigwms/values.yaml b/k8s/helm/apigwms/values.yaml
index 58377ec5b..650ab6449 100644
--- a/k8s/helm/apigwms/values.yaml
+++ b/k8s/helm/apigwms/values.yaml
@@ -61,4 +61,6 @@ probes:
timeoutSeconds: 5
initialDelaySeconds: 90
periodSeconds: 60
- port: 80
\ No newline at end of file
+ port: 80
+ocelot:
+ configPath: /app/configuration
\ No newline at end of file
diff --git a/k8s/helm/apigwwm/templates/_names.tpl b/k8s/helm/apigwwm/templates/_names.tpl
index 1e840c56c..d44859fea 100644
--- a/k8s/helm/apigwwm/templates/_names.tpl
+++ b/k8s/helm/apigwwm/templates/_names.tpl
@@ -35,13 +35,11 @@
{{- define "pathBase" -}}
-{{- $name := first .}}
-{{- $ctx := last .}}
-{{- if $ctx.Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" $ctx -}}
-{{- printf "/%s-%s" $name $suffix -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
-{{- printf "/%s" $name -}}
+{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml
index 5cbce9f22..d1f39ab6c 100644
--- a/k8s/helm/apigwwm/templates/deployment.yaml
+++ b/k8s/helm/apigwwm/templates/deployment.yaml
@@ -61,10 +61,10 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: config
- mountPath: /app/configuration
+ mountPath: {{ .Values.ocelot.configPath }}
env:
- name: PATH_BASE
- value: {{ include "pathBase" (list .Values.app.ingress.entries.webmarketingapigw .) }}
+ value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
diff --git a/k8s/helm/apigwwm/templates/ingress.yaml b/k8s/helm/apigwwm/templates/ingress.yaml
index 0a79c4660..297fea52b 100644
--- a/k8s/helm/apigwwm/templates/ingress.yaml
+++ b/k8s/helm/apigwwm/templates/ingress.yaml
@@ -1,5 +1,7 @@
{{- if .Values.ingress.enabled -}}
-{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.webmarketingapigw .) -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webmarketingapigw -}}
+
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +25,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.webmarketingapigw }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/apigwwm/values.yaml b/k8s/helm/apigwwm/values.yaml
index 68cbb89c4..63deb5832 100644
--- a/k8s/helm/apigwwm/values.yaml
+++ b/k8s/helm/apigwwm/values.yaml
@@ -61,4 +61,6 @@ probes:
timeoutSeconds: 5
initialDelaySeconds: 90
periodSeconds: 60
- port: 80
\ No newline at end of file
+ port: 80
+ocelot:
+ configPath: /app/configuration
\ No newline at end of file
diff --git a/k8s/helm/apigwws/templates/_names.tpl b/k8s/helm/apigwws/templates/_names.tpl
index a6eeb9965..d44859fea 100644
--- a/k8s/helm/apigwws/templates/_names.tpl
+++ b/k8s/helm/apigwws/templates/_names.tpl
@@ -33,14 +33,13 @@
{{- end -}}
+
{{- define "pathBase" -}}
-{{- $name := first .}}
-{{- $ctx := last .}}
-{{- if $ctx.Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" $ctx -}}
-{{- printf "/%s-%s" $name $suffix -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
-{{- printf "/%s" $name -}}
+{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
diff --git a/k8s/helm/apigwws/templates/deployment.yaml b/k8s/helm/apigwws/templates/deployment.yaml
index 4912d12bb..327eb50b7 100644
--- a/k8s/helm/apigwws/templates/deployment.yaml
+++ b/k8s/helm/apigwws/templates/deployment.yaml
@@ -60,10 +60,10 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: config
- mountPath: /app/configuration
+ mountPath: {{ .Values.ocelot.configPath }}
env:
- name: PATH_BASE
- value: {{ include "pathBase" (list .Values.app.ingress.entries.webshoppingapigw .) }}
+ value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
diff --git a/k8s/helm/apigwws/templates/ingress.yaml b/k8s/helm/apigwws/templates/ingress.yaml
index ee1f681ad..8bd2cfc6d 100644
--- a/k8s/helm/apigwws/templates/ingress.yaml
+++ b/k8s/helm/apigwws/templates/ingress.yaml
@@ -1,5 +1,6 @@
{{- if .Values.ingress.enabled -}}
-{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webshoppingapigw -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +24,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.webshoppingapigw }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/apigwws/values.yaml b/k8s/helm/apigwws/values.yaml
index 94b8a203f..2b047de99 100644
--- a/k8s/helm/apigwws/values.yaml
+++ b/k8s/helm/apigwws/values.yaml
@@ -62,3 +62,5 @@ probes:
initialDelaySeconds: 90
periodSeconds: 60
port: 80
+ocelot:
+ configPath: /app/configuration
\ No newline at end of file
diff --git a/k8s/helm/basket-api/templates/ingress.yaml b/k8s/helm/basket-api/templates/ingress.yaml
new file mode 100644
index 000000000..f99bd55a6
--- /dev/null
+++ b/k8s/helm/basket-api/templates/ingress.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.basket -}}
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "basket-api.fullname" . }}
+ labels:
+ app: {{ template "basket-api.name" . }}
+ chart: {{ template "basket-api.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/k8s/helm/basket-api/values.yaml b/k8s/helm/basket-api/values.yaml
index 6c264afba..a773700fe 100644
--- a/k8s/helm/basket-api/values.yaml
+++ b/k8s/helm/basket-api/values.yaml
@@ -53,3 +53,6 @@ probes:
initialDelaySeconds: 90
periodSeconds: 60
port: 80
+
+ingress:
+ enabled: false
\ No newline at end of file
diff --git a/k8s/helm/catalog-api/templates/ingress.yaml b/k8s/helm/catalog-api/templates/ingress.yaml
new file mode 100644
index 000000000..238d7b07e
--- /dev/null
+++ b/k8s/helm/catalog-api/templates/ingress.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.catalog -}}
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "catalog-api.fullname" . }}
+ labels:
+ app: {{ template "catalog-api.name" . }}
+ chart: {{ template "catalog-api.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/k8s/helm/deploy-all.ps1 b/k8s/helm/deploy-all.ps1
index 42ba3ab27..879749679 100644
--- a/k8s/helm/deploy-all.ps1
+++ b/k8s/helm/deploy-all.ps1
@@ -5,6 +5,7 @@ Param(
[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="",
@@ -66,20 +67,28 @@ $charts = ("eshop-common", "apigwmm", "apigwms", "apigwwm", "apigwws", "basket-a
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 --name="$appName-$infra" $infra
+ 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
+}
-foreach ($chart in $charts) {
- Write-Host "Installing: $chart" -ForegroundColor Green
- if ($useCustomRegistry) {
- helm install --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart
- }
- else {
- if ($chart -ne "eshop-common") { # eshop-common is ignored when no secret must be deployed
- helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart
+if ($deployCharts) {
+ foreach ($chart in $charts) {
+ Write-Host "Installing: $chart" -ForegroundColor Green
+ if ($useCustomRegistry) {
+ helm install --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart
+ }
+ else {
+ if ($chart -ne "eshop-common") { # eshop-common is ignored when no secret must be deployed
+ helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=Always --name="$appName-$chart" $chart
+ }
}
}
}
+else {
+ Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
Write-Host "helm charts installed." -ForegroundColor Green
\ No newline at end of file
diff --git a/k8s/helm/identity-api/templates/configmap.yaml b/k8s/helm/identity-api/templates/configmap.yaml
index 24d71b699..67c0f21cb 100644
--- a/k8s/helm/identity-api/templates/configmap.yaml
+++ b/k8s/helm/identity-api/templates/configmap.yaml
@@ -36,5 +36,4 @@ data:
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/k8s/helm/identity-api/templates/ingress.yaml b/k8s/helm/identity-api/templates/ingress.yaml
index 5824f91e2..1d2d3d5d5 100644
--- a/k8s/helm/identity-api/templates/ingress.yaml
+++ b/k8s/helm/identity-api/templates/ingress.yaml
@@ -1,5 +1,6 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.identity }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +24,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.identity }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/identity-api/values.yaml b/k8s/helm/identity-api/values.yaml
index c0fd38192..7b57dfde1 100644
--- a/k8s/helm/identity-api/values.yaml
+++ b/k8s/helm/identity-api/values.yaml
@@ -58,6 +58,8 @@ env:
key: webhooksapi_e
- name: WebhooksWebClient
key: webhooksweb_e
+ - name: EnableDevspaces
+ key: enableDevspaces
values:
- name: ASPNETCORE_ENVIRONMENT
value: Development
@@ -65,6 +67,7 @@ env:
value: 'K8S'
- name: IsClusterEnv
value: 'True'
+
probes:
liveness:
path: /liveness
@@ -76,4 +79,6 @@ probes:
timeoutSeconds: 5
initialDelaySeconds: 90
periodSeconds: 60
- port: 80
\ No newline at end of file
+ port: 80
+
+enableDevspaces: "false"
\ No newline at end of file
diff --git a/k8s/helm/locations-api/templates/ingress.yaml b/k8s/helm/locations-api/templates/ingress.yaml
new file mode 100644
index 000000000..8c846944e
--- /dev/null
+++ b/k8s/helm/locations-api/templates/ingress.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.locations }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "locations-api.fullname" . }}
+ labels:
+ app: {{ template "locations-api.name" . }}
+ chart: {{ template "locations-api.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
diff --git a/k8s/helm/marketing-api/templates/ingress.yaml b/k8s/helm/marketing-api/templates/ingress.yaml
new file mode 100644
index 000000000..7a5b29b12
--- /dev/null
+++ b/k8s/helm/marketing-api/templates/ingress.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.marketing }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "marketing-api.fullname" . }}
+ labels:
+ app: {{ template "marketing-api.name" . }}
+ chart: {{ template "marketing-api.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
diff --git a/k8s/helm/mobileshoppingagg/templates/ingress.yaml b/k8s/helm/mobileshoppingagg/templates/ingress.yaml
new file mode 100644
index 000000000..6c50a574e
--- /dev/null
+++ b/k8s/helm/mobileshoppingagg/templates/ingress.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobileshoppingagg }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "mobileshoppingagg.fullname" . }}
+ labels:
+ app: {{ template "mobileshoppingagg.name" . }}
+ chart: {{ template "mobileshoppingagg.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
diff --git a/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml b/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml
index 54fec785b..23041d4ac 100644
--- a/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml
+++ b/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml
@@ -1,10 +1,11 @@
{{- $name := include "ordering-backgroundtasks.fullname" . -}}
{{- $sqlsrv := include "sql-name" . -}}
+{{- $cfgname := printf "cfg-%s" $name | trunc 63 }}
apiVersion: v1
kind: ConfigMap
metadata:
- name: "cfg-{{ $name }}"
+ name: "{{ $cfgname }}"
labels:
app: {{ template "ordering-backgroundtasks.name" . }}
chart: {{ template "ordering-backgroundtasks.chart" .}}
diff --git a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
index 017f9f3dd..d93c7f764 100644
--- a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
+++ b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
@@ -1,11 +1,11 @@
{{- $name := include "ordering-backgroundtasks.fullname" . -}}
-{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $cfgname := printf "cfg-%s" $name | trunc 63 }}
+
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "ordering-backgroundtasks.fullname" . }}
labels:
- ufo: {{ $cfgname}}
app: {{ template "ordering-backgroundtasks.name" . }}
chart: {{ template "ordering-backgroundtasks.chart" . }}
release: {{ .Release.Name }}
diff --git a/k8s/helm/webhooks-api/templates/ingress.yaml b/k8s/helm/webhooks-api/templates/ingress.yaml
index 293f8e47e..debf0f84a 100644
--- a/k8s/helm/webhooks-api/templates/ingress.yaml
+++ b/k8s/helm/webhooks-api/templates/ingress.yaml
@@ -1,5 +1,6 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webhooks }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +24,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.webhooks }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/webmvc/templates/configmap.yaml b/k8s/helm/webmvc/templates/configmap.yaml
index 60dacdadd..55c4e6b33 100644
--- a/k8s/helm/webmvc/templates/configmap.yaml
+++ b/k8s/helm/webmvc/templates/configmap.yaml
@@ -2,7 +2,6 @@
{{- $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
diff --git a/k8s/helm/webmvc/templates/ingress.yaml b/k8s/helm/webmvc/templates/ingress.yaml
index abfb62b2f..892fa4273 100644
--- a/k8s/helm/webmvc/templates/ingress.yaml
+++ b/k8s/helm/webmvc/templates/ingress.yaml
@@ -1,5 +1,6 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mvc -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -23,11 +24,13 @@ spec:
{{- end }}
{{- end }}
rules:
- - host: {{ .Values.inf.k8s.dns }}
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
- serviceName: {{ .Values.app.svc.mvc }}
+ serviceName: {{ $serviceName }}
servicePort: http
+ {{- end }}
{{- end }}
diff --git a/k8s/helm/webshoppingagg/templates/ingress.yaml b/k8s/helm/webshoppingagg/templates/ingress.yaml
new file mode 100644
index 000000000..742db4d30
--- /dev/null
+++ b/k8s/helm/webshoppingagg/templates/ingress.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webshoppingagg }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ template "webshoppingagg.fullname" . }}
+ labels:
+ app: {{ template "webshoppingagg.name" . }}
+ chart: {{ template "webshoppingagg.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ - {{ .Values.inf.k8s.dns }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ . }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: http
+ {{- end }}
+{{- end }}
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile.develop b/src/ApiGateways/ApiGw-Base/Dockerfile.develop
new file mode 100644
index 000000000..4da230d68
--- /dev/null
+++ b/src/ApiGateways/ApiGw-Base/Dockerfile.develop
@@ -0,0 +1,14 @@
+FROM microsoft/dotnet:2.2-sdk
+ARG BUILD_CONFIGURATION=Debug
+ENV ASPNETCORE_ENVIRONMENT=Development
+ENV DOTNET_USE_POLLING_FILE_WATCHER=true
+EXPOSE 80
+
+WORKDIR /src
+COPY ["src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj", "src/ApiGateways/ApiGw-Base/"]
+RUN dotnet restore "src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj"
+COPY . .
+WORKDIR "/src/src/ApiGateways/ApiGw-Base"
+RUN dotnet build --no-restore "OcelotApiGw.csproj" -c $BUILD_CONFIGURATION
+
+ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]
\ No newline at end of file
diff --git a/src/ApiGateways/Mobile.Bff.Marketing/apigw/azds.yaml b/src/ApiGateways/Mobile.Bff.Marketing/apigw/azds.yaml
new file mode 100644
index 000000000..46375343b
--- /dev/null
+++ b/src/ApiGateways/Mobile.Bff.Marketing/apigw/azds.yaml
@@ -0,0 +1,44 @@
+kind: helm-release
+apiVersion: 1.1
+build:
+ context: ..\..\..\..\
+ dockerfile: ..\..\..\ApiGateways\ApiGw-Base\Dockerfile
+install:
+ chart: ../../../../k8s/helm/apigwmm
+ set:
+ replicaCount: 1
+ image:
+ tag: $(tag)
+ pullPolicy: Never
+ ingress:
+ annotations:
+ kubernetes.io/ingress.class: traefik-azds
+ hosts:
+ # This expands to [space.s.]webmvc.