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

[Backport release-1.29] Install packages before airgapping #4629

Merged
merged 1 commit into from
Jun 14, 2024

Conversation

k0s-bot
Copy link

@k0s-bot k0s-bot commented Jun 14, 2024

Automated backport to release-1.29, triggered by a label in #4628.
See .

Installing ip6tables after disrupting IPv4 traffic will fail utterly if
the machine uses IPv4 for package installations. Install both packages
in lockstep before actually disrupting any traffic.

Fixes: e6bb827 ("Whitelist local IPv6 CIDRs when airgapping nodes")
Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit cab0882)
(cherry picked from commit e4fc69a)
@k0s-bot k0s-bot requested a review from a team as a code owner June 14, 2024 09:54
@k0s-bot k0s-bot requested review from ncopa and makhov June 14, 2024 09:54
@twz123 twz123 changed the title [Backport release-1.29] [Backport release-1.30] Install packages before airgapping [Backport release-1.29] Install packages before airgapping Jun 14, 2024
@twz123 twz123 added bug Something isn't working area/smoke-tests backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Jun 14, 2024
@twz123 twz123 enabled auto-merge June 14, 2024 11:56
@twz123 twz123 merged commit 82bb86d into release-1.29 Jun 14, 2024
78 checks passed
@twz123 twz123 deleted the backport-4628-to-release-1.29 branch June 14, 2024 12:02
@k0s-bot
Copy link
Author

k0s-bot commented Jun 14, 2024

Backport failed for release-1.28, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.28
git worktree add -d .worktree/backport-4629-to-release-1.28 origin/release-1.28
cd .worktree/backport-4629-to-release-1.28
git switch --create backport-4629-to-release-1.28
git cherry-pick -x 7330b173d5577a4e9f0f5f927e2f85eead058df9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/smoke-tests backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants