Commit Graph

4910 Commits

Author SHA1 Message Date
黄润豪
45b6db9819
Merge pull request #862 from GLYASAI/startup-sequence
bug fix: circular dependency
2020-10-16 17:15:43 +08:00
黄润豪
22fc5460a8
Merge branch 'V5.2' into startup-sequence 2020-10-15 18:10:24 +08:00
GLYASAI
979add64a5 bug fix: circular dependency 2020-10-15 18:08:28 +08:00
黄润豪
46319ec1de
Merge pull request #860 from GLYASAI/startup-sequence2
Bug Fix: circular dependency
2020-10-14 10:30:02 +08:00
GLYASAI
f108e4bc01 bug fix: circular dependency 2020-10-13 18:06:50 +08:00
黄润豪
79b55b9342
Merge pull request #859 from GLYASAI/bug-check-image
Bug Fix: failed to check old version images
2020-10-13 13:29:47 +08:00
GLYASAI
333b322b0c fix error checking image 2020-10-13 11:02:37 +08:00
黄润豪
c7fb39f8a8
Merge pull request #857 from yangkaa/configV1.8
New feature: added batch binding service interface
2020-10-09 10:46:46 +08:00
GLYASAI
f0616b9e86 create or update secrets 2020-10-09 10:18:13 +08:00
GLYASAI
11b638273d secret as environment variables 2020-10-09 10:02:42 +08:00
yangk
fdc3093ebb added new line 2020-10-09 09:15:21 +08:00
yangk
9b137e1555 Merge remote-tracking branch 'goodrain/master' into configV1.8
# Conflicts:
#	api/controller/application.go
#	api/handler/application_handler.go
#	db/dao/dao.go
2020-10-09 09:12:34 +08:00
GLYASAI
700133948c make config group work 2020-10-08 16:10:03 +08:00
yangk
bd13e434a7 application batch bind service 2020-10-08 14:01:37 +08:00
GLYASAI
15f28972ac env for port alias 2020-10-08 09:08:16 +08:00
GLYASAI
21c3fc03cf create k8s native service 2020-10-07 22:14:22 +08:00
GLYASAI
e541225475 setup governance mode 2020-10-07 22:00:55 +08:00
barnettZQG
2b39fdccc5
Merge pull request #854 from GLYASAI/k8s-service
New Feature: update k8s service name and get app status
2020-09-30 16:06:35 +08:00
GLYASAI
421dec1630 delete apcera termtables 2020-09-30 16:04:13 +08:00
GLYASAI
62bdf00a00 fix merge conflict 2020-09-30 13:58:23 +08:00
黄润豪
063a2a3189
Merge branch 'master' into k8s-service 2020-09-30 13:54:51 +08:00
barnettZQG
023d1c7648 Merge branch 'master' of https://github.com/goodrain/rainbond 2020-09-30 11:57:45 +08:00
barnettZQG
550b6d8f1a fixed issue #853 2020-09-30 11:57:30 +08:00
黄润豪
b93581938d
Merge branch 'master' into k8s-service 2020-09-30 11:19:01 +08:00
黄润豪
eff3416738
Merge pull request #850 from yangkaa/configV1.7
修改问题和测试
2020-09-30 11:16:57 +08:00
GLYASAI
554d67b903 Merge branch 'k8s-service' of https://github.com/GLYASAI/rainbond into k8s-service 2020-09-30 11:03:29 +08:00
GLYASAI
24482ed2f0 fix review problems 2020-09-30 11:03:14 +08:00
黄润豪
c980a4a703
Merge branch 'master' into configV1.7 2020-09-30 10:58:06 +08:00
yangk
206d2bc90f modified some code 2020-09-30 10:55:09 +08:00
黄润豪
a8f990b587
Merge branch 'master' into k8s-service 2020-09-30 10:01:27 +08:00
GLYASAI
d93510c787 new api for getting app status 2020-09-30 09:50:58 +08:00
barnettZQG
9e20df75ec change some code 2020-09-29 18:46:22 +08:00
barnettZQG
5449ee8102 support disable go proxy 2020-09-28 18:16:25 +08:00
barnettZQG
bbde302710 change resource proxy 2020-09-28 16:23:05 +08:00
barnettZQG
49db1fb522 change expired time 2020-09-28 15:30:56 +08:00
GLYASAI
ec296fa8f4 update k8s service name 2020-09-27 16:27:46 +08:00
GLYASAI
0ea7c4c81b adapt testcontainers 2020-09-27 15:17:46 +08:00
barnettZQG
4d4a24c1c0 change release bash #803 2020-09-25 15:11:49 +08:00
barnettZQG
1efabf97ba [Feature] design resource-proxy based on nginx #803 2020-09-25 15:02:26 +08:00
barnettZQG
0310685a0d Merge branch 'V5.2' 2020-09-25 11:28:58 +08:00
barnettZQG
4b7644351f change some code bug #370 2020-09-25 10:58:54 +08:00
barnettZQG
45aefa196b change code 2020-09-24 21:21:11 +08:00
barnettZQG
3b773d9bd2 Merge branch 'master' of https://github.com/goodrain/rainbond 2020-09-24 21:09:14 +08:00
barnettZQG
ff5902781a support custom service monitor #370 2020-09-24 21:09:00 +08:00
yangk
27d9fc1d33 delete useless varible 2020-09-24 20:01:43 +08:00
yangk
dbc08516f5 Merge branch 'configV1.6' of https://github.com/yangkaa/rainbond into configV1.7 2020-09-24 19:30:05 +08:00
yangk
b8b937587e solve conflict 2020-09-24 19:25:04 +08:00
黄润豪
6db672fe8e
Merge branch 'master' into configV1.5 2020-09-24 18:56:20 +08:00
黄润豪
c384dbc1ac
Merge pull request #847 from yangkaa/configV1.4
更新应用配置组
2020-09-24 18:55:49 +08:00
yangk
ce540b1a27 Merge branch 'configV1.5' of https://github.com/yangkaa/rainbond into configV1.5 2020-09-24 14:39:51 +08:00