Skip to content

Commit 193b1af

Browse files
committed
Merge branch 'improvement/bump-calico-3.29.3' into q/130.0
2 parents 3494f54 + 4b470b4 commit 193b1af

File tree

3 files changed

+34
-8
lines changed

3 files changed

+34
-8
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
and `metalk8s-keepalived` image to `alpine:3.21.3`
2626
(PR[#4570](https://github.com/scality/metalk8s/pull/4570))
2727

28+
- Bump Calico version to [3.29.3](https://github.com/projectcalico/calico/releases/tag/v3.29.3)
29+
(PR[#4571](https://github.com/scality/metalk8s/pull/4571))
30+
2831
## Release 129.0.1 (in development)
2932

3033
### Enhancements

buildchain/buildchain/versions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
K8S_SHORT_VERSION: str = f"{K8S_VERSION_MAJOR}.{K8S_VERSION_MINOR}"
2626
K8S_VERSION: str = f"{K8S_SHORT_VERSION}.{K8S_VERSION_PATCH}"
2727

28-
CALICO_VERSION: str = "3.29.0"
28+
CALICO_VERSION: str = "3.29.3"
2929
SALT_VERSION: str = "3002.9"
3030
CONTAINERD_VERSION: str = "1.6.36"
3131

@@ -116,17 +116,17 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
116116
Image(
117117
name="calico-cni",
118118
version=_version_prefix(CALICO_VERSION),
119-
digest="sha256:eefb9e0007509d0c00fcf254ae35d64f22a2f66215910c05f61e6df0725150e5",
119+
digest="sha256:53f826d3f565a6635b4d58ea4fcfdc0e7ea418ffd4dbb495b4c801074e6eb99c",
120120
),
121121
Image(
122122
name="calico-node",
123123
version=_version_prefix(CALICO_VERSION),
124-
digest="sha256:f4d8adf6b1a23f9a51099d3fcc1560c254511b15fd660a41e2e55c358fbd5e71",
124+
digest="sha256:eed399f2a727cfc1f374ab5c9cda6123c207e794ed8dc66c7eb6d8db412669e1",
125125
),
126126
Image(
127127
name="calico-kube-controllers",
128128
version=_version_prefix(CALICO_VERSION),
129-
digest="sha256:ba3ef20f30caa855ddf00e767af973685832546582e7fa457dac14c64d3156d0",
129+
digest="sha256:5516ab776c38525fcc985a3030b4f2fd472da68b4170601c23bf6887bfdce703",
130130
),
131131
Image(
132132
name="coredns",

salt/metalk8s/kubernetes/cni/calico/deployed.sls

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,14 @@ spec:
213213
a valid secret key.
214214
type: string
215215
name:
216-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
217-
TODO: Add other useful fields. apiVersion, kind, uid?'
216+
default: ""
217+
description: 'Name of the referent. This field is effectively
218+
required, but due to backwards compatibility is allowed
219+
to be empty. Instances of this type with an empty value
220+
here are almost certainly wrong. TODO: Add other useful
221+
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
222+
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
223+
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
218224
type: string
219225
optional:
220226
description: Specify whether the Secret or its key must be
@@ -563,8 +569,14 @@ spec:
563569
a valid secret key.
564570
type: string
565571
name:
566-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
567-
TODO: Add other useful fields. apiVersion, kind, uid?'
572+
default: ""
573+
description: 'Name of the referent. This field is effectively
574+
required, but due to backwards compatibility is allowed
575+
to be empty. Instances of this type with an empty value
576+
here are almost certainly wrong. TODO: Add other useful
577+
fields. apiVersion, kind, uid? More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
578+
TODO: Drop `kubebuilder:default` when controller-gen doesn''t
579+
need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.'
568580
type: string
569581
optional:
570582
description: Specify whether the Secret or its key must be
@@ -1960,6 +1972,10 @@ spec:
19601972
description: 'WireguardRoutingRulePriority controls the priority value
19611973
to use for the Wireguard routing rule. [Default: 99]'
19621974
type: integer
1975+
wireguardThreadingEnabled:
1976+
description: 'WireguardThreadingEnabled controls whether Wireguard
1977+
has NAPI threading enabled. [Default: false]'
1978+
type: boolean
19631979
workloadSourceSpoofing:
19641980
description: WorkloadSourceSpoofing controls whether pods can use
19651981
the allowedSourcePrefixes annotation to send traffic with a source
@@ -5819,6 +5835,7 @@ rules:
58195835
verbs:
58205836
# read its own config
58215837
- get
5838+
- list
58225839
# create a default if none exists
58235840
- create
58245841
# update status
@@ -5936,6 +5953,12 @@ rules:
59365953
- get
59375954
- list
59385955
- watch
5956+
# Calico creates some tiers on startup.
5957+
- apiGroups: ["crd.projectcalico.org"]
5958+
resources:
5959+
- tiers
5960+
verbs:
5961+
- create
59395962
# Calico must create and update some CRDs on startup.
59405963
- apiGroups: ["crd.projectcalico.org"]
59415964
resources:

0 commit comments

Comments
 (0)