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.

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

Aggregate slime: move modules to staging dir #152

Merged
merged 1 commit into from
May 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ In order to solving the current shortcomings of Istio, we make Slime project. It

Slime adopts a modular architecture inside. It contains three useful modules now.

[Configuration Lazy Loading](https://github.com/slime-io/lazyload): No need to configure SidecarScope, automatically load configuration on demand, solving full push problem. The source of the service relationship supports Prometheus or Accesslog.
[Configuration Lazy Loading](./staging/src/slime.io/slime/modules/lazyload): No need to configure SidecarScope, automatically load configuration on demand, solving full push problem. The source of the service relationship supports Prometheus or Accesslog.

[Http Plugin Management](https://github.com/slime-io/plugin): Use the new CRD pluginmanager/envoyplugin to wrap readability , The poor maintainability of envoyfilter makes plug-in extension more convenient.
[Http Plugin Management](./staging/src/slime.io/slime/modules/plugin): Use the new CRD pluginmanager/envoyplugin to wrap readability , The poor maintainability of envoyfilter makes plug-in extension more convenient.

[Adaptive Ratelimit](https://github.com/slime-io/limiter): It can be automatically combined with adaptive ratelimit strategy based on metrics, solving rate limit problem.
[Adaptive Ratelimit](./staging/src/slime.io/slime/modules/limiter): It can be automatically combined with adaptive ratelimit strategy based on metrics, solving rate limit problem.



Expand Down Expand Up @@ -65,9 +65,9 @@ Slime supports aggregated packaging, allowing any module to be aggregated into a

Slime-module

- [Lazyload Usage](https://github.com/slime-io/lazyload/blob/master/README.md)
- [PluginManager Usage](https://github.com/slime-io/plugin/blob/master/README.md)
- [SmartLimiter Usage](https://github.com/slime-io/limiter/blob/master/README.md)
- [Lazyload Usage](./staging/src/slime.io/slime/modules/lazyload/README.md)
- [PluginManager Usage](./staging/src/slime.io/slime/modules/plugin/README.md)
- [SmartLimiter Usage](./staging/src/slime.io/slime/modules/limiter/README.md)

[E2E Test Tutorials](./doc/en/slime_e2e_test.md)

Expand Down
12 changes: 6 additions & 6 deletions README_ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ Istio 可以实现版本分流、灰度发布、负载均衡等功能,但是

Slime 内部采用了模块化的架构。目前包含了三个非常实用的子模块。

[配置懒加载](https://github.com/slime-io/lazyload):无须配置SidecarScope,自动按需加载配置和服务发现信息 ,解决了全量推送的问题。服务调用关系的来源支持Prometheus或者Accesslog。
[配置懒加载](./staging/src/slime.io/slime/modules/lazyload):无须配置SidecarScope,自动按需加载配置和服务发现信息 ,解决了全量推送的问题。服务调用关系的来源支持Prometheus或者Accesslog。

[Http插件管理](https://github.com/slime-io/plugin):使用新的的CRD pluginmanager/envoyplugin包装了可读性及可维护性差的envoyfilter,使得插件扩展更为便捷。
[Http插件管理](./staging/src/slime.io/slime/modules/plugin):使用新的的CRD pluginmanager/envoyplugin包装了可读性及可维护性差的envoyfilter,使得插件扩展更为便捷。

[自适应限流](https://github.com/slime-io/limiter):实现了本地限流,同时可以结合监控信息自动调整限流策略,填补了 Istio 限流功能的短板。
[自适应限流](./staging/src/slime.io/slime/modules/limiter):实现了本地限流,同时可以结合监控信息自动调整限流策略,填补了 Istio 限流功能的短板。

后续我们会开源更多的功能模块。

Expand Down Expand Up @@ -67,9 +67,9 @@ Slime支持聚合打包,可以将任意模块聚合成一个镜像。所以,

Slime-module

- [懒加载使用](https://github.com/slime-io/lazyload/blob/master/README_zh.md)
- [插件管理使用](https://github.com/slime-io/plugin/blob/master/README_zh.md)
- [自适应限流使用](https://github.com/slime-io/limiter/blob/master/README_ZH.md)
- [懒加载使用](./staging/src/slime.io/slime/modules/lazyload/README_zh.md)
- [插件管理使用](./staging/src/slime.io/slime/modules/plugin/README_zh.md)
- [自适应限流使用](./staging/src/slime.io/slime/modules/limiter/README_ZH.md)

[E2E测试教程](./doc/zh/slime_e2e_test_zh.md)

Expand Down
2 changes: 1 addition & 1 deletion boot/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
MODS=${MODS:-"lazyload limiter plugin"}
Copy link
Contributor

Choose a reason for hiding this comment

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

We can traverse these modules through the file directory so that we don't have to list them explicitly. But this can be done later

for m in $MODS; do
rm -rf "./helm-charts/slimeboot/templates/modules/$m"
cp -r "../../$m/charts/" "./helm-charts/slimeboot/templates/modules/$m"
cp -r "../staging/src/slime.io/slime/modules/$m/charts/" "./helm-charts/slimeboot/templates/modules/$m"
done

export MOD=boot
Expand Down
2 changes: 1 addition & 1 deletion doc/zh/slime_e2e_test_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

为了更好的进行模块化测试,Slime引入了E2E(End to End)测试框架。主要函数实现参考了Kubernetes的test/e2e。由于Kubernetes的E2E测试太过庞大,我们摘取了一个子集,满足基本需求。

测试框架位于[Slime项目](https://github.com/slime-io/slime)的slime-framework/test/e2e路径下,测试文件则位于各个modules项目中。以[lazyload项目](https://github.com/slime-io/lazyload)为例,测试文件路径为test/e2e/lazyload_test.go。
测试框架位于[Slime项目](https://github.com/slime-io/slime)的slime-framework/test/e2e路径下,测试文件则位于各个modules项目中。以[lazyload项目](../../staging/src/slime.io/slime/modules/lazyload)为例,测试文件路径为test/e2e/lazyload_test.go。



Expand Down
6 changes: 3 additions & 3 deletions modules/bundle_example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.17.2
slime.io/slime/framework => ../../framework

slime.io/slime/modules/lazyload => ../../../lazyload
slime.io/slime/modules/limiter => ../../../limiter
slime.io/slime/modules/plugin => ../../../plugin
slime.io/slime/modules/lazyload => ../../staging/src/slime.io/slime/modules/lazyload
slime.io/slime/modules/limiter => ../../staging/src/slime.io/slime/modules/limiter
slime.io/slime/modules/plugin => ../../staging/src/slime.io/slime/modules/plugin
)
7 changes: 1 addition & 6 deletions modules/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ module slime.io/slime/modules/example
go 1.13

require (
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.4.2
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/sirupsen/logrus v1.4.2
istio.io/api v0.0.0-20210322145030-ec7ef4cd6eaf
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.17.2
sigs.k8s.io/controller-runtime v0.5.0
Expand All @@ -20,6 +16,5 @@ replace (
k8s.io/api => k8s.io/api v0.17.2
k8s.io/apimachinery => k8s.io/apimachinery v0.17.2

slime.io/slime/framework v0.0.0 => github.com/slime-io/slime/framework v0.3.7
//slime.io/slime/framework => ../slime/framework
slime.io/slime/framework => ../../framework
)
Loading