diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2 index d493ff657..c7402dace 100644 --- a/roles/network_plugin/calico/templates/calico-typha.yml.j2 +++ b/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 ---