Commit Graph

490 Commits

Author SHA1 Message Date
KubeSphere CI Bot 559eddce3d
Merge pull request #328 from pixiake/devel
update controller
2020-10-07 22:14:54 +08:00
pixiake 7f8d6b3ceb update controller
Signed-off-by: pixiake <guofeng@yunify.com>
2020-10-07 22:01:03 +08:00
KubeSphere CI Bot 32d846c178
Merge pull request #327 from zgldh/master
Change to user.Username
2020-10-01 23:18:50 +08:00
KubeSphere CI Bot ea2a755072
Merge pull request #324 from Forest-L/dev
Update error display
2020-10-01 23:07:44 +08:00
zgldh 6d6bbcd7f0 Change to user.Username
Signed-off-by: zgldh <zgldh@hotmail.com>
2020-10-01 03:28:22 +08:00
Forest-L f02127580e Update error display
Signed-off-by: Forest-L <lilin@yunify.com>
2020-09-30 15:20:52 +08:00
KubeSphere CI Bot 4d331b8a5f
Merge pull request #323 from Forest-L/dev
Add the cilium supported
2020-09-30 14:39:49 +08:00
Forest-L 78f4b3c1c5 Add the cilium supported
Signed-off-by: Forest-L <lilin@yunify.com>
2020-09-30 10:34:59 +08:00
KubeSphere CI Bot 4ec244fa22
Merge pull request #322 from pixiake/devel
add cluster status
2020-09-29 17:53:14 +08:00
KubeSphere CI Bot e357fbf883
Merge pull request #321 from Forest-L/dev
Add the exposure of the flannel parameter
2020-09-29 17:49:14 +08:00
pixiake af4b1c44ab add status
Signed-off-by: pixiake <guofeng@yunify.com>
2020-09-29 17:41:08 +08:00
Forest-L ca9e84212e Add the exposure of the flannel parameter
Signed-off-by: Forest-L <lilin@yunify.com>
2020-09-29 15:47:20 +08:00
KubeSphere CI Bot a1a797fc08
Merge pull request #320 from pixiake/devel
update crd scop
2020-09-29 15:24:49 +08:00
pixiake 30290963a7 update crd scop
Signed-off-by: pixiake <guofeng@yunify.com>
2020-09-29 15:06:02 +08:00
KubeSphere CI Bot 01601ecffc
Merge pull request #319 from Forest-L/dev
update define etcd script dir
2020-09-29 14:15:43 +08:00
Forest-L 4634e6cfd7 update define etcd script dir
Signed-off-by: Forest-L <lilin@yunify.com>
2020-09-29 11:57:36 +08:00
KubeSphere CI Bot 1c92ff82e6
Merge pull request #318 from Forest-L/dev
update docker version to 19.03.13
2020-09-29 11:39:53 +08:00
Forest-L cfd879fd5d update docker version to 19.03.13
Signed-off-by: Forest-L <lilin@yunify.com>
2020-09-29 11:23:07 +08:00
KubeSphere CI Bot 2f6b47dc12
Merge pull request #316 from pixiake/devel
update cluster object
2020-09-28 23:28:43 +08:00
pixiake 75888aa5e5
Update ci.yml 2020-09-28 22:33:21 +08:00
pixiake ca83d798ea update cluster object
Signed-off-by: pixiake <guofeng@yunify.com>
2020-09-28 21:41:51 +08:00
KubeSphere CI Bot b43900b933
Merge pull request #315 from Forest-L/dev
update etcd backup parameter exposure
2020-09-28 15:56:50 +08:00
“Forest-L 0c64c1835d update etcd backup parameter exposure
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-28 15:43:19 +08:00
“Forest-L abf6e52e19 update etcd backup parameter exposure
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-28 15:39:41 +08:00
“Forest-L b8377e5090 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	api/v1alpha1/default.go
#	pkg/cluster/etcd/etcd.go
#	pkg/cluster/etcd/tmpl/etcdbackup.go
2020-09-28 15:08:05 +08:00
“Forest-L dfcafd11ba update etcd backup parameter exposure
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-28 15:06:06 +08:00
“Forest-L 3e5ffdc07d update etcd backup parameter exposure
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-28 00:19:14 +08:00
Forest f5acd056cc
Merge pull request #314 from Forest-L/dev
Update eted odd check and Whether a node exists
2020-09-28 00:17:04 +08:00
“Forest-L 6747fec162 Update eted odd check and Whether a node exists
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-27 15:24:37 +08:00
KubeSphere CI Bot 683df2c298
Merge pull request #313 from liucy1983/master
fix firewalld typo
2020-09-27 09:42:27 +08:00
liucy1983 30e616dc90
fix firewalld typo
fix typo in initOs.sh.
systemctl stop firewald, lost a 'l'
2020-09-26 21:52:11 +08:00
KubeSphere CI Bot 29666ae311
Merge pull request #312 from Forest-L/dev
update lb precheck
2020-09-25 16:53:36 +08:00
“Forest-L 7197ac5258 update lb precheck
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-25 16:45:59 +08:00
KubeSphere CI Bot e6aee4ca1c
Merge pull request #311 from pixiake/devel
update project layout
2020-09-25 14:42:39 +08:00
pixiake 601df86d25
Update ci.yml 2020-09-25 11:52:54 +08:00
pixiake 42f442d6f6 update project layout
Signed-off-by: pixiake <guofeng@yunify.com>
2020-09-25 11:41:57 +08:00
KubeSphere CI Bot b0463bf0ee
Merge pull request #310 from Forest-L/dev
update the detection policy
2020-09-22 17:55:32 +08:00
“Forest-L ea25684bf5 update the detection policy
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-22 17:26:09 +08:00
KubeSphere CI Bot 1ab0979d60
Merge pull request #309 from Forest-L/dev
add the detection address at LB
2020-09-22 11:32:31 +08:00
“Forest-L ac3cc20a99 add the detection address at LB
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-21 23:22:22 +08:00
KubeSphere CI Bot 71a35420bc
Merge pull request #308 from pixiake/devel
Refine version number
2020-09-21 13:58:16 +08:00
pixiake d62e7a12a5 Merge branch 'dev' of https://github.com/pixiake/kubekey into master 2020-09-21 11:42:23 +08:00
pixiake a6e392b1ed Refine version number
Signed-off-by: pixiake <guofeng@yunify.com>
2020-09-21 11:38:23 +08:00
KubeSphere CI Bot 4f864192ce
Merge pull request #301 from Forest-L/dev
fix nodename judgment
2020-09-20 17:29:15 +08:00
“Forest-L 0166dd3376 Merge branch 'dev' of https://github.com/Forest-L/kubekey into dev
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-20 16:57:57 +08:00
“Forest-L 0a3d341611 update ExistNodeName
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-20 16:55:09 +08:00
“Forest-L 2e48c9b74b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pkg/cluster/kubernetes/nodes.go
2020-09-20 16:40:58 +08:00
“Forest-L 8712367279 fix nodename judgment
Signed-off-by: “Forest-L <lilin@yunify.com>
2020-09-20 16:37:11 +08:00
pixiake 5e5b01fc17
Merge pull request #307 from pixiake/dev
add init operating system
2020-09-20 11:04:34 +08:00
pixiake 021b3cc093
Merge branch 'master' into dev 2020-09-19 22:40:38 +08:00