Skip to content

Commit 3530d67

Browse files
authored
Merge pull request #964 from gunjan5/healthchecks
Add liveliness and readiness probes in the manifests
2 parents c568893 + e34358f commit 3530d67

File tree

14 files changed

+196
-0
lines changed

14 files changed

+196
-0
lines changed

master/getting-started/kubernetes/installation/hosted/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,25 @@ spec:
162162
# Auto-detect the BGP IP address.
163163
- name: IP
164164
value: ""
165+
- name: FELIX_HEALTHENABLED
166+
value: "true"
165167
securityContext:
166168
privileged: true
167169
resources:
168170
requests:
169171
cpu: 250m
172+
livenessProbe:
173+
httpGet:
174+
path: /liveness
175+
port: 9099
176+
periodSeconds: 10
177+
initialDelaySeconds: 10
178+
failureThreshold: 6
179+
readinessProbe:
180+
httpGet:
181+
path: /readiness
182+
port: 9099
183+
periodSeconds: 10
170184
volumeMounts:
171185
- mountPath: /lib/modules
172186
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,25 @@ spec:
182182
# Auto-detect the BGP IP address.
183183
- name: IP
184184
value: ""
185+
- name: FELIX_HEALTHENABLED
186+
value: "true"
185187
securityContext:
186188
privileged: true
187189
resources:
188190
requests:
189191
cpu: 250m
192+
livenessProbe:
193+
httpGet:
194+
path: /liveness
195+
port: 9099
196+
periodSeconds: 10
197+
initialDelaySeconds: 10
198+
failureThreshold: 6
199+
readinessProbe:
200+
httpGet:
201+
path: /readiness
202+
port: 9099
203+
periodSeconds: 10
190204
volumeMounts:
191205
- mountPath: /lib/modules
192206
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,25 @@ spec:
197197
# Auto-detect the BGP IP address.
198198
- name: IP
199199
value: ""
200+
- name: FELIX_HEALTHENABLED
201+
value: "true"
200202
securityContext:
201203
privileged: true
202204
resources:
203205
requests:
204206
cpu: 250m
207+
livenessProbe:
208+
httpGet:
209+
path: /liveness
210+
port: 9099
211+
periodSeconds: 10
212+
initialDelaySeconds: 10
213+
failureThreshold: 6
214+
readinessProbe:
215+
httpGet:
216+
path: /readiness
217+
port: 9099
218+
periodSeconds: 10
205219
volumeMounts:
206220
- mountPath: /lib/modules
207221
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,25 @@ spec:
113113
# No IP address needed.
114114
- name: IP
115115
value: ""
116+
- name: FELIX_HEALTHENABLED
117+
value: "true"
116118
securityContext:
117119
privileged: true
118120
resources:
119121
requests:
120122
cpu: 250m
123+
livenessProbe:
124+
httpGet:
125+
path: /liveness
126+
port: 9099
127+
periodSeconds: 10
128+
initialDelaySeconds: 10
129+
failureThreshold: 6
130+
readinessProbe:
131+
httpGet:
132+
path: /readiness
133+
port: 9099
134+
periodSeconds: 10
121135
volumeMounts:
122136
- mountPath: /lib/modules
123137
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,25 @@ spec:
123123
# No IP address needed.
124124
- name: IP
125125
value: ""
126+
- name: FELIX_HEALTHENABLED
127+
value: "true"
126128
securityContext:
127129
privileged: true
128130
resources:
129131
requests:
130132
cpu: 250m
133+
livenessProbe:
134+
httpGet:
135+
path: /liveness
136+
port: 9099
137+
periodSeconds: 10
138+
initialDelaySeconds: 10
139+
failureThreshold: 6
140+
readinessProbe:
141+
httpGet:
142+
path: /readiness
143+
port: 9099
144+
periodSeconds: 10
131145
volumeMounts:
132146
- mountPath: /lib/modules
133147
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,25 @@ spec:
110110
# No IP address needed.
111111
- name: IP
112112
value: ""
113+
- name: FELIX_HEALTHENABLED
114+
value: "true"
113115
securityContext:
114116
privileged: true
115117
resources:
116118
requests:
117119
cpu: 250m
120+
livenessProbe:
121+
httpGet:
122+
path: /liveness
123+
port: 9099
124+
periodSeconds: 10
125+
initialDelaySeconds: 10
126+
failureThreshold: 6
127+
readinessProbe:
128+
httpGet:
129+
path: /readiness
130+
port: 9099
131+
periodSeconds: 10
118132
volumeMounts:
119133
- mountPath: /lib/modules
120134
name: lib-modules

