admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,994 Commits 13 Branches 51 Tags
242193ddb0e65719fa1f637e148d55b2eaef9592
Commit Graph

246 Commits

Author SHA1 Message Date
rick
14367d1954 Fix the pipeline do not sync with Jenkins 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2021-01-06 10:11:59 +08:00
KubeSphere CI Bot
ee373b8e55 Merge pull request #3247 from RolandMa1986/group-parent 
Cascading deletion of children groups
 2021-01-06 09:50:33 +08:00
Zack Zhang
f20c1f33f1 refactor application controller 
Signed-off-by: zackzhang <zackzhang@yunify.com>
 2021-01-04 16:34:04 +08:00
Roland.Ma
2d6b7fef8b cascading deletion of children groups 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2021-01-04 07:39:50 +00:00
hongming
fe6c5de00f update dependencies 
Signed-off-by: hongming <talonwan@yunify.com>
 2021-01-04 15:35:32 +08:00
Duan Jiong
24e3ac865f add ippool resource api 
add ippool webhook and fix some bugs

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-12-29 14:32:21 +08:00
KubeSphere CI Bot
d672b6cc98 Merge pull request #3179 from wansir/workspace 
refactor workspace controller
 2020-12-28 15:06:52 +08:00
hongming
a900b6af4e refactor workspace controller 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-12-28 14:31:48 +08:00
KubeSphere CI Bot
51c853c886 Merge pull request #3203 from yuswift/bugfix/proxy-cluster-status-sync 
[BugFix] Fix cluster unjoin federation plane when using proxy connection
 2020-12-28 13:55:52 +08:00
KubeSphere CI Bot
eaf8cc40c4 Merge pull request #3217 from RolandMa1986/feat-groupapi 
add group api
 2020-12-25 22:29:50 +08:00
KubeSphere CI Bot
5ffc76dee9 Merge pull request #3206 from RolandMa1986/fix-clusterjoin 
Validate member cluster's workspaces when joining clusters
 2020-12-25 17:53:50 +08:00
Roland.Ma
84f5fb7e69 valid member cluster's workspaces when joining 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-25 03:16:03 +00:00
Roland.Ma
ab6e1f171c UT 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-24 10:10:39 +00:00
KubeSphere CI Bot
d814d5db7b Merge pull request #3195 from LinuxSuRen/fix/devops-project-del 
Fix devops project cannot be deleted due to mess up with finalizer control
 2020-12-18 14:03:47 +08:00
rick
f908aa42f7 Fix devops project cannot be deleted due to mess up with finalizer control 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-12-16 10:08:34 +08:00
yuswift
ee13aa7c8a fix #3202 
Signed-off-by: yuswift <yuswiftli@yunify.com>
 2020-12-14 15:30:48 +08:00
linruichao
98ae80207f fixed: check the cluster has initialized 
Previously, always check whether the cluster has been initialized, but the updateClusterCondition function always removes the old condition and then adds the new condition, resulting in always returning after updating the initialized condition.

This commit check the cluster has initialized, if initialized will not updated condition

Signed-off-by: linruichao <linruichao@ruijie.com.cn>
 2020-12-14 15:02:30 +08:00
KubeSphere CI Bot
1e5fdea5f2 Merge pull request #3140 from wansir/identity-provider 
improve identity provider plugin
 2020-12-10 19:39:44 +08:00
hongming
dfaefa5ffb improve identity provider plugin 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-12-10 14:35:56 +08:00
KubeSphere CI Bot
dab0842a32 Merge pull request #3161 from RolandMa1986/feat-group-fedsync 
enable multicluster sync for groups
 2020-12-09 15:17:43 +08:00
KubeSphere CI Bot
91c2e05616 Merge pull request #3180 from LinuxSuRen/fix/pipeline-finalizer 
Fix pipeline cannot be removed due to finalizers
 2020-12-08 18:01:40 +08:00
rick
349a4ac965 Fix pipeline cannot be removed due to finalizers 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-12-04 10:22:57 +08:00
Roland.Ma
5248e622f2 enable multicluster sync for groups 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-12-03 07:19:31 +00:00
zackzhangkai
062c688287 kiali add kubeconfig check 
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
 2020-12-03 14:58:42 +08:00
