Skip to content

CNI: Update calico from v3.29.1 to v3.29.2 #20390

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.

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 pkg/minikube/bootstrapper/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func KindNet(repo string) string {
}

// all calico images are from https://github.com/projectcalico/calico/blob/master/manifests/calico.yaml
const calicoVersion = "v3.29.1"
const calicoVersion = "v3.29.2"
const calicoRepo = "docker.io/calico"

// CalicoDaemonSet returns the image used for calicoDaemonSet
Expand Down
21 changes: 17 additions & 4 deletions pkg/minikube/cni/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,14 @@ spec:
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
default: ""
description: 'Name of the referent. This field is effectively
required, but due to backwards compatibility is allowed
to be empty. Instances of this type with an empty value
here are almost certainly wrong. TODO: Add other useful
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
type: string
optional:
description: Specify whether the Secret or its key must be
Expand Down Expand Up @@ -542,8 +548,14 @@ spec:
a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
default: ""
description: 'Name of the referent. This field is effectively
required, but due to backwards compatibility is allowed
to be empty. Instances of this type with an empty value
here are almost certainly wrong. TODO: Add other useful
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
type: string
optional:
description: Specify whether the Secret or its key must be
Expand Down Expand Up @@ -5802,6 +5814,7 @@ rules:
verbs:
# read its own config
- get
- list
# create a default if none exists
- create
# update status
Expand Down