master/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,25 @@ spec:
120120
# No IP address needed.
121121
- name: IP
122122
value: ""
123+
- name: FELIX_HEALTHENABLED
124+
value: "true"
123125
securityContext:
124126
privileged: true
125127
resources:
126128
requests:
127129
cpu: 250m
130+
livenessProbe:
131+
httpGet:
132+
path: /liveness
133+
port: 9099
134+
periodSeconds: 10
135+
initialDelaySeconds: 10
136+
failureThreshold: 6
137+
readinessProbe:
138+
httpGet:
139+
path: /readiness
140+
port: 9099
141+
periodSeconds: 10
128142
volumeMounts:
129143
- mountPath: /lib/modules
130144
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ spec:
141141
# Set MTU for tunnel device used if ipip is enabled
142142
- name: FELIX_IPINIPMTU
143143
value: "1440"
144+
- name: FELIX_HEALTHENABLED
145+
value: "true"
144146
# Location of the CA certificate for etcd.
145147
- name: ETCD_CA_CERT_FILE
146148
valueFrom:
@@ -167,6 +169,18 @@ spec:
167169
resources:
168170
requests:
169171
cpu: 250m
172+
livenessProbe:
173+
httpGet:
174+
path: /liveness
175+
port: 9099
176+
periodSeconds: 10
177+
initialDelaySeconds: 10
178+
failureThreshold: 6
179+
readinessProbe:
180+
httpGet:
181+
path: /readiness
182+
port: 9099
183+
periodSeconds: 10
170184
volumeMounts:
171185
- mountPath: /lib/modules
172186
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ spec:
179179
# Set Felix logging to "info"
180180
- name: FELIX_LOGSEVERITYSCREEN
181181
value: "info"
182+
- name: FELIX_HEALTHENABLED
183+
value: "true"
182184
# Auto-detect the BGP IP address.
183185
- name: IP
184186
value: ""
@@ -187,6 +189,18 @@ spec:
187189
resources:
188190
requests:
189191
cpu: 250m
192+
livenessProbe:
193+
httpGet:
194+
path: /liveness
195+
port: 9099
196+
periodSeconds: 10
197+
initialDelaySeconds: 10
198+
failureThreshold: 6
199+
readinessProbe:
200+
httpGet:
201+
path: /readiness
202+
port: 9099
203+
periodSeconds: 10
190204
volumeMounts:
191205
- mountPath: /lib/modules
192206
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ spec:
194194
# Set Felix logging to "info"
195195
- name: FELIX_LOGSEVERITYSCREEN
196196
value: "info"
197+
- name: FELIX_HEALTHENABLED
198+
value: "true"
197199
# Auto-detect the BGP IP address.
198200
- name: IP
199201
value: ""
@@ -202,6 +204,18 @@ spec:
202204
resources:
203205
requests:
204206
cpu: 250m
207+
livenessProbe:
208+
httpGet:
209+
path: /liveness
210+
port: 9099
211+
periodSeconds: 10
212+
initialDelaySeconds: 10
213+
failureThreshold: 6
214+
readinessProbe:
215+
httpGet:
216+
path: /readiness
217+
port: 9099
218+
periodSeconds: 10
205219
volumeMounts:
206220
- mountPath: /lib/modules
207221
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ spec:
105105
# Enable IP-in-IP within Felix.
106106
- name: FELIX_IPINIPENABLED
107107
value: "true"
108+
- name: FELIX_HEALTHENABLED
109+
value: "true"
108110
# Set based on the k8s node name.
109111
- name: NODENAME
110112
valueFrom:
@@ -118,6 +120,18 @@ spec:
118120
resources:
119121
requests:
120122
cpu: 250m
123+
livenessProbe:
124+
httpGet:
125+
path: /liveness
126+
port: 9099
127+
periodSeconds: 10
128+
initialDelaySeconds: 10
129+
failureThreshold: 6
130+
readinessProbe:
131+
httpGet:
132+
path: /readiness
133+
port: 9099
134+
periodSeconds: 10
121135
volumeMounts:
122136
- mountPath: /lib/modules
123137
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ spec:
115115
# Enable IP-in-IP within Felix.
116116
- name: FELIX_IPINIPENABLED
117117
value: "true"
118+
- name: FELIX_HEALTHENABLED
119+
value: "true"
118120
# Set based on the k8s node name.
119121
- name: NODENAME
120122
valueFrom:
@@ -128,6 +130,18 @@ spec:
128130
resources:
129131
requests:
130132
cpu: 250m
133+
livenessProbe:
134+
httpGet:
135+
path: /liveness
136+
port: 9099
137+
periodSeconds: 10
138+
initialDelaySeconds: 10
139+
failureThreshold: 6
140+
readinessProbe:
141+
httpGet:
142+
path: /readiness
143+
port: 9099
144+
periodSeconds: 10
131145
volumeMounts:
132146
- mountPath: /lib/modules
133147
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.5/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ spec:
102102
# Enable IPIP
103103
- name: CALICO_IPV4POOL_IPIP
104104
value: "always"
105+
- name: FELIX_HEALTHENABLED
106+
value: "true"
105107
# Set based on the k8s node name.
106108
- name: NODENAME
107109
valueFrom:
@@ -115,6 +117,18 @@ spec:
115117
resources:
116118
requests:
117119
cpu: 250m
120+
livenessProbe:
121+
httpGet:
122+
path: /liveness
123+
port: 9099
124+
periodSeconds: 10
125+
initialDelaySeconds: 10
126+
failureThreshold: 6
127+
readinessProbe:
128+
httpGet:
129+
path: /readiness
130+
port: 9099
131+
periodSeconds: 10
118132
volumeMounts:
119133
- mountPath: /lib/modules
120134
name: lib-modules

v2.4/getting-started/kubernetes/installation/hosted/kubernetes-datastore/policy-only/1.6/calico.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ spec:
112112
# Enable IPIP
113113
- name: CALICO_IPV4POOL_IPIP
114114
value: "always"
115+
- name: FELIX_HEALTHENABLED
116+
value: "true"
115117
# Set based on the k8s node name.
116118
- name: NODENAME
117119
valueFrom:
@@ -125,6 +127,18 @@ spec:
125127
resources:
126128
requests:
127129
cpu: 250m
130+
livenessProbe:
131+
httpGet:
132+
path: /liveness
133+
port: 9099
134+
periodSeconds: 10
135+
initialDelaySeconds: 10
136+
failureThreshold: 6
137+
readinessProbe:
138+
httpGet:
139+
path: /readiness
140+
port: 9099
141+
periodSeconds: 10
128142
volumeMounts:
129143
- mountPath: /lib/modules
130144
name: lib-modules

0 commit comments

Comments
 (0)