-
Notifications
You must be signed in to change notification settings - Fork 3k
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
feature: Flag to change size of egress gateway policy map #23019
Conversation
e02a754
to
3624a60
Compare
This comment was marked as resolved.
This comment was marked as resolved.
71ec94d
to
2c493ce
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Overall looks good to me, although I'm not familiar enough with Egress Gateway to tell if there might be some specific things to consider before allowing to change the number of entries, I'll defer to other reviewers for that.
Would be great to have a bit of context/motivation for the change. Did you hit the current limit?
Some minor items to fix up:
- Please fix the reports from the Go linter (I think it says some imports are not in the correct block, you can maybe fix that with
make gofmt
). - Please update the documentation with
make -C Documentation update-cmdref
(this is what the Travis build complains about). - Please consider using your real name in the
Signed-off-by
tag for the commit. - Please fix the issue reported inline below.
@cyclinder are you willing to split this PR up a bit into multiple commits, ones which involve the flag addition and ones which involve plumbing it thru, updating business logic. |
2c493ce
to
6eeff8a
Compare
Thanks!
Refer to #22805, The author mentions that he hit the maximum limit in their environment, 954 pods * 65 CIDR blocks * 1 egress gateway = 62010 entries ? |
This comment was marked as resolved.
This comment was marked as resolved.
Hi @qmonnet , failed to run |
I'm not sure why you get this error, I can't reproduce on my side. Have you tried rebasing on the current |
Can't reproduce on master. To debug this, one can execute
in the broken environment |
Still fail after Output
and I remove Output
|
Sorry, I don't understand what's happening in your case. I note the double slashes in the filenames returned by the command
But even these should not prevent the script from finding the correct information in the files. It seems that we're not getting all expected file names from that part:
But I don't know why. Out of curiosity, what does Anyway, I don't think this issue matters much for your PR. Until we figure this out, I'd recommand simply skipping this check, you could for example edit the diff --git a/Makefile b/Makefile
index ce3f26220403..c3b2d62805d6 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ define generate_k8s_protobuf
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
endef
-build: check-sources $(SUBDIRS) ## Builds all the components for Cilium by executing make in the respective sub directories.
+build: $(SUBDIRS) ## Builds all the components for Cilium by executing make in the respective sub directories.
build-container: check-sources ## Builds components required for cilium-agent container.
for i in $(SUBDIRS_CILIUM_CONTAINER); do $(MAKE) $(SUBMAKEOPTS) -C $$i all; done |
e689e80
to
491c7c1
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your PR!
Overall LGTM, minus the issues already pointed out by other reviewers.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for tackling this!
I did a first pass and the PR looks generally good, only a couple of minor things to address.
Also we should export this new option in the Helm charts:
- first a new value should be defined:
cilium/install/kubernetes/cilium/values.yaml
Lines 1458 to 1462 in dc70484
egressGateway: enabled: false # -- Install egress gateway IP rules and routes in order to properly steer # egress gateway traffic to the correct ENI interface installRoutes: false - which can then be used in the configmap:
cilium/install/kubernetes/cilium/templates/cilium-configmap.yaml
Lines 828 to 833 in dc70484
{{- if .Values.egressGateway.enabled }} enable-ipv4-egress-gateway: "true" {{- end }} {{- if .Values.egressGateway.installRoutes }} install-egress-gateway-routes: "true" {{- end }}
Thanks, I following your way. but it still fail on my mac.
output:
I try run it on liunx-amd64, See if the results are different. |
491c7c1
to
84f6cbc
Compare
OK, let me know how |
thanks! sad, it's still failing...
I don't want to spend any more time on this 😅, is there a way to replace this command? |
@cyclinder I sorted a bunch of nits and run the command to update docs, can you cherry pick this commit and the squash it with your initial commit? d45ec97 |
0136521
to
dcca9cd
Compare
Many thanks! @jibi I have already cp d45ec97 to my initial commit. Waiting for the results of the ci test. |
dcca9cd
to
475209b
Compare
(and please squash the merge commit 🙏) |
Signed-off-by: qifeng guo <qifeng.guo@daocloud.io> Signed-off-by: cyclinder <qifeng.guo@daocloud.io>
74d0b98
to
02c4f67
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to spend any more time on this sweat_smile, is there a way to replace this command?
Sorry to hear it's still not working, and apologies for the bad experience. Thanks a lot for trying anyway (and thank you Gilberto for helping!).
Looks good to me now!
Travis failure is related to #23314.
/test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, thanks! 🚀
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test failures / flakes are not related with these changes.
Signed-off-by: cyclinder qifeng.guo@daocloud.io
Flag to change size of egress gateway policy map
Fixes:
#issue-22929
#issue-22805
Fixes #22929
Fixes #22805