Skip to content

Commit 28fa66c

Browse files
Merge pull request #4981 from canonical/lpetrut/bump-versions
2 parents a47d34d + b7dce6e commit 28fa66c

File tree

9 files changed

+1418
-102
lines changed

9 files changed

+1418
-102
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
# Match https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml#L20
4-
echo "v1.6.0"
4+
echo "v1.6.2"
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.6.36"
3+
echo "v1.7.27"

build-scripts/components/helm/patches/default/0001-disable-warnings-for-kubeconfig-permissions.patch

-24
This file was deleted.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v3.16.3"
3+
echo "v3.17.2"
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From bcf130f097781d162c0461105a12f4c9f412d3e8 Mon Sep 17 00:00:00 2001
2-
From: Angelos Kolaitis <angelos.kolaitis@canonical.com>
3-
Date: Tue, 20 Feb 2024 12:32:27 +0200
1+
From 7b7171f0f5048225e0d914cbffd47295af1fbfc5 Mon Sep 17 00:00:00 2001
2+
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
3+
Date: Fri, 28 Mar 2025 13:14:34 +0000
44
Subject: [PATCH] Disable static PIE on arm64
55

66
Ubuntu does not currently have the rcrt1.o file on arm64
@@ -9,17 +9,18 @@ Ubuntu does not currently have the rcrt1.o file on arm64
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/Makefile b/Makefile
12-
index e3af9bc1..b2b07720 100644
12+
index 0a15fd90..d7e6209a 100644
1313
--- a/Makefile
1414
+++ b/Makefile
15-
@@ -33,7 +33,7 @@ LDFLAGS_STATIC := -extldflags -static
15+
@@ -45,7 +45,7 @@ LDFLAGS_STATIC := -extldflags -static
1616
# Enable static PIE executables on supported platforms.
1717
# This (among the other things) requires libc support (rcrt1.o), which seems
1818
# to be available only for arm64 and amd64 (Debian Bullseye).
1919
-ifneq (,$(filter $(GOARCH),arm64 amd64))
2020
+ifneq (,$(filter $(GOARCH),amd64))
2121
ifeq (,$(findstring -race,$(EXTRA_FLAGS)))
2222
GO_BUILDMODE_STATIC := -buildmode=pie
23-
LDFLAGS_STATIC := -linkmode external -extldflags --static-pie
24-
--
25-
2.34.1
23+
LDFLAGS_STATIC := -linkmode external -extldflags -static-pie
24+
--
25+
2.43.0
26+
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.1.15"
3+
echo "v1.2.6"

build-scripts/images.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
docker.io/calico/cni:v3.28.1
2-
docker.io/calico/kube-controllers:v3.28.1
3-
docker.io/calico/node:v3.28.1
1+
docker.io/calico/cni:v3.29.3
2+
docker.io/calico/kube-controllers:v3.29.3
3+
docker.io/calico/node:v3.29.3
44
docker.io/cdkbot/hostpath-provisioner:1.5.0
55
docker.io/coredns/coredns:1.12.0
66
docker.io/library/busybox:1.28.4

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ deps =
2020
[testenv:lint]
2121
commands =
2222
flake8 --max-line-length=120 --ignore=C901,N801,N802,N803,N806,N816,W503,E203
23-
codespell --ignore-words-list="aks,ccompiler" --quiet-level=2 --skip="*.patch,*.spec,.tox_env,.git,*.nsi"
23+
codespell --ignore-words-list="aks,ccompiler,NotIn" --quiet-level=2 --skip="*.patch,*.spec,.tox_env,.git,*.nsi"
2424
black --diff --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
2525

2626
[testenv:scripts]

upgrade-scripts/000-switch-to-calico/resources/calico.yaml

+1,401-62
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)