Commit Graph

99 Commits

Author SHA1 Message Date
KubeSphere CI Bot
f4efd86b40 Merge pull request #4130 from ks-ci-bot/cherry-pick-3960-to-master
[master] Fix kubesphere_app_template_count always be 0 when GetKubeSphereStats
2021-08-25 10:04:10 +08:00
rick
23af4462bc Fix the ks-apiserver panic due to the devopsprojects CRD missing
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-08-19 13:28:34 +08:00
x893675
f29a5488a8 Fix kubesphere_app_template_count always be 0 when GetKubeSphereStats
Signed-off-by: x893675 <x893675@icloud.com>
2021-08-06 09:50:26 +00:00
yuswift
cd30e6eba5 update gofmt
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-07-15 10:13:04 +08:00
KubeSphere CI Bot
bb4af5aded Merge pull request #3871 from xyz-li/metering
Fix: parse openpitrix resources, so that these resources will be included in billing.
2021-06-25 15:13:00 +08:00
LiHui
8db1e3772b Fix: resolve openpitrix resources
Signed-off-by: LiHui <andrewli@yunify.com>
2021-05-12 14:01:30 +08:00
Rao Yunkun
80d3e91791 Fixed namespace resource filter.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-05-10 15:20:06 +08:00
Roland.Ma
c37a11c5f9 move api to staging
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-29 08:20:05 +00:00
Rao Yunkun
ab86f606a8 Update UT.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-20 10:02:46 +08:00
Rao Yunkun
5904e2e9be Remove metering ConfigMap dependency.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-19 17:36:01 +08:00
Roland.Ma
133a67ce92 feat: optional cascade delete resources when deleting workspace
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-06 02:38:04 +00:00
Rao Yunkun
bb024d8ad4 Add code comments and clean code.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-01 18:37:33 +08:00
Rao Yunkun
836b279fee Update metering UT.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-31 22:04:17 +08:00
Rao Yunkun
845f6bbe89 Intergate OpenPitrix metrics into metering.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-30 18:13:18 +08:00
Rao Yunkun
d08e402384 Integate metering module and support metering data csv format export.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-30 15:46:16 +08:00
zryfish
ac275b6e98 add goimports format action (#3630)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-30 13:44:24 +08:00
LiHui
83e6221f3a openpitrix crd
Signed-off-by: LiHui <andrewli@yunify.com>

delete helm repo, release and app

Signed-off-by: LiHui <andrewli@yunify.com>

Fix Dockerfile

Signed-off-by: LiHui <andrewli@yunify.com>

add unit test for category controller

Signed-off-by: LiHui <andrewli@yunify.com>

resource api

Signed-off-by: LiHui <andrewli@yunify.com>

miscellaneous

Signed-off-by: LiHui <andrewli@yunify.com>

resource api

Signed-off-by: LiHui <andrewli@yunify.com>

add s3 repo indx

Signed-off-by: LiHui <andrewli@yunify.com>

attachment api

Signed-off-by: LiHui <andrewli@yunify.com>

repo controller test

Signed-off-by: LiHui <andrewli@yunify.com>

application controller test

Signed-off-by: LiHui <andrewli@yunify.com>

release metric

Signed-off-by: LiHui <andrewli@yunify.com>

helm release controller test

Signed-off-by: LiHui <andrewli@yunify.com>

move constants to /pkg/apis/application

Signed-off-by: LiHui <andrewli@yunify.com>

remove unused code

Signed-off-by: LiHui <andrewli@yunify.com>

add license header

Signed-off-by: LiHui <andrewli@yunify.com>

Fix bugs

Signed-off-by: LiHui <andrewli@yunify.com>

cluster cluent

Signed-off-by: LiHui <andrewli@yunify.com>

format code

Signed-off-by: LiHui <andrewli@yunify.com>

move workspace,cluster from spec to labels

Signed-off-by: LiHui <andrewli@yunify.com>

add license header

Signed-off-by: LiHui <andrewli@yunify.com>

openpitrix test

Signed-off-by: LiHui <andrewli@yunify.com>

add worksapce labels for app in appstore

Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-09 18:30:02 +08:00
Rao Yunkun
d9b681dd8d Merge branch 'master' into metering
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-05 14:43:30 +08:00
hongming
70fa24010c support workspace resource quota
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-02 10:42:09 +08:00
yunkunrao
e9073f0486 Add metering api.
Signed-off-by: yunkunrao <yunkunrao@yunify.com>
2021-02-22 14:31:10 +08:00
KubeSphere CI Bot
bed6465993 Merge pull request #3212 from wanjunlei/es
add a es client for auditing, events, and logging
2021-01-19 17:09:19 +08:00
junotx
371c9b187d custom alerting
Signed-off-by: junotx <junotx@126.com>
2021-01-12 16:52:36 +08:00
Zack Zhang
f20c1f33f1 refactor application controller
Signed-off-by: zackzhang <zackzhang@yunify.com>
2021-01-04 16:34:04 +08:00
hongming
fe6c5de00f update dependencies
Signed-off-by: hongming <talonwan@yunify.com>
2021-01-04 15:35:32 +08:00
wanjunlei
039507c9ae add a es client for auditing, events, and logging
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-12-29 14:17:21 +08:00
hongming
dfaefa5ffb improve identity provider plugin
Signed-off-by: hongming <talonwan@yunify.com>
2020-12-10 14:35:56 +08:00
hongming
cd99f78768 Fix container terminal security risk
Signed-off-by: hongming <talonwan@yunify.com>
2020-11-13 16:37:33 +08:00
Roland.Ma
80f3db3d42 feat: authentication users with group's RoleBindings in API Server
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-11 05:31:25 +00:00
hongming
e8c1acdcf3 fix workspacetemplate patch API not working
Signed-off-by: hongming <talonwan@yunify.com>
2020-08-06 16:17:49 +08:00
hongming
1d9c9bc0c2 fix labelSelector not working
Signed-off-by: hongming <talonwan@yunify.com>
2020-08-04 11:35:53 +08:00
zryfish
4702beb6ac add federated resource api (#2725)
Signed-off-by: Jeff <zw0948@gmail.com>
2020-07-31 17:12:58 +08:00
KubeSphere CI Bot
67c6a8c510 Merge pull request #2672 from wanjunlei/auditing-log
make ws admin can be aware of anything happened in its workspace.
2020-07-30 13:33:51 +08:00
KubeSphere CI Bot
9834baf230 Merge pull request #2688 from huanggze/master
Allow global admins to view deleted namespace logs
2020-07-30 09:50:51 +08:00
wanjunlei
b5392b97c0 add ns and ws query parameter to es query body
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-07-29 18:48:34 +08:00
wanjunlei
b51a5c22f2 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-07-29 18:48:34 +08:00
wanjunlei
713c646bfd make ws admin aware of anything happened in its workspace.
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-07-29 18:48:34 +08:00
huanggze
70d0d5fe18 Allow global admins to view deleted namespace logs
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-07-29 10:26:38 +08:00
hongming
e494cae010 fix panic
Signed-off-by: hongming <talonwan@yunify.com>
2020-07-28 14:16:23 +08:00
hongming
bda48c240f fix: devop IAM bugs
Signed-off-by: hongming <talonwan@yunify.com>
2020-07-28 10:01:50 +08:00
zryfish
c5a63500a4 add application controller (#2652)
Signed-off-by: Jeff <zw0948@gmail.com>
2020-07-26 23:11:56 +08:00
wanjunlei
bf87894512 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-07-25 18:15:21 +08:00
wanjunlei
6585881d01 fix bug multi tenant auditing, logging and event is incorrect
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-07-25 12:19:29 +08:00
hongming
c103f47abd fix federatednamespace resource scope
Signed-off-by: hongming <talonwan@yunify.com>
2020-07-22 22:42:53 +08:00
hongming
3525fc5507 add federatednamespaces tenant API
Signed-off-by: hongming <talonwan@yunify.com>
2020-07-20 17:39:46 +08:00
zryfish
3c99b3ca9e fix issue #2289 Can't create fed project (#2291) 2020-07-03 18:06:02 +08:00
hongming
8515e01f55 fix: federated workspace cluster selector
Signed-off-by: hongming <talonwan@yunify.com>
2020-07-02 21:38:04 +08:00
KubeSphere CI Bot
2a05365871 Merge pull request #2257 from wanjunlei/auditing-authority
add resourcescope to AttributesRecord when determine whether the user…
2020-06-27 20:45:42 +08:00
KubeSphere CI Bot
eb1001d2b8 Merge pull request #2256 from huanggze/role
logging: update rolebinding check
2020-06-27 20:43:43 +08:00
wanjunlei
0e6277ed66 add resourcescope to AttributesRecord when determine whether the user can list namespace 2020-06-27 19:21:00 +08:00
huanggze
b92e768beb logging: update rolebinding check
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-06-27 10:37:59 +08:00