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.

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

Bump component versions #4981

Merged
merged 6 commits into from
Apr 3, 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 build-scripts/components/cni/version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

# Match https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml#L20
echo "v1.6.0"
echo "v1.6.2"
2 changes: 1 addition & 1 deletion build-scripts/components/containerd/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

echo "v1.6.36"
echo "v1.7.27"

This file was deleted.

2 changes: 1 addition & 1 deletion build-scripts/components/helm/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

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

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

diff --git a/Makefile b/Makefile
index e3af9bc1..b2b07720 100644
index 0a15fd90..d7e6209a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ LDFLAGS_STATIC := -extldflags -static
@@ -45,7 +45,7 @@ LDFLAGS_STATIC := -extldflags -static
# Enable static PIE executables on supported platforms.
# This (among the other things) requires libc support (rcrt1.o), which seems
# to be available only for arm64 and amd64 (Debian Bullseye).
-ifneq (,$(filter $(GOARCH),arm64 amd64))
+ifneq (,$(filter $(GOARCH),amd64))
ifeq (,$(findstring -race,$(EXTRA_FLAGS)))
GO_BUILDMODE_STATIC := -buildmode=pie
LDFLAGS_STATIC := -linkmode external -extldflags --static-pie
--
2.34.1
LDFLAGS_STATIC := -linkmode external -extldflags -static-pie
--
2.43.0

2 changes: 1 addition & 1 deletion build-scripts/components/runc/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

echo "v1.1.15"
echo "v1.2.6"
6 changes: 3 additions & 3 deletions build-scripts/images.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docker.io/calico/cni:v3.28.1
docker.io/calico/kube-controllers:v3.28.1
docker.io/calico/node:v3.28.1
docker.io/calico/cni:v3.29.3
docker.io/calico/kube-controllers:v3.29.3
docker.io/calico/node:v3.29.3
docker.io/cdkbot/hostpath-provisioner:1.5.0
docker.io/coredns/coredns:1.12.0
docker.io/library/busybox:1.28.4
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ deps =
[testenv:lint]
commands =
flake8 --max-line-length=120 --ignore=C901,N801,N802,N803,N806,N816,W503,E203
codespell --ignore-words-list="aks,ccompiler" --quiet-level=2 --skip="*.patch,*.spec,.tox_env,.git,*.nsi"
codespell --ignore-words-list="aks,ccompiler,NotIn" --quiet-level=2 --skip="*.patch,*.spec,.tox_env,.git,*.nsi"
black --diff --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .

[testenv:scripts]
Expand Down
1,463 changes: 1,401 additions & 62 deletions upgrade-scripts/000-switch-to-calico/resources/calico.yaml

Large diffs are not rendered by default.

Loading