Implement commands for listing per-cluster CT/SNAT maps #24629
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YutaroHayakawa
added
sig/datapath
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
1628142
to
1c7119f
Compare
|
/test |
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
3 times, most recently
from
cd2906e
to
b7ffc59
Compare
|
/test |
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
b7ffc59
to
4aef80e
Compare
|
/test |
nathanjsweet
requested changes
Apr 6, 2023
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
4aef80e
to
6b98f8f
Compare
|
Reflected on Nate's comment. And sorry, I added a commit that implements the missing flag string for |
|
Smoke test, Smoke Test with IPv6: #23812 |
|
/conformance-test |
|
/test |
|
/conformance-test-ipv6 |
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
6b98f8f
to
410fdc3
Compare
|
/test Job 'Cilium-PR-K8s-1.25-kernel-4.19' failed: Click to show.Test NameFailure OutputJenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.25-kernel-4.19/1680/ If it is a flake and a GitHub issue doesn't already exist to track it, comment |
nathanjsweet
approved these changes
Apr 7, 2023
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
410fdc3
to
009a73d
Compare
|
/test |
|
Cilium Datapath is broken by cilium-cli change (cilium/cilium-cli#1498) and now fixed by 0a984a7. I think we don't have to re-run datapath test as it is not related to this change. |
YutaroHayakawa
added
ready-to-merge
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Introduce a new method GetClusterCTMaps which gets all CT maps for specific cluster. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
dumpAndRead takes dump function and argument (args... interface{}) and
calls dump function with args without expand the args slice. Fix it to
expand slice.
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
In the current `cilium bpf ct list`, we specify the instance of the CT maps to dump by reserved word "global" or numeric id of the endpoints. This means we recognize the "type" of the CT maps by checking if the first argument is string or int and now we're trying to introduce another type for per-cluster maps. It is technically possible to introduce compatible command fixture like follows, but the parsing is unnecessarily complicated. Global : cilium bpf ct list global Enpoints : cilium bpf ct list 12345 Cluster : cilium bpf ct list cluster 1 Instead, we can explicitly specify the type by the first argument. Global : cilium bpf ct list global Enpoints : cilium bpf ct list endpoint 12345 Cluster : cilium bpf ct list cluster 1 This breaks the existing command for per-endpoint CT maps, but we consider this as an acceptable change since it doesn't change output of the command and cilium command fixture is considered as an cilium internal things and not a user interface we maintain. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Introduce a new command `cilium bpf ct list cluster <cluster id>` which dumps per-cluster CT maps. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Introduce a new command `cilium bpf nat list cluster <cluster id>` which dumps per-cluster NAT maps. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Handle from_tunnel in flagString. So that we can show from_tunnel value to CLI output. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
YutaroHayakawa
force-pushed
the
yutaro/oss/clustermesh-overlapping-podcidr/per-cluster-maps-list
branch
from
009a73d
to
3630bbe
Compare
|
Rebasing on the master and re-running the CI. |
|
/test |
|
ConformanceK8sKind: #24622 |
YutaroHayakawa
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please see individual commits for more details.