Skip to content

Commit d7bdf47

Browse files
committed
Init api-plane
0 parents  commit d7bdf47

File tree

558 files changed

+53110
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

558 files changed

+53110
-0
lines changed

.gitignore

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/.idea/
2+
/.project
3+
/target
4+
/.settings
5+
.classpath
6+
.project
7+
/logs
8+
/bin
9+
target/**
10+
.settings
11+
.target
12+
.git
13+
**/target/
14+
buid
15+
*.psd
16+
**/deploy/*.log
17+
**/webapp/public/*
18+
*.iml
19+
.externalToolBuilders/
20+
.metadata/**
21+
.DS_Store
22+
.idea/
23+
builds/
24+
*.jar
25+
k8s.yaml

.gitlab-ci.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
image: hub.c.163.com/qingzhou/maven-tomcat:8-jdk8-5
2+
variables:
3+
# Please edit to your GitLab project
4+
CI_REGISTRY_IMAGE: ${CI_REGISTRY}/qingzhou/nsf-api-plane-server
5+
DOCKER_TLS_CERTDIR: ''
6+
DOCKER_DRIVER: overlay2
7+
DOCKER_HOST: tcp://docker:2375/
8+
branch_url: $CI_PROJECT_URL/tree/$CI_COMMIT_REF_NAME
9+
10+
11+
12+
13+
stages:
14+
- commit-check
15+
- test
16+
- sonar-check
17+
- buildImage
18+
19+
before_script:
20+
- export MAVEN_HOME=/usr/local/bin/apache-maven-3.6.3
21+
# - git submodule sync
22+
# - git submodule update --init
23+
24+
commit-check:
25+
stage: commit-check
26+
script:
27+
- chmod +x scripts/check_mr_messages.sh
28+
- scripts/check_mr_messages.sh
29+
rules:
30+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
31+
tags:
32+
- qz-gitlab-runner
33+
34+
job_unit_test:
35+
stage: test
36+
script:
37+
- pwd
38+
- git status
39+
- cd /builds/qingzhou/yx-gateway-api-plane
40+
- $MAVEN_HOME/bin/mvn clean package
41+
- git status
42+
- echo "now unit_test finished."
43+
rules:
44+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
45+
artifacts:
46+
paths:
47+
- /builds/qingzhou/yx-gateway-api-plane/hango-api-plane-server
48+
expire_in: 1 day
49+
tags:
50+
- qz-gitlab-runner
51+
52+
sonar-check:
53+
stage: sonar-check
54+
script:
55+
- chmod +x scripts/check_sonar.sh
56+
- scripts/check_sonar.sh
57+
rules:
58+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
59+
tags:
60+
- qz-gitlab-runner
61+
62+
63+
job_buildImage:
64+
stage: buildImage
65+
image: docker:stable
66+
services:
67+
- docker:dind
68+
before_script:
69+
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
70+
artifacts:
71+
paths:
72+
- /builds/qingzhou/yx-gateway-api-plane/nsf-api-plane-server
73+
script:
74+
- echo "Building image - hub.c.163.com/qingzhou/nsf-api-plane-server:latest"
75+
- cd /builds/qingzhou/yx-gateway-api-plane/nsf-api-plane-server/
76+
- HASH=${CI_COMMIT_SHA:0:8}
77+
- NOW=`date +%Y%m%d-%H%M%S`
78+
- IMAGE=${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-${NOW}-${HASH}
79+
- echo $IMAGE
80+
- docker image build --force-rm --no-cache -t $IMAGE .
81+
- docker image push $IMAGE
82+
only:
83+
- release-1.1
84+
85+
tags:
86+
- qz-gitlab-runner
87+
88+
89+
90+
91+
92+

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "nsf-proto"]
2+
path = nsf-proto
3+
url = ../../zhangwu/nsf-proto.git

changelog

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
release 1.2
2+
3+
网关共通:
4+
- vs中的插件配置(除了路由)全部迁移至gateway plugin crd
5+
- 修改ratelimit插件的id生成方式(使用hash计算)
6+
- 路由插件中增加meta信息
7+
- 删除资源时通知slime
8+
9+
轻舟网关:
10+
- 路由指标监控
11+
- 支持动态降级、本地限流、Auth增强、熔断
12+
- 支持Oauth2插件
13+
- 传媒自定义插件
14+
- 插件分类
15+
- SOAP转REST
16+
17+
网格:
18+
- 增加单机+全局限流插件
19+
- 网格资源sidecar scope
20+
- 增加pod日志查询接口
21+
- ServiceEntry查询支持
22+
- 支持命名空间管理
23+
- 网格告警
24+
25+
通用:
26+
- 网关网格configuration拆分
27+
- 支持k8s 1.17
28+
29+
release 1.1
30+
31+
网关共通:
32+
- 查询服务和查询实例接口优化
33+
- 实例健康状态查询接口
34+
- 增加gateway的http10字段支持
35+
- TransformProcessor支持Condition
36+
- 增加路由默认超时时间60s
37+
- ratelimit插件配置由SharedConfig转移到ConfigMap
38+
- 发布api时,可以覆盖ratelimit configmap
39+
- 发布的dr只对当前的namespace可见
40+
- rewrite插件支持配置condition
41+
42+
严选网关:
43+
- 多租户支持
44+
- route插件rewrite子插件增加condition,兼容严选旧用法
45+
- route插件rewrite子插件将渲染配置迁移到ext字段,使用插件别名为com.netease.rewrite
46+
- 支持header、query匹配
47+
- 路由规则排序
48+
- vs中的api字段值改为服务名+api名,原先单纯为api名
49+
50+
轻舟网关:
51+
- vs元数据增加
52+
- 服务发布提供健康检查配置
53+
- 动态、静态服务发布
54+
- 支持header、query匹配
55+
- 路由规则排序
56+
- virtual service拆分,一个api一个vs
57+
- 接口暴露subset
58+
- virtualservice的host改为具体host而不是*
59+
- 增加idletimeout 3s
60+
- 增加连接池、负载均衡
61+
- destinationrule和servcieentry增加了gwLabels
62+
- 发布API增加请求头新增字段
63+
64+
ServiceMesh:
65+
- 创建、删除、查询资源接口
66+
- 拓扑功能,对接kiali
67+
- sidecar 自动注入及升级
68+
- k8s 资源监听管理
69+
- 增加pilot健康检查接口
70+
- 增加根据namespace查询资源接口
71+
- 增加资源校验接口
72+
73+
工程整体:
74+
- 增加全局Reqeust,Response日志打印

hango-api-plane-server/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM hub.c.163.com/qingzhou/tomcat-8.5-jdk8-openjdk-skiff:v1.2-191015
2+
3+
ENV TZ=Asia/Shanghai LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
4+
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
5+
WORKDIR /usr/local/tomcat
6+
COPY hango-api-plane-server/setenv.sh $CATALINA_HOME/bin/
7+
RUN rm -rf webapps/*
8+
COPY hango-api-plane-server/target/*.war webapps/
9+
RUN cd /usr/local/tomcat/webapps && \
10+
mv *.war ROOT.war && \
11+
unzip ROOT.war -d ./ROOT && \
12+
rm -f ROOT.war
13+
14+
ENTRYPOINT ["catalina.sh", "run"]

0 commit comments

Comments
 (0)