Skip to content

Commit

Permalink
Update calico to v3.16.2 (#1235)
Browse files Browse the repository at this point in the history
* Update calico to v3.16.1

* Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT override in Typha too

* Update to v3.16.2
  • Loading branch information
lwr20 authored Oct 9, 2020
1 parent 47f1bc4 commit 56851f0
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions config/master/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.15.1
image: quay.io/calico/node:v3.16.2
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
name: kubernetes-services-endpoint
optional: true
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down Expand Up @@ -114,6 +119,13 @@ spec:
- mountPath: /var/lib/calico
name: var-lib-calico
readOnly: false
# For eBPF mode, we need to be able to mount the BPF filesystem at /sys/fs/bpf so we mount in the
# parent directory.
- name: sysfs
mountPath: /sys/fs/
# Bidirectional means that, if we mount the BPF filesystem at /sys/fs/bpf it will propagate to the host.
# If the host is known to mount that filesystem already then Bidirectional can be omitted.
mountPropagation: Bidirectional
volumes:
# Used to ensure proper kmods are installed.
- name: lib-modules
Expand All @@ -129,6 +141,10 @@ spec:
hostPath:
path: /run/xtables.lock
type: FileOrCreate
- name: sysfs
hostPath:
path: /sys/fs/
type: DirectoryOrCreate
tolerations:
# Make sure calico/node gets scheduled on all nodes.
- effect: NoSchedule
Expand Down Expand Up @@ -549,12 +565,17 @@ spec:
securityContext:
fsGroup: 65534
containers:
- image: quay.io/calico/typha:v3.15.1
- image: quay.io/calico/typha:v3.16.2
name: calico-typha
ports:
- containerPort: 5473
name: calico-typha
protocol: TCP
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
name: kubernetes-services-endpoint
optional: true
env:
# Use eni not cali for interface prefix
- name: FELIX_INTERFACEPREFIX
Expand Down

0 comments on commit 56851f0

Please sign in to comment.