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

Whitelist local IPv6 CIDRs when airgapping nodes #4609

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jun 12, 2024

Description

This does the same to IPv6 that's done for IPv4. Allows the airgap test to function if the SSH connection runs via IPv6. Also: check if ip6table_filter is already loaded before trying to modprobe it. This allows the integration test to work without sudo/doas when the module is already loaded.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

This does the same to IPv6 that's done for IPv4. Allows the airgap
test to function if the SSH connection runs via IPv6. Also: check if
ip6table_filter is already loaded before trying to modprobe it. This
allows the integration test to work without sudo/doas when the module is
already loaded.

Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 added chore area/smoke-tests backport/release-1.30 PR that needs to be backported/cherrypicked to the release-1.30 branch labels Jun 12, 2024
@twz123
Copy link
Member Author

twz123 commented Jun 12, 2024

Apparently something changed on the GitHubGitHub Runner Image between 20240603.1.0 and 20240609.1.0 which makes the airgap tests fail? This seems to fix it... 🤔

@twz123 twz123 marked this pull request as ready for review June 12, 2024 16:17
@twz123 twz123 requested a review from a team as a code owner June 12, 2024 16:17
@twz123 twz123 requested review from ncopa and jnummelin June 12, 2024 16:17
@twz123 twz123 enabled auto-merge June 12, 2024 16:17
@twz123 twz123 merged commit 130ca7f into k0sproject:main Jun 13, 2024
82 checks passed
@twz123 twz123 deleted the airgap-ipv6 branch June 13, 2024 07:42
@k0s-bot
Copy link

k0s-bot commented Jun 13, 2024

Successfully created backport PR for release-1.30:

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.30 PR that needs to be backported/cherrypicked to the release-1.30 branch chore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants