|
@ -60,7 +60,6 @@ spec: |
|
|
# as a host-networked pod. |
|
|
# as a host-networked pod. |
|
|
serviceAccountName: calico-node |
|
|
serviceAccountName: calico-node |
|
|
containers: |
|
|
containers: |
|
|
# - image: calico/typha:v3.4.4 |
|
|
|
|
|
- image: {{ calico_typha_image_repo }}:{{ calico_typha_image_tag }} |
|
|
- image: {{ calico_typha_image_repo }}:{{ calico_typha_image_tag }} |
|
|
name: calico-typha |
|
|
name: calico-typha |
|
|
ports: |
|
|
ports: |
|
@ -97,19 +96,33 @@ spec: |
|
|
# - name: USE_POD_CIDR |
|
|
# - name: USE_POD_CIDR |
|
|
# value: "true" |
|
|
# value: "true" |
|
|
livenessProbe: |
|
|
livenessProbe: |
|
|
|
|
|
{% if calico_version is version('v3.7.0', '<') %} |
|
|
exec: |
|
|
exec: |
|
|
command: |
|
|
command: |
|
|
- calico-typha |
|
|
- calico-typha |
|
|
- check |
|
|
- check |
|
|
- liveness |
|
|
- liveness |
|
|
|
|
|
{% else %} |
|
|
|
|
|
httpGet: |
|
|
|
|
|
path: /liveness |
|
|
|
|
|
port: 9098 |
|
|
|
|
|
host: localhost |
|
|
|
|
|
{% endif %} |
|
|
periodSeconds: 30 |
|
|
periodSeconds: 30 |
|
|
initialDelaySeconds: 30 |
|
|
initialDelaySeconds: 30 |
|
|
readinessProbe: |
|
|
readinessProbe: |
|
|
|
|
|
{% if calico_version is version('v3.7.0', '<') %} |
|
|
exec: |
|
|
exec: |
|
|
command: |
|
|
command: |
|
|
- calico-typha |
|
|
- calico-typha |
|
|
- check |
|
|
- check |
|
|
- readiness |
|
|
- readiness |
|
|
|
|
|
{% else %} |
|
|
|
|
|
httpGet: |
|
|
|
|
|
path: /readiness |
|
|
|
|
|
port: 9098 |
|
|
|
|
|
host: localhost |
|
|
|
|
|
{% endif %} |
|
|
periodSeconds: 10 |
|
|
periodSeconds: 10 |
|
|
|
|
|
|
|
|
--- |
|
|
--- |
|
|