-
Notifications
You must be signed in to change notification settings - Fork 94
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
add support for osm and osm-edge. #279
Conversation
signed-off-by: cybwan <baili@flomesh.io>
Welcome to the Merbridge OpenSource Community!👏 We're delighted to have you onboard 💘 |
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## main #279 +/- ##
==========================================
- Coverage 40.33% 32.87% -7.46%
==========================================
Files 7 7
Lines 419 514 +95
==========================================
Hits 169 169
- Misses 236 331 +95
Partials 14 14
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
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. Not sure the link is correct or not
deploy/README.md
Outdated
### Install Merbridge on Osm/Osm-edge | ||
|
||
+ set mode=osm to switch to osm/osm-edge mode | ||
+ set namespace where merbridge is going to install by -n . |
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.
### Install Merbridge on Osm/Osm-edge | |
+ set mode=osm to switch to osm/osm-edge mode | |
+ set namespace where merbridge is going to install by -n . | |
### Install Merbridge on OSM/OSM-Edge | |
+ Set `mode=osm` to switch to [OSM](https://github.com/openservicemesh/osm)/[OSM-Edge](https://github.com/flomesh-io/osm-edge) mode | |
+ Specify a namespace where you want to install Merbridge using `-n` |
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.
correct.
signed-off-by: cybwan <baili@flomesh.io>
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.
Awesome! Almost lgtm if e2e passed.
} | ||
} | ||
pod.statusPort = uint16(statusPort) | ||
excludeInboundPorts := []uint16{15000, 15001, 15003, 15010, 15021, 15050, 15128, 15901, 15902, 15903, 15904} |
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.
Currently, MaxItemLen
is 10, maybe can not store too many ports.
Increase the MaxItemLen
if it necessary.
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.
BTW I think 15021 is overlapped with statusPort
, maybe we should merge them in the future
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.
15000 sidecar admin port
15001 outbound listener port
15003 inbound listener port
15010 prometheus inbound listener port
15021 not used by osm and osm-edge and should be removed
15050 used by osm-edge for solving a issue about cni plugin and submit PR later
15128 proxy server listener port
15901 liveness probe port
15902 readiness probe port
15903 startup probe port
15904 health check port
signed-off-by: cybwan <baili@flomesh.io>
controller/pod.go
Outdated
@@ -84,7 +84,7 @@ func createLocalPodController(client kubernetes.Interface) pods.Watcher { | |||
} | |||
} | |||
|
|||
const MaxItemLen = 10 // todo changeme | |||
const MaxItemLen = 12 // todo changeme |
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.
also update
merbridge/bpf/headers/helpers.h
Line 257 in 25f37a9
#define MAX_ITEM_LEN 10 |
we can set it to 20~
signed-off-by: cybwan <baili@flomesh.io>
failed reason: Line 94 in 25f37a9
value size need be updated manually. |
signed-off-by: cybwan <baili@flomesh.io>
signed-off-by: cybwan <baili@flomesh.io>
signed-off-by: cybwan <baili@flomesh.io>
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.
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.
Thank you!
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.
Thank you.
Open Service Mesh (OSM) is a lightweight, extensible, cloud native service mesh that allows users to uniformly manage, secure, and get out-of-the-box observability features for highly dynamic microservice environments.
Open Service Mesh Edge (OSM-Edge) fork from Open Service Mesh, built purposely for Edge computing. OSM edge uses lightweight, Cloud Native, programmable proxy Pipy as sidecar proxy.
PR is bundled with Unit Test (UT) and E2E test suite to cover the changes.
signed-off-by: cybwan baili@flomesh.io