Skip to content
Snippets Groups Projects
Commit fb9103ac authored by Aleksey Kasatkin's avatar Aleksey Kasatkin Committed by Kubernetes Prow Robot
Browse files

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.
parent 49d921cf
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,6 @@ spec: ...@@ -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: ...@@ -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
--- ---
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment