Browse Source

Update calico-typha deployment to address v3.7.x changes (#5003)

* Update calico-typha deployment to address v3.7.x changes

So that calico-typha works for Calico v3.7.x.

* Apply changes for v3.7.x only.
pull/5010/head
Aleksey Kasatkin 5 years ago
committed by Kubernetes Prow Robot
parent
commit
fb9103acd3
1 changed files with 14 additions and 1 deletions
  1. 15
      roles/network_plugin/calico/templates/calico-typha.yml.j2

15
roles/network_plugin/calico/templates/calico-typha.yml.j2

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

Loading…
Cancel
Save