zackzhangkai
96fe71173a fix comments 
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
 2020-12-01 12:50:30 +08:00
KubeSphere CI Bot
75e0cf27e4 Merge pull request #3126 from shaowenchen/add_state_for_pipeline 
feature: add sync state for devops
 2020-11-24 11:46:36 +08:00
KubeSphere CI Bot
5a816f72fc Merge pull request #3125 from LinuxSuRen/discover-tag-support 
Add support discover tags for multi-branch pipeline
 2020-11-24 11:35:36 +08:00
Roland.Ma
2f916f4dd9 move package 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-23 08:47:09 +00:00
Roland.Ma
f8903f19f6 refactor controllers 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-23 08:47:09 +00:00
rick
cec7793534 Make the logger level as 8 in the DevOps code lines 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-11-23 09:31:56 +08:00
KubeSphere CI Bot
08d3726da3 Merge pull request #3136 from yuswift/bugfix/multi-cluster-condition 
bugfix: multi-cluster-status-condition
 2020-11-20 18:13:35 +08:00
yuswift
62b39810a4 bugfix: multi-cluster-status-condition 
Signed-off-by: yuswift <yuswiftli@yunify.com>
 2020-11-20 16:19:42 +08:00
KubeSphere CI Bot
0d0b1d888f Merge pull request #3098 from wansir/fix-2912 
fix: cascade delete resources
 2020-11-20 12:09:34 +08:00
KubeSphere CI Bot
954a425e20 Merge pull request #3113 from wansir/fix-3112 
fix: private key not match public key
 2020-11-20 12:04:34 +08:00
rick
1783b75c98 Add support discover tags for multi-branch pipeline 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-11-19 15:29:44 +08:00
shaowenchen
38ca2ea39b feature: add sync state for devops 
Signed-off-by: shaowenchen <mail@chenshaowen.com>
 2020-11-18 00:21:56 +08:00
hongming
f2c99071c2 fix wrong owner reference 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-11-17 18:27:22 +08:00
rick
4d19901025 Fix the errors found by go vet 
Signed-off-by: rick <rick@jenkins-zh.cn>
 2020-11-17 09:23:07 +08:00
yuswift
69a27e40aa Feat: support runnig ks-controller-manager without ldap option 
Signed-off-by: yuswift <yuswiftli@yunify.com>
 2020-11-16 12:19:07 +08:00
hongming
617e969a55 fix: private key not match public key 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-11-13 18:40:52 +08:00
Roland.Ma
0a5e04d186 Add UT 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-11 05:31:25 +00:00
Roland.Ma
5500e93b5f update comments 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-11 05:31:25 +00:00
Roland.Ma
fc5235ae29 refine groupbinding controller 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-11 05:31:25 +00:00
Roland.Ma
447a5a562f feat: add group and groupbinding controller 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
 2020-11-11 05:31:25 +00:00
Duan Jiong
43d1d6f243 implement ippool 
1. support vlan ippool management
2. support calico ippool management

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
 2020-10-29 09:59:27 +08:00
zryfish
44799ae68a skip reconcile cluster if not join federation (#3021) 
Signed-off-by: Jeff <jeffzhang@yunify.com>
 2020-10-15 17:11:05 +08:00
zackzhangkai
d1e7f35b3e fix application status 
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
 2020-10-13 10:13:51 +08:00
shaowenchen
2dcabb0bdb fix crendential sync 
Signed-off-by: shaowenchen <mail@chenshaowen.com>
 2020-08-28 16:54:07 +08:00
hongming
66d79aaf75 fix: missing role template after upgrade 
Signed-off-by: hongming <talonwan@yunify.com>
 2020-08-20 23:06:59 +08:00
zryfish
b5d9d29fc6 fix servicemesh strategy not applied bug (#2892) 
Signed-off-by: Jeff <jeffzhang@yunify.com>
 2020-08-19 14:50:18 +08:00