ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing minor bugs on k8s deployment

Browse Source
This commit is contained in:
Eduard Tomàs 2018-01-19 19:36:29 +01:00
parent 14bd6a475a
commit 85e83e6389
2 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
k8s/deploy.ps1
View File

@ -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/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$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/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
ExecKube -cmd 'set image deployments/orderingbackground orderingbackground=${registryPath}${dockerOrg}/ordering.backgroundtasks:$imageTag'
Write-Host "Execute rollout..." -ForegroundColor Yellow Write-Host "Execute rollout..." -ForegroundColor Yellow
ExecKube -cmd 'rollout resume deployments/basket' 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/webmvc'
ExecKube -cmd 'rollout resume deployments/webstatus' ExecKube -cmd 'rollout resume deployments/webstatus'
ExecKube -cmd 'rollout resume deployments/webspa' 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 Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow

84
k8s/deployments.yaml
View File

@ -56,15 +56,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -121,15 +121,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -208,15 +208,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -278,22 +278,22 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: ordering.backgroundtasks name: orderingbackground
spec: spec:
paused: true paused: true
template: template:
@ -303,7 +303,7 @@ spec:
component: orderingbackground component: orderingbackground
spec: spec:
containers: containers:
- name: ordering - name: orderingbackground
image: eshop/ordering.backgroundtasks image: eshop/ordering.backgroundtasks
imagePullPolicy: Always imagePullPolicy: Always
env: env:
@ -353,15 +353,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -433,15 +433,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 50
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -523,15 +523,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -578,15 +578,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -700,15 +700,15 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key
--- ---
@ -893,14 +893,14 @@ spec:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 60
periodSeconds: 10 periodSeconds: 60
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /hc path: /hc
port: 80 port: 80
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 120
periodSeconds: 10 periodSeconds: 60
imagePullSecrets: imagePullSecrets:
- name: registry-key - name: registry-key