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

match kubernetes-sigs/iptables-wrappers logic #2106

Merged
merged 2 commits into from
Jun 4, 2021
Merged

match kubernetes-sigs/iptables-wrappers logic #2106

merged 2 commits into from
Jun 4, 2021

Conversation

BenTheElder
Copy link
Member

see discussion: kubernetes-sigs/kind#2289

What type of PR is this?

/kind bug

What this PR does / why we need it:

Uses the more ideal iptables legacy/nft selection logic to match https://github.com/kubernetes-sigs/iptables-wrappers/

Which issue(s) this PR fixes:

Special notes for your reviewer:

See discussion in kubernetes-sigs/kind#2289

Does this PR introduce a user-facing change?

debian-iptables: select nft mode if ntf lines > legacy lines, matching https://github.com/kubernetes-sigs/iptables-wrappers/

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 3, 2021
@k8s-ci-robot k8s-ci-robot added needs-priority approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 3, 2021
@BenTheElder
Copy link
Member Author

I'm not sure how these are managed now, I'm guessing I should probably change the debian-iptables image version in variants.yaml, but I'm not positive or what to. My guess would be 1.6.2 but I don't see anything covering it.

@saschagrunert
Copy link
Member

I'm not sure how these are managed now, I'm guessing I should probably change the debian-iptables image version in variants.yaml, but I'm not positive or what to. My guess would be 1.6.2 but I don't see anything covering it.

Yes, I think bumping to 1.6.2 should be fine. 👍

@BenTheElder
Copy link
Member Author

done, I think?

@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 4, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 4, 2021
@saschagrunert
Copy link
Member

done, I think?

Thanks! Do you wanna do the image promotion and k/k bump or are you fine if a release manager does it?

@k8s-ci-robot k8s-ci-robot merged commit dc3ed2f into kubernetes:master Jun 4, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jun 4, 2021
@BenTheElder BenTheElder deleted the iptables-detection-logic branch June 4, 2021 07:59
BenTheElder added a commit to BenTheElder/kubernetes that referenced this pull request Jun 4, 2021
@BenTheElder
Copy link
Member Author

I went ahead and filed those 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants