restore background config

Author: erikpique

build/acr-build/queue-all.ps1

@@ -13,7 +13,6 @@ $services = @(
     @{ Name="eshopcatalog"; Image="eshop/catalog.api"; File="src/Services/Catalog/Catalog.API/Dockerfile" },
     @{ Name="eshopidentity"; Image="eshop/identity.api"; File="src/Services/Identity/Identity.API/Dockerfile" },
     @{ Name="eshopordering"; Image="eshop/ordering.api"; File="src/Services/Ordering/Ordering.API/Dockerfile" },
-    @{ Name="eshoporderingbg"; Image="eshop/ordering.backgroundtasks"; File="src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile" },
     @{ Name="eshopmarketing"; Image="eshop/marketing.api"; File="src/Services/Marketing/Marketing.API/Dockerfile" },
     @{ Name="eshopwebspa"; Image="eshop/webspa"; File="src/Web/WebSPA/Dockerfile" },
     @{ Name="eshopwebmvc"; Image="eshop/webmvc"; File="src/Web/WebMVC/Dockerfile" },

build/multiarch-manifests/create-manifests.ps1

@@ -12,7 +12,7 @@ Write-Host "Tags used are linux-master, win-master, linux-dev, win-dev, linux-la
 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"
+$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "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-compose-windows.prod.yml

@@ -69,17 +69,6 @@ services:
     ports:
       - "5102:80"
 
-  ordering.backgroundtasks:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - UseCustomizationData=True
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5111:80"
-
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production

docker-compose.override.windows.yml

@@ -37,11 +37,6 @@ services:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  ordering.backgroundtasks:
-    environment:
-      - EventBusUserName=admin
-      - EventBusPassword=password
-
   payment.api:
     environment:
       - EventBusUserName=admin

docker-compose.override.yml

@@ -115,26 +115,6 @@ services:
     ports:
       - "5102:80"   
 
-
-  ordering.backgroundtasks:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
-      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
-      - UseCustomizationData=True
-      - AzureServiceBusEnabled=False
-      - CheckUpdateTime=30000
-      - GracePeriodTime=1
-      - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
-      - OrchestratorType=${ORCHESTRATOR_TYPE}
-      - UseLoadTest=${USE_LOADTEST:-False}
-      - Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
-    ports:
-      - "5111:80"
-
   marketing.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -343,8 +323,6 @@ services:
       - HealthChecks-UI__HealthChecks__7__Uri=http://webmarketingapigw/hc
       - HealthChecks-UI__HealthChecks__8__Name=Ordering HTTP Check
       - HealthChecks-UI__HealthChecks__8__Uri=http://ordering.api/hc
-      - HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Background Check
-      - HealthChecks-UI__HealthChecks__9__Uri=http://ordering.backgroundtasks/hc
       - HealthChecks-UI__HealthChecks__10__Name=Basket HTTP Check
       - HealthChecks-UI__HealthChecks__10__Uri=http://basket.api/hc
       - HealthChecks-UI__HealthChecks__11__Name=Catalog HTTP Check
@@ -359,7 +337,6 @@ services:
       - HealthChecks-UI__HealthChecks__15__Uri=http://payment.api/hc
       - HealthChecks-UI__HealthChecks__16__Name=Ordering SignalRHub HTTP Check
       - HealthChecks-UI__HealthChecks__16__Uri=http://ordering.signalrhub/hc      
-      - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:

docker-compose.prod.yml

@@ -91,25 +91,6 @@ services:
     ports:
       - "80"   # The API Gateway redirects and access through the internal port (80).
 
-
-  ordering.backgroundtasks:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
-      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
-      - UseCustomizationData=True
-      - AzureServiceBusEnabled=False
-      - CheckUpdateTime=30000
-      - GracePeriodTime=1
-      - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
-      - OrchestratorType=${ORCHESTRATOR_TYPE}
-      - UseLoadTest=${USE_LOADTEST:-False}
-    ports:
-      - "5111:80"
-
   marketing.api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -179,7 +160,6 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - CatalogUrl=http://catalog.api/hc
       - OrderingUrl=http://ordering.api/hc
-      - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
       - BasketUrl=http://basket.api/hc
       - IdentityUrl=http://identity.api/hc
       - LocationsUrl=http://locations.api/hc

docker-compose.yml

@@ -52,15 +52,7 @@ services:
     depends_on:
       - sql.data
       - rabbitmq
-
-  ordering.backgroundtasks:
-    image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
-    build:
-      context: .
-      dockerfile: src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile    
-    depends_on:
-      - sql.data
-      - rabbitmq
+      - identity.api
 
   marketing.api:
     image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}

k8s/build-push-images.ps1

@@ -57,7 +57,7 @@ if (-not [string]::IsNullOrEmpty($dockerUser)) {
 # Push images to Docker registry
 if ($pushImages) {
     Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
-    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "ordering.backgroundtasks", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
+    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
 
     foreach ($service in $services) {
         $imageFqdn = if ($useDockerHub)  {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}

k8s/deploy.ps1

@@ -68,7 +68,7 @@ if ($buildImages) {
 
 if ($pushImages) {
     Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
-    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "ordering.backgroundtasks", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
+    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub")
 
     foreach ($service in $services) {
         $imageFqdn = if ($useDockerHub)  {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}

k8s/deployments.yaml

@@ -265,65 +265,6 @@ spec:
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
-metadata:
-  name: ordering-backgroundtasks
-spec:
-  paused: true
-  template:
-    metadata:
-      labels:
-        app: eshop
-        component: ordering-backgroundtasks
-    spec:
-      containers:
-      - name: ordering-backgroundtasks
-        image: eshop/ordering.backgroundtasks
-        imagePullPolicy: Always
-        env:        
-        - name: ConnectionString
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: ordering__ConnectionString
-        - name: EventBusConnection
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: all__EventBusConnection
-        - name: AzureServiceBusEnabled
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: all__UseAzureServiceBus        
-        - name: CheckUpdateTime
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: GracePeriodManager__CheckUpdateTime
-        - name: GracePeriodTime
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: GracePeriodManager__GracePeriodTime  
-        - name: ApplicationInsights__InstrumentationKey
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: all__InstrumentationKey
-        - name: UseLoadTest
-          valueFrom:
-           configMapKeyRef:
-             name: externalcfg
-             key: all__EnableLoadTest
-        - name: OrchestratorType
-          value: 'K8S'     
-        ports:
-        - containerPort: 80
-      imagePullSecrets:
-      - name: registry-key
----
-apiVersion: extensions/v1beta1
-kind: Deployment
 metadata:
   name: ordering-signalrhub
 spec:
@@ -702,11 +643,6 @@ spec:
            configMapKeyRef:
              name: internalurls
              key: ordering__hc
-        - name: OrderingBackgroundTasksUrl
-          valueFrom:
-           configMapKeyRef:
-             name: internalurls
-             key: ordering-background__hc
         - name: LocationsUrl
           valueFrom:
            configMapKeyRef: