Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Calico to v3.20.2 #12491

Merged
merged 2 commits into from
Oct 6, 2021
Merged

Update Calico to v3.20.2 #12491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
036c450
Update Calico to v3.20.2
hakman Oct 6, 2021
2d26833
Run hack/update-expected.sh
hakman Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rivatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.projectcalico.org/k8s-1.16.yaml
manifestHash: d1ad3c80da8db6eef91ecf85e21b880e4972f21ea9ee83d8e3b1aeeabb8d8b60
manifestHash: 428732ac1fb6297372b249afb3e4039f759ea5ba7c94dd4d73759a37eadc4972
name: networking.projectcalico.org
selector:
role.kubernetes.io/networking: "1"
Expand Down
10 changes: 5 additions & 5 deletions ...ket_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3887,7 +3887,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.20.1
image: docker.io/calico/node:v3.20.2
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -3955,7 +3955,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.20.1
image: docker.io/calico/cni:v3.20.2
name: upgrade-ipam
securityContext:
privileged: true
Expand Down Expand Up @@ -3989,7 +3989,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.20.1
image: docker.io/calico/cni:v3.20.2
name: install-cni
securityContext:
privileged: true
Expand All @@ -3998,7 +3998,7 @@ spec:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.20.1
- image: docker.io/calico/pod2daemon-flexvol:v3.20.2
name: flexvol-driver
securityContext:
privileged: true
Expand Down Expand Up @@ -4106,7 +4106,7 @@ spec:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.20.1
image: docker.io/calico/kube-controllers:v3.20.2
livenessProbe:
exec:
command:
Expand Down
12 changes: 6 additions & 6 deletions upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3787,7 +3787,7 @@ spec:
securityContext:
fsGroup: 65534
containers:
- image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.20.1" }}
- image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.20.2" }}
name: calico-typha
ports:
- containerPort: 5473
Expand Down Expand Up @@ -3908,7 +3908,7 @@ spec:
# It can be deleted if this is a fresh installation, or if you have already
# upgraded to use calico-ipam.
- name: upgrade-ipam
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.20.1" }}
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.20.2" }}
command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
envFrom:
- configMapRef:
Expand All @@ -3935,7 +3935,7 @@ spec:
# This container installs the CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.20.1" }}
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.20.2" }}
command: ["/opt/cni/bin/install"]
envFrom:
- configMapRef:
Expand Down Expand Up @@ -3976,7 +3976,7 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API.
- name: flexvol-driver
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/pod2daemon-flexvol:{{ or .Networking.Calico.Version "v3.20.1" }}
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/pod2daemon-flexvol:{{ or .Networking.Calico.Version "v3.20.2" }}
volumeMounts:
- name: flexvol-driver-host
mountPath: /host/driver
Expand All @@ -3987,7 +3987,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.20.1" }}
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.20.2" }}
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
Expand Down Expand Up @@ -4284,7 +4284,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: calico-kube-controllers
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.20.1" }}
image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.20.2" }}
env:
# Choose which controllers to run.
- name: ENABLED_CONTROLLERS
Expand Down