Commit Graph

349 Commits

Author SHA1 Message Date
Roland.Ma
1db7a76d63 moving jwt-go from github.com/dgrijalva/jwt-go v3.2.0 to github.com/form3tech-oss/jwt-go v3.2.2
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-06-23 14:36:22 +00:00
Rao Yunkun
e9fdb01a96 Fix issue #3805
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-25 15:07:39 +08:00
Rao Yunkun
796d667e48 Add comments for metering price info struct.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-20 11:40:23 +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
LiHui
5b3c524afa Fix: return all items when limit=-1
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-16 16:57:14 +08:00
LiHui
e88f83c167 Add labels to all objects but not selectors
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-15 15:46:50 +08:00
zhu733756
c3cf47a6a6 fix bug that edge metrcis test run failed
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-04-15 10:00:17 +08:00
LiHui
b50c677593 Fix: add kubeconfig when check release status
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-14 16:01:37 +08:00
Zhengyi Lai
8d43b2a909 Merge pull request #3710 from xyz-li/app
Add owner files for the application relevant code base
2021-04-14 10:07:02 +08:00
zhu733756
f49a9c1620 fix bug for node metrics on overview page
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-04-13 15:46:22 +08:00
KubeSphere CI Bot
f75e049187 Merge pull request #3698 from zhu733756/fix-bug-for-pod-metrics-on-edge-node
fix bug where the edge node container groups tab could not see pod metrics
2021-04-11 13:32:01 +08:00
KubeSphere CI Bot
0f3e48ba30 Merge pull request #3694 from xyz-li/app-fix
check release resources status
2021-04-11 13:31:15 +08:00
zhu733756
f6dd42f494 fix-bug-for-pod-metrics-on-edge-node
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-04-09 13:01:32 +08:00
LiHui
620f65410a add OWNERS file
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-09 11:50:57 +08:00
LiHui
0d99eb483b add exetra labels to application resource
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-08 18:36:31 +08:00
LiHui
fc165f97d8 check helm release is ready or not
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-08 18:36:29 +08:00
KubeSphere CI Bot
5f325bd0d2 Merge pull request #3635 from daniel-hutao/feat-basicAuth
Let ks-apiserver optionally support authentication enabled and es without authentication enabled;
2021-04-02 21:43:53 +08:00
KubeSphere CI Bot
162a949982 Merge pull request #3643 from yunkunrao/master
Intergate OpenPitrix metrics into metering.
2021-04-02 21:41:53 +08:00
Daniel Hu
3798959eef Let ks-apiserver optionally support authentication enabled and es without authentication enabled
Signed-off-by: Daniel Hu <farmer.hutao@outlook.com>
2021-04-02 05:59:57 +00:00
KubeSphere CI Bot
0c40dd854d Merge pull request #3627 from wansir/fix-3598
decoupling with Jenkins and LDAP
2021-04-02 10:14:53 +08:00
hongming
3e8597cf76 decoupling Jenkins and LDAP
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-01 11:10:02 +08:00
zhu733756
96d60da98e add pod level metrics for edge node
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-03-31 11:54:33 +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
KubeSphere CI Bot
ea93f3832d Merge pull request #3638 from LinuxSuRen/bitbucket-org-key
Add Bitbucket organization field "key"
2021-03-30 16:53:09 +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
rick
2ecaff3b6e Add Bitbucket organization field "key"
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-30 14:18:07 +08:00
zryfish
ac275b6e98 add goimports format action (#3630)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-30 13:44:24 +08:00
rick
a545effee9 Fix fields missing when convert Jenkinsfile to JSON
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-29 10:50:24 +08:00
KubeSphere CI Bot
46e064870e Merge pull request #3522 from LinuxSuRen/fix-pipeline-runs-paging
Fix the Pipeline runs paging issues caused by BlueOcean plugin
2021-03-24 09:42:44 +08:00
rick
a2ef07ed82 Move the code lines about getting pipelineRuns with remote paging into a new function: listPipelineRunsByRemotePaging
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-22 13:38:09 +08:00
rick
727dffffe2 Set default value of weatherScore to 100
Having a ressonable default value can avoid confusing result. 0 should not be default value of weatherScore

Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-19 15:12:37 +08:00
KubeSphere CI Bot
d6c7b0ae9e Merge pull request #3505 from LinuxSuRen/fix-multi-branch-input
Fix Pipeline input failed in multi-branch mode
2021-03-19 14:22:05 +08:00
rick
8d8f685dc3 Fix the Pipeline runs paging issues caused by BlueOcean plugin
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-19 09:14:06 +08:00
LiHui
dd8429c542 Fix: nil s3Client of attachment api
Signed-off-by: LiHui <andrewli@yunify.com>

format code

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

Fix: delete helmRelease on host when delete member cluster

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

Fix: modify repo credential

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

remove not exitsts charts from helm repo

Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-18 15:26:23 +08:00
rick
bc0be03603 Fix Pipeline input failed in multi-branch mode
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-18 08:36:21 +08:00
KubeSphere CI Bot
686b180f3f Merge pull request #3442 from xyz-li/app
add extra annotations and labels to helm release
2021-03-14 21:04:02 +08:00
KubeSphere CI Bot
fcdcdbee0c Merge pull request #3458 from xyz-li/app-fix
Fix nil pointer and missing router
2021-03-12 14:21:01 +08:00
LiHui
0b1a119f76 Fix: add extra annotations and labels to helm release
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-11 23:34:06 +08:00
LiHui
87c71ed2dd Fix: handle openpititx config
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-11 18:25:49 +08:00
KubeSphere CI Bot
4f8fc3d483 Merge pull request #3447 from wanjunlei/es
fix bug can not search auditing logs with nil namespace
2021-03-11 11:40:01 +08:00
wanjunlei
a6cb91e6fb fix bug can not search auditing logs with nil namespace
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 14:56:42 +08:00
KubeSphere CI Bot
01600081f6 Merge pull request #3334 from xyz-li/app
manage openpitrix with crd
2021-03-09 19:36:00 +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
root
eaf937b15f Add kubeedge API
Signed-off-by: Ma-Dan <danma@yunify.com>
2021-03-08 17:09:05 +08:00
KubeSphere CI Bot
000acad7aa Merge pull request #3432 from LinuxSuRen/fix-choices-param
Fix the issues caused by the differences XML structure between the simple pipline and the multi-branch pipeline
2021-03-08 14:29:36 +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
KubeSphere CI Bot
9e3324d5c1 Merge pull request #3431 from LinuxSuRen/fix-boolean-param
Fix unmarshal bool into Go struct due to the boolean parameter
2021-03-05 14:19:28 +08:00
Duan Jiong
67cbff464f fix ippool status statistics
and delete ippool label while workspace is deleted

sync default ippool to namespace annotation

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
2021-03-04 17:50:14 +08:00
rick
39af05f8eb Fix the issues caused by the differences XML structure between the simple pipline and the multi-branch pipeline
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-04 16:46:44 +08:00
rick
fe2f2172ba Fix unmarshal bool into Go struct due to the boolean parameter
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-04 16:32:33 +08:00