From 85e83e6389df209ab216774cec83118d6f1bccfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Tom=C3=A0s?= <etomas@gmail.com>
Date: Fri, 19 Jan 2018 19:36:29 +0100
Subject: [PATCH] Fixing minor bugs on k8s deployment

---
 k8s/deploy.ps1       |  3 ++
 k8s/deployments.yaml | 84 ++++++++++++++++++++++----------------------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1
index cb5e9fa0f..3fb155b0c 100644
--- a/k8s/deploy.ps1
+++ b/k8s/deploy.ps1
@@ -192,6 +192,8 @@ ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg}
 ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
 ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag'
 ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
+ExecKube -cmd 'set image deployments/orderingbackground orderingbackground=${registryPath}${dockerOrg}/ordering.backgroundtasks:$imageTag'
+
 
 Write-Host "Execute rollout..." -ForegroundColor Yellow
 ExecKube -cmd 'rollout resume deployments/basket'
@@ -204,6 +206,7 @@ ExecKube -cmd 'rollout resume deployments/payment'
 ExecKube -cmd 'rollout resume deployments/webmvc'
 ExecKube -cmd 'rollout resume deployments/webstatus'
 ExecKube -cmd 'rollout resume deployments/webspa'
+ExecKube -cmd 'rollout resume deployments/orderingbackground'
 
 Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
 
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index 603586e69..65a8f7934 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -56,15 +56,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60 
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10                 
+          initialDelaySeconds: 120
+          periodSeconds: 60                 
       imagePullSecrets:
       - name: registry-key
 ---
@@ -121,15 +121,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -208,15 +208,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -278,22 +278,22 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: ordering.backgroundtasks
+  name: orderingbackground
 spec:
   paused: true
   template:
@@ -303,7 +303,7 @@ spec:
         component: orderingbackground
     spec:
       containers:
-      - name: ordering
+      - name: orderingbackground
         image: eshop/ordering.backgroundtasks
         imagePullPolicy: Always
         env:
@@ -353,15 +353,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -433,15 +433,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 50
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -523,15 +523,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -578,15 +578,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10       
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key      
 ---
@@ -700,15 +700,15 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key
 ---
@@ -893,14 +893,14 @@ spec:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 5
-          periodSeconds: 10 
+          initialDelaySeconds: 60
+          periodSeconds: 60
         livenessProbe:
           httpGet:
             path: /hc
             port: 80
             scheme: HTTP 
-          initialDelaySeconds: 60
-          periodSeconds: 10      
+          initialDelaySeconds: 120
+          periodSeconds: 60
       imagePullSecrets:
       - name: registry-key