Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Make the ipset list size bigger #3305

Merged
merged 3 commits into from
Jun 11, 2018
Merged

Make the ipset list size bigger #3305

merged 3 commits into from
Jun 11, 2018

Conversation

bboreham
Copy link
Contributor

Should fix #3289, although as mentioned there I couldn't get it to break on a 4.13 kernel.

I didn't try 3.10.

@bboreham bboreham added this to the 2.3.1 milestone May 25, 2018
@brb
Copy link
Contributor

brb commented Jun 11, 2018

The smoke tests fail due to (from the build https://circleci.com/gh/weaveworks/weave/10274):

INFO: 2018/06/04 09:48:48.877191 creating ipset: &npc.selectorSpec{key:"", selector:labels.internalSelector{}, dst:false, ipsetType:"list:set", ipsetName:"weave-!KbcPP7#:Z;q|kV;:5)S@i1Yb", nsName:""}
FATA: 2018/06/04 09:48:48.877959 add network policy: ipset [create weave-!KbcPP7#:Z;q|kV;:5)S@i1Yb list:set size 1024 comment] failed: ipset v6.32: Unknown argument: `size 1024'
Try `ipset help' for more information.

Strangely, with ipset v.6.32 on the 4.16.13 kernel ipset create 'weave-!KbcPP7#:Z;q|kV;:5)S@i1Yb' list:set size 1024 comment works.

@@ -71,6 +74,9 @@ func New(logger *log.Logger) Interface {

func (i *ipset) Create(ipsetName Name, ipsetType Type) error {
args := []string{"create", string(ipsetName), string(ipsetType)}
if ipsetType == ListSet && i.maxListSize > 0 {
args = append(args, fmt.Sprintf("size %d", i.maxListSize))

This comment was marked as abuse.

@brb brb merged commit c19c64a into 2.3 Jun 11, 2018
@bboreham bboreham deleted the issues/3289-many-namespaces branch June 21, 2018 09:28
@brb brb modified the milestones: 2.3.1, 2.4 Jul 24, 2018
hswong3i added a commit to alvistack/kubernetes-sigs-kubespray that referenced this pull request Aug 7, 2018
Upstream Changes:

-   weave 2.4.0 (https://github.com/weaveworks/weave/releases/tag/v2.4.0)
-   Support `externalTrafficPolicy: Local` (weaveworks/weave#2924)
-   Make the ipset list size bigger (weaveworks/weave#3305)
-   Break out of kube rm-peers loop if nothing changes (weaveworks/weave#3317)

Our Changes:

-   Revamp weave-net.yml.j2 with upstream changes
-   Add more variables for customization
-   Replace WEAVE_PASSWORD with k8s secret
-   Remove hard-corded seed mode support, in favor of variables customization
rguichard pushed a commit to rguichard/kubespray that referenced this pull request Oct 5, 2018
Upstream Changes:

-   weave 2.4.0 (https://github.com/weaveworks/weave/releases/tag/v2.4.0)
-   Support `externalTrafficPolicy: Local` (weaveworks/weave#2924)
-   Make the ipset list size bigger (weaveworks/weave#3305)
-   Break out of kube rm-peers loop if nothing changes (weaveworks/weave#3317)

Our Changes:

-   Revamp weave-net.yml.j2 with upstream changes
-   Add more variables for customization
-   Replace WEAVE_PASSWORD with k8s secret
-   Remove hard-corded seed mode support, in favor of variables customization
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants