Skip to content

Commit 8486ed0

Browse files
authored
Merge pull request #20390 from minikube-bot/auto_bump_calico_version
CNI: Update calico from v3.29.1 to v3.29.2
2 parents 013336f + 1f24ff7 commit 8486ed0

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

Diff for: pkg/minikube/bootstrapper/images/images.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func KindNet(repo string) string {
183183
}
184184

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

189189
// CalicoDaemonSet returns the image used for calicoDaemonSet

Diff for: pkg/minikube/cni/calico.yaml

+17-4
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,14 @@ spec:
192192
a valid secret key.
193193
type: string
194194
name:
195-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
196-
TODO: Add other useful fields. apiVersion, kind, uid?'
195+
default: ""
196+
description: 'Name of the referent. This field is effectively
197+
required, but due to backwards compatibility is allowed
198+
to be empty. Instances of this type with an empty value
199+
here are almost certainly wrong. TODO: Add other useful
200+
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
201+
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
202+
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
197203
type: string
198204
optional:
199205
description: Specify whether the Secret or its key must be
@@ -542,8 +548,14 @@ spec:
542548
a valid secret key.
543549
type: string
544550
name:
545-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
546-
TODO: Add other useful fields. apiVersion, kind, uid?'
551+
default: ""
552+
description: 'Name of the referent. This field is effectively
553+
required, but due to backwards compatibility is allowed
554+
to be empty. Instances of this type with an empty value
555+
here are almost certainly wrong. TODO: Add other useful
556+
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
557+
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
558+
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
547559
type: string
548560
optional:
549561
description: Specify whether the Secret or its key must be
@@ -5802,6 +5814,7 @@ rules:
58025814
verbs:
58035815
# read its own config
58045816
- get
5817+
- list
58055818
# create a default if none exists
58065819
- create
58075820
# update status

0 commit comments

Comments
 (0)