Commit Graph

4256 Commits

Author SHA1 Message Date
凡羊羊
ef5e85a654 fix service type while check service 2020-02-19 23:02:25 +08:00
凡羊羊
4393dddc63 update tenant_service struct, add service_type 2020-02-18 22:41:18 +08:00
barnettZQG
6e65282ab9
Merge pull request #679 from GLYASAI/V5.2
api certificate file not found
2020-02-17 10:28:52 +08:00
黄润豪
ff9c541253
Merge branch 'V5.2' into V5.2 2020-02-17 07:23:26 +08:00
GLYASAI
34528a9f35 api certificate file not found 2020-02-17 07:10:36 +08:00
黄润豪
c611023c18
Merge pull request #678 from fanyangyang/fix/coding/717
check etcd args and append
2020-02-15 23:28:40 +08:00
凡羊羊
5397b493ca
Merge branch 'V5.2' into fix/coding/717 2020-02-15 23:08:33 +08:00
凡羊羊
a4662aea16 check etcd args and append 2020-02-15 23:07:24 +08:00
barnettZQG
d5cd896898
Merge pull request #677 from GLYASAI/V5.2
fix typos
2020-02-15 17:06:28 +08:00
GLYASAI
04628dd806 Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-02-15 17:03:03 +08:00
GLYASAI
73375372c6 fix typos 2020-02-15 17:02:50 +08:00
黄润豪
c5bdf98046
Merge pull request #676 from fanyangyang/fix/coding/717
add etcd ca args
2020-02-15 15:15:00 +08:00
凡羊羊
32122af52b add etcd ca args 2020-02-15 14:38:30 +08:00
barnettZQG
29a2f9be31
Merge pull request #675 from GLYASAI/V5.2
docker certificates and hosts
2020-02-15 14:19:49 +08:00
黄润豪
46e7592fbb
Merge branch 'V5.2' into V5.2 2020-02-15 13:56:54 +08:00
GLYASAI
a29d42e6f2 docker certificates and hosts 2020-02-15 13:35:44 +08:00
barnettZQG
563a469b97 Merge branch 'V5.2' of https://github.com/goodrain/rainbond into V5.2 2020-02-15 11:02:20 +08:00
barnettZQG
a5e6a2f928 fix ES_DEFAULT_EXEC_ARGS bug 2020-02-15 11:02:10 +08:00
barnettZQG
7ad569b0a0
Merge pull request #673 from GLYASAI/V5.2
fix 'runtime.Object is nil'
2020-02-14 19:14:01 +08:00
barnettZQG
d93c763c38
Merge pull request #674 from fanyangyang/localstorage
fix local storage
2020-02-14 19:13:27 +08:00
凡羊羊
4f70f33e80 fix local storage 2020-02-14 18:47:32 +08:00
barnettZQG
4f01354fac change rainbond kube client 2020-02-14 16:40:32 +08:00
barnettZQG
c0882d154d Merge branch 'V5.2' of https://github.com/goodrain/rainbond into V5.2 2020-02-14 16:26:53 +08:00
barnettZQG
9e8dc20ace grctl install support 2020-02-14 16:26:42 +08:00
黄润豪
33eb499870
Merge branch 'V5.2' into V5.2 2020-02-14 11:34:21 +08:00
GLYASAI
8058cee2c9 fix 'runtime.Object is nil' 2020-02-14 11:31:22 +08:00
barnettZQG
e3470bda10
Merge pull request #672 from fanyangyang/updatejob
remove job debug env
2020-02-14 08:57:01 +08:00
凡羊羊
cb3ee38c3f remove job debug env 2020-02-14 08:25:42 +08:00
barnettZQG
475d4bdc3f
Merge pull request #670 from GLYASAI/V5.2
adapted to kubelet 1.16
2020-02-13 22:28:56 +08:00
barnettZQG
43aa3a51b8
Merge pull request #671 from GLYASAI/v2cluster
fix '/v2/cluster' 500
2020-02-13 22:28:24 +08:00
GLYASAI
b6143ff975 fix '/v2/cluster' 500 2020-02-13 22:02:27 +08:00
glyasai
ab08a1074f adapted to kubelet 1.16 2020-02-13 20:51:19 +08:00
黄润豪
2c3cf4cb39
Merge pull request #669 from fanyangyang/V5.2
V5.2
2020-02-13 20:29:50 +08:00
凡羊羊
9340c4b1fd
Merge branch 'V5.2' into V5.2 2020-02-13 20:04:34 +08:00
凡羊羊
2f88f01ac3 merge V5.1 to V5.2 2020-02-13 20:03:05 +08:00
barnettZQG
64d9039d65 webcli does not rely on kubectl for container control 2020-02-13 18:39:10 +08:00
barnettZQG
eaecd2494b
Merge pull request #667 from GLYASAI/V5.1
build grctl enterprise
2020-02-13 08:55:57 +08:00
barnettZQG
12db311a80
Merge pull request #665 from GLYASAI/delmetrics
delete metrics-server installation
2020-02-12 18:49:44 +08:00
黄润豪
580545bfd7
Merge branch 'V5.1' into V5.1 2020-02-12 16:53:09 +08:00
glyasai
1367135d21 build grctl enterprise 2020-02-12 16:50:27 +08:00
barnettZQG
5595da8cbb support region.goodrain.me domain 2020-02-12 16:09:02 +08:00
barnettZQG
90c0ef7260 fix code error 2020-02-12 12:40:22 +08:00
barnettZQG
ae096b8e1a change go version to 1.13 2020-02-12 12:35:50 +08:00
barnettZQG
d0140e5323 change windows util 2020-02-12 11:36:42 +08:00
黄润豪
83be26611c
Merge branch 'V5.2' into delmetrics 2020-02-12 06:23:05 +08:00
glyasai
73bd7e6fb6 delete metrics-server installation 2020-02-12 05:49:57 +08:00
barnettZQG
fd53fa6574 change grctl name 2020-02-11 20:44:49 +08:00
barnettZQG
ee9d8e0892 fix windowx build bug 2020-02-11 19:33:28 +08:00
barnettZQG
72f4dfd16c fix "too many Host headers" bug 2020-02-11 16:40:32 +08:00
barnettZQG
328338441c
Merge pull request #659 from fanyangyang/issue/650
fix issue/650
2020-02-11 15:57:29 +08:00