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.

Sign up for GitHub

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

Jump to bottom

Update Node Dockerfile to install ipset 7.11 #5485

Merged
merged 2 commits into from
Jan 25, 2022
Merged

Update Node Dockerfile to install ipset 7.11 #5485

merged 2 commits into from
Jan 25, 2022

Conversation

song-jiang
Copy link
Member

@song-jiang song-jiang commented Jan 21, 2022 •
edited by mgleung
Loading

Description

This PR fixes #5011 by bumping up ipset package from version 7.1 to version 7.11

Since we haven't got a ubi:9 image to install ipset 7.11 from the official repo, the workaround is to download the source rpm with all the dependencies and get it built from ubi:8.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

Update the ipset package from 7.1 to 7.11

@song-jiang song-jiang requested a review from a team as a code owner January 21, 2022 11:27
@marvin-tigera marvin-tigera added this to the Calico v3.23.0 milestone Jan 21, 2022
@marvin-tigera marvin-tigera added docs-pr-required Change is not yet documented release-note-required Change has user-facing impact (no matter how small) labels Jan 21, 2022
@song-jiang song-jiang changed the title Update Node Dockerfile to install latest ipset Update Node Dockerfile to install ipset 7.11 Jan 21, 2022
@song-jiang
Copy link
Member Author

song-jiang commented Jan 21, 2022 •
edited
Loading

CI passed with Kubernetes version 1.22.1

Ensuring node image (kindest/node:v1.22.1) 🖼 �[?7h�[?7l

Maybe I should bump the version to 1.23.0 so that we know it fixed the issue? @caseydavenport

@caseydavenport
Copy link
Member

@song-jiang

Maybe I should bump the version to 1.23.0 so that we know it fixed the issue?

Do we run with IPVS? I thought we used iptables proxy in here, so might not show us anything.

@caseydavenport caseydavenport added docs-not-required Docs not required for this change and removed docs-pr-required Change is not yet documented labels Jan 21, 2022
caseydavenport
caseydavenport reviewed Jan 21, 2022
View reviewed changes
node/Dockerfile.amd64
@@ -15,6 +15,7 @@ ARG ARCH=x86_64
ARG GIT_VERSION=unknown
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this impact non-amd64 architectures as well? I suspect so.

May still be worth merging this increment without those, since it's strictly better to have one functioning architecture than none 😁

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, agree.

@song-jiang
Copy link
Member Author

Do we run with IPVS? I thought we used iptables proxy in here, so might not show us anything.

@caseydavenport Yes. We do run IPVS https://github.com/projectcalico/calico/blob/master/node/tests/kind-config.yaml#L25

@caseydavenport
Copy link
Member

Oh, fun! Let's try bumping the version then...

@caseydavenport caseydavenport mentioned this pull request Jan 21, 2022
Merged
lmm
lmm approved these changes Jan 24, 2022
View reviewed changes
Copy link
Contributor

@lmm lmm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

metadata.mk Show resolved Hide resolved
@song-jiang song-jiang merged commit 7f1d9b7 into projectcalico:master Jan 25, 2022
@Dr-Shadow Dr-Shadow mentioned this pull request Feb 2, 2022
Closed
song-jiang added a commit to song-jiang/calico that referenced this pull request Feb 2, 2022
@song-jiang
Merge pull request projectcalico#5485 from song-jiang/song-ipset
81baa24 
Update Node Dockerfile to install ipset 7.11

(cherry picked from commit 7f1d9b7)
song-jiang added a commit that referenced this pull request Feb 2, 2022
@song-jiang
Merge pull request #5561 from song-jiang/song-pick-v3.22
33cbaf8 
Merge pull request #5485 from song-jiang/song-ipset
@caseydavenport caseydavenport added cherry-pick-completed PR has been cherry-picked and removed cherry-pick-candidate labels Mar 1, 2022
@xmudrii xmudrii mentioned this pull request Mar 9, 2022
Closed
This was referenced Jun 23, 2022
Merged
Merged
Merged
zexi added a commit to yunionio/container-images that referenced this pull request Dec 19, 2023
@zexi
calico-node: backport ipset to v3.12.1
f97cb5a 
FROM following references:

- Incompatible ipset protocol version (7) will cause problems
  - projectcalico/calico#5011
- Update Node Dockerfile to install ipset 7.11
  - projectcalico/calico#5485
- update ipset for arm64
  - projectcalico/calico#6262
zexi added a commit to yunionio/container-images that referenced this pull request Dec 19, 2023
@zexi
calico-node: backport ipset to v3.12.1
46a2bfa 
FROM following references:

- [Incompatible ipset protocol version (7) will cause problems](projectcalico/calico#5011)
- [Update Node Dockerfile to install ipset 7.11](projectcalico/calico#5485)
- [update ipset for arm64](projectcalico/calico#6262)
@zexi zexi mentioned this pull request Dec 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caseydavenport caseydavenport caseydavenport left review comments

@lmm lmm lmm approved these changes

Assignees
No one assigned
Labels
cherry-pick-completed PR has been cherry-picked docs-not-required Docs not required for this change release-note-required Change has user-facing impact (no matter how small)
Projects
None yet
Milestone
Calico v3.23.0
Development

Successfully merging this pull request may close these issues.

Incompatible ipset protocol version (7) will cause problems
4 participants
@song-jiang @caseydavenport @lmm @marvin-tigera