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

Update Canal/Calico to v3.23.5 #2538

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Update Canal/Calico to v3.23.5 #2538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions addons/cni-canal/canal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,11 @@ spec:
node appears to use the IP of the ingress node; this requires a
permissive L2 network. [Default: Tunnel]'
type: string
bpfHostConntrackBypass:
description: 'BPFHostConntrackBypass Controls whether to bypass Linux
conntrack in BPF mode for workloads and services. [Default: true
- bypass Linux conntrack]'
type: boolean
bpfKubeProxyEndpointSlicesEnabled:
description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
whether Felix's embedded kube-proxy accepts EndpointSlices or not.
Expand Down Expand Up @@ -1081,7 +1086,6 @@ spec:
are auto-detected.
type: string
floatingIPs:
default: Disabled
description: FloatingIPs configures whether or not Felix will program
floating IP addresses.
enum:
Expand Down Expand Up @@ -1404,8 +1408,8 @@ spec:
type: boolean
vxlanEnabled:
description: 'VXLANEnabled overrides whether Felix should create the
VXLAN tunnel device for VXLAN networking. Optional as Felix determines
this based on the existing IP pools. [Default: nil (unset)]'
VXLAN tunnel device for IPv4 VXLAN networking. Optional as Felix
determines this based on the existing IP pools. [Default: nil (unset)]'
type: boolean
vxlanMTU:
description: 'VXLANMTU is the MTU to set on the IPv4 VXLAN tunnel
Expand Down Expand Up @@ -4166,7 +4170,7 @@ rules:
resources:
- endpointslices
verbs:
- watch
- watch
- list
- apiGroups: [""]
resources:
Expand Down
6 changes: 3 additions & 3 deletions pkg/templates/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ func FindResource(name string) (Resource, error) {

func baseResources() map[Resource]map[string]string {
return map[Resource]map[string]string{
CalicoCNI: {"*": "quay.io/calico/cni:v3.23.3"},
CalicoController: {"*": "quay.io/calico/kube-controllers:v3.23.3"},
CalicoNode: {"*": "quay.io/calico/node:v3.23.3"},
CalicoCNI: {"*": "quay.io/calico/cni:v3.23.5"},
CalicoController: {"*": "quay.io/calico/kube-controllers:v3.23.5"},
CalicoNode: {"*": "quay.io/calico/node:v3.23.5"},
DNSNodeCache: {"*": "registry.k8s.io/dns/k8s-dns-node-cache:1.22.13"},
Flannel: {"*": "quay.io/coreos/flannel:v0.15.1"},
MachineController: {"*": "quay.io/kubermatic/machine-controller:v1.55.0"},
Expand Down