mirror of https://github.com/kubernetes/kops.git
Merge pull request #7102 from ReillyProcentive/upstreamWeaveChanges
Use readinessProbe for weave-net instead of livenessProbe
This commit is contained in:
commit
b2c9be8536
|
|
@ -164,12 +164,11 @@ spec:
|
|||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.5.1'
|
||||
livenessProbe:
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
path: /status
|
||||
port: 6784
|
||||
initialDelaySeconds: 30
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
|
|
|
|||
|
|
@ -146,12 +146,11 @@ spec:
|
|||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.3.0'
|
||||
livenessProbe:
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
path: /status
|
||||
port: 6784
|
||||
initialDelaySeconds: 30
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
|
|
|
|||
|
|
@ -156,12 +156,11 @@ spec:
|
|||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.5.1'
|
||||
livenessProbe:
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
path: /status
|
||||
port: 6784
|
||||
initialDelaySeconds: 30
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
|
|
|
|||
|
|
@ -160,12 +160,11 @@ spec:
|
|||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.5.1'
|
||||
livenessProbe:
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
host: 127.0.0.1
|
||||
path: /status
|
||||
port: 6784
|
||||
initialDelaySeconds: 30
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
|
|
|
|||
Loading…
Reference in New Issue