Compare commits

...

1127 Commits

Author SHA1 Message Date
KubeSphere CI Bot
d917905529 [release-3.3] Fix ingress P95 delay time promql statement (#5132)
Fix ingress P95 delay time promql statement

Co-authored-by: Xinzhao Xu <z2d@jifangcheng.com>
2022-08-14 16:49:35 +08:00
KubeSphere CI Bot
cd6f940f1d [release-3.3] Adjust container terminal priority: bash, sh (#5076)
Adjust container terminal priority: bash, sh

Co-authored-by: tal66 <77445020+tal66@users.noreply.github.com>
2022-07-21 11:16:29 +08:00
KubeSphere CI Bot
921a8f068b [release-3.3] skip generated code when fmt code (#5079)
skip generated code when fmt code

Co-authored-by: LiHui <andrewli@kubesphere.io>
2022-07-21 11:16:14 +08:00
KubeSphere CI Bot
641aa1dfcf [release-3.3] close remote terminal.(#5023) (#5028)
close remote terminal.(kubesphere#5023)

Co-authored-by: lixueduan <li.xueduan@99cloud.net>
2022-07-06 18:08:34 +08:00
Rick
4522c841af Add the corresponding label 'kind/bug' to the issue template (#4952) 2022-06-20 10:32:52 +08:00
Calvin Yu
8e906ed3de Create SECURITY.md 2022-06-15 10:12:21 +08:00
KubeSphere CI Bot
ac36ff5752 Merge pull request #4940 from xyz-li/sa_token
create default token for service account
2022-06-09 11:32:40 +08:00
LiHui
098b77fb4c add key to queue 2022-06-09 11:13:56 +08:00
LiHui
e97f27e580 create sa token 2022-06-09 10:28:55 +08:00
KubeSphere CI Bot
bc00b67a6e Merge pull request #4938 from qingwave/typo-fix
fix some typos
2022-06-08 10:25:00 +08:00
KubeSphere CI Bot
8b0f2674bd Merge pull request #4939 from iawia002/fix-sync
Promptly handle the cluster when it is deleted
2022-06-08 10:23:43 +08:00
KubeSphere CI Bot
108963f87b Merge pull request #4941 from SinTod/master
Unified call WriteEntity func
2022-06-08 10:20:59 +08:00
KubeSphere CI Bot
6525a3c3b3 Merge pull request #4937 from zhanghw0354/master
add unit test for GetServiceTracing
2022-06-08 10:02:00 +08:00
KubeSphere CI Bot
f0cc7f6430 Merge pull request #4928 from xyz-li/gops
Add agent to report additional information.
2022-06-07 10:51:38 +08:00
LiHui
47563af08c add gops agent to ks-apiserver&&controller-manager 2022-06-07 09:45:09 +08:00
SinTod
26b871ecf4 Unified call WriteEntity func 2022-06-06 15:30:11 +08:00
Xinzhao Xu
5e02f1b86b Promptly handle the cluster when it is deleted 2022-06-06 11:31:14 +08:00
qingwave
c78ab9039a fix some typos 2022-06-06 02:43:23 +00:00
zhanghaiwen
02e99365c7 add unit test for GetServiceTracing 2022-06-02 14:46:27 +08:00
KubeSphere CI Bot
0c2a419a5e Merge pull request #4936 from xyz-li/key
Fix kubeconfig generate bug
2022-06-02 11:58:54 +08:00
LiHui
77e0373777 fix gen key type 2022-06-02 11:19:45 +08:00
KubeSphere CI Bot
04d70b1db4 Merge pull request #4921 from xyz-li/master
complete the help doc
2022-06-01 16:06:53 +08:00
KubeSphere CI Bot
86beabdb32 Merge pull request #4927 from qingwave/gateway-log-context
gateway: avoid pod log connection leak
2022-06-01 16:02:31 +08:00
LiHui
1e8cea4971 add gops 2022-06-01 15:00:33 +08:00
qingwave
107e2ec64c fix: avoid gateway pod log connection leak 2022-06-01 02:14:19 +00:00
LiHui
17b97d7ada complete the help doc 2022-05-31 10:41:25 +08:00
KubeSphere CI Bot
2758e35a4e Merge pull request #4881 from suwliang3/master
feature:test functions in package resources/v1alpha3 by building restful's re…
2022-05-29 23:23:40 +08:00
KubeSphere CI Bot
305da3c0c5 Merge pull request #4918 from anhoder/master
fix:goroutine leak when open terminal
2022-05-29 23:18:51 +08:00
KubeSphere CI Bot
e5ac3608f6 Merge pull request #4916 from ONE7live/dev_test
add some unit test for models
2022-05-29 23:17:50 +08:00
anhoder
d0933055cb fix:goroutine leak when open terminal 2022-05-27 18:25:43 +08:00
KubeSphere CI Bot
fc7cdd7300 Merge pull request #4915 from wansir/master
chore: update vendor
2022-05-27 17:47:25 +08:00
hongming
52b7fb71b2 chore: update vendor 2022-05-27 16:42:26 +08:00
ONE7live
4247387144 add some unit test for models
Signed-off-by: ONE7live <wangqi_yewu@cmss.chinamobile.com>
2022-05-27 16:10:01 +08:00
KubeSphere CI Bot
da5e4cc247 Merge pull request #4904 from xyz-li/master
add workspace to review list
2022-05-25 14:34:31 +08:00
LiHui
73852a8a4b add workspace to review list 2022-05-25 11:58:21 +08:00
suwanliang
b2be653639 run make fmt and make goimports 2022-05-24 18:37:16 +08:00
KubeSphere CI Bot
0418277b57 Merge pull request #4896 from wansir/fix-4890
fix: cluster list granted to users is incorrect
2022-05-23 17:59:52 +08:00
hongming
382be8b16b fix: cluster list granted to users is incorrect 2022-05-23 17:06:19 +08:00
KubeSphere CI Bot
32ac94a7e5 Merge pull request #4889 from xyz-li/sync
cluster not found and repo not found
2022-05-23 15:48:13 +08:00
KubeSphere CI Bot
3e381c9ad5 Merge pull request #4879 from xiaoping378/patch-1
fix unformatted log
2022-05-23 11:56:51 +08:00
LiHui
35027a346b add openpitrix Client to apiserver 2022-05-20 17:37:52 +08:00
LiHui
32b85cd625 cluster clusters 2022-05-20 11:53:51 +08:00
KubeSphere CI Bot
559539275e Merge pull request #4888 from wansir/master
refactor: remove the useless CRD
2022-05-19 15:58:58 +08:00
hongming
211fb293e0 refactor: remove the useless CRD 2022-05-19 15:43:37 +08:00
suwanliang
530b358c94 test functions in package resources/v1alpha3 by building restful's res and res 2022-05-16 18:27:06 +08:00
KubeSphere CI Bot
49cc977cf0 Merge pull request #4877 from wansir/fix-4876
Reduce unnecessary status updates
2022-05-16 17:18:06 +08:00
KubeSphere CI Bot
2b575d04aa Merge pull request #4880 from iawia002/workspace-detail-api
Add get workspace API
2022-05-16 17:17:05 +08:00
Xinzhao Xu
4a0e4ba73c update openapi 2022-05-16 16:16:36 +08:00
Xinzhao Xu
26576cc665 Add get workspace API 2022-05-16 16:14:33 +08:00
hongming
c434971140 Sync cluster status periodically 2022-05-16 16:00:54 +08:00
hongming
825a38f948 Reduce unnecessary status updates 2022-05-16 10:43:27 +08:00
xiaoping
aa78e3215c fix unformatted log 2022-05-15 21:05:58 +08:00
KubeSphere CI Bot
1c96f99072 Merge pull request #4870 from wansir/fix-4857
Fix: restricted users cannot activate manually
2022-05-12 14:08:04 +08:00
KubeSphere CI Bot
788fc508e3 Merge pull request #4868 from wansir/fix-4780
Fix: deny the blocked user request
2022-05-12 13:53:04 +08:00
KubeSphere CI Bot
0f1c815cf7 Merge pull request #4865 from weihongzhoulord/fix-gateway-4841
fix:modify the default resource reservation of gateway system
2022-05-12 12:59:04 +08:00
KubeSphere CI Bot
f9abd09f99 Merge pull request #4861 from StevenBrown008/master
fix tcp match error
2022-05-12 12:57:40 +08:00
hongming
f304ecdd01 Fix: deny the blocked user request 2022-05-12 12:17:41 +08:00
hongming
a67451a51a Fix: restricted users cannot activate manually 2022-05-12 10:00:49 +08:00
fangyunyun
ce431c53a7 Merge remote-tracking branch 'upstream/master' 2022-05-11 17:59:53 +08:00
hongzhouzi
dd836fc652 fix:modify the default resource reservation of gateway system, gateway.go typo 2022-05-11 10:50:33 +08:00
KubeSphere CI Bot
ac423922cf Merge pull request #4866 from wenchajun/gpu
Fix gpu null pointer exception
2022-05-11 10:12:38 +08:00
chengdehao
75803113f6 fix nil pointer
Signed-off-by: chengdehao <dehaocheng@yunify.com>
2022-05-10 23:36:50 +08:00
KubeSphere CI Bot
1a6bc3c890 Merge pull request #4862 from wansir/fix-4781
Fix disabled status not work for OAuth
2022-05-10 11:18:36 +08:00
hongming
0a44c30a46 Fix disabled status not work for OAuth 2022-05-09 17:11:04 +08:00
fangyunyun
0b17228017 fix tcp match error 2022-05-09 15:43:34 +08:00
KubeSphere CI Bot
499e21193c Merge pull request #4605 from iawia002/clean
Cleanup cluster controller and remove unused code
2022-05-06 16:39:02 +08:00
KubeSphere CI Bot
6f3eec23ae Merge pull request #4847 from xyz-li/master
Fix: e2e test failed
2022-05-06 16:08:02 +08:00
LiHui
3a681a28c6 update kind image 2022-05-06 14:30:26 +08:00
LiHui
f994174f75 Fix: e2e test failed 2022-05-06 10:14:32 +08:00
KubeSphere CI Bot
233829a7d5 Merge pull request #4838 from wansir/fix-4039
Fix typo
2022-05-05 09:47:30 +08:00
hongming
bc7adc1be6 Fix typo 2022-04-29 18:49:44 +08:00
KubeSphere CI Bot
446f55206e Merge pull request #4835 from wansir/fix-4039
Fix crash caused by resouce discovery failed
2022-04-29 16:40:00 +08:00
KubeSphere CI Bot
b2b1fb31d3 Merge pull request #4815 from 2hangchen/master
fix: fix the gateway variable name.
2022-04-29 15:19:00 +08:00
KubeSphere CI Bot
8d97652b13 Merge pull request #4833 from SinTod/master
fix controller-manager Dockerfile kustomize targetos
2022-04-29 15:18:58 +08:00
hongming
7603c74ebb Fix crash caused by resouce discovery failed 2022-04-29 00:03:32 +08:00
SinTod
dc10a37624 fix controller-manager Dockerfile kustomize targetos 2022-04-28 14:52:30 +08:00
KubeSphere CI Bot
ef5fcbd9ce Merge pull request #4831 from iawia002/fix-clusterclient
Double check in clusterclient if the cluster exists but is not cached
2022-04-27 17:30:45 +08:00
Pilipalaca
1e5c4c7749 make deepcopy
Signed-off-by: Pilipalaca <85749695@qq.com>
2022-04-27 15:50:46 +08:00
Xinzhao Xu
757fca8ade Double check in clusterclient if the cluster exists but is not cached 2022-04-27 15:32:31 +08:00
Pilipalaca
e90efe1c34 fix: fix the gateway variable name.
Signed-off-by: Pilipalaca <85749695@qq.com>
2022-04-21 17:13:05 +08:00
KubeSphere CI Bot
7d9563dca1 Merge pull request #4803 from polym/docs/readme
docs: update kubekey version to v2.0.0
2022-04-20 10:45:38 +08:00
hongbo.mo
eec4217fdb docs: update kubekey version to v2.0.0 2022-04-18 16:32:34 +08:00
KubeSphere CI Bot
0086e98288 Merge pull request #4784 from wanjunlei/tmp
change the default audit webhook port
2022-04-13 14:06:51 +08:00
wanjunlei
c1c98c51b2 change the default audit webhook port
Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>
2022-04-12 18:59:04 +08:00
KubeSphere CI Bot
fd22293e85 Merge pull request #4770 from f10atin9/sc_accessor
Add storageclass accessor to ks
2022-04-11 10:48:49 +08:00
f10atin9
077915b427 Fix: Updated accessor CRD resources, the previous accessorCRD did not support worksopace level limits.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-04-08 16:22:46 +08:00
f10atin9
0f89aca71d update vendor and add accessor crd
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-04-06 18:23:39 +08:00
f10atin9
f92026c606 add accessor
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-04-06 16:44:32 +08:00
KubeSphere CI Bot
52c13ae9d5 Merge pull request #4752 from iawia002/fix-vendor
Update go mod files
2022-04-05 17:22:44 +08:00
KubeSphere CI Bot
ba711de2ce Merge pull request #4751 from iawia002/fix-config
Add omitempty option to LoginHistoryMaximumEntries field to avoid it being set to 0
2022-03-30 14:46:36 +08:00
Xinzhao Xu
7f324d2aac Update go mod files 2022-03-28 17:34:45 +08:00
Xinzhao Xu
28f260e244 Add omitempty option to LoginHistoryMaximumEntries field to avoid it being set to 0 2022-03-28 17:09:13 +08:00
KubeSphere CI Bot
7bd9120e43 Merge pull request #4734 from iawia002/validate-cluster
Check if the cluster is the same when updating kubeconfig
2022-03-21 15:26:24 +08:00
KubeSphere CI Bot
5af3f14b2a Merge pull request #4710 from iawia002/cluster-role
Add ClusterRole field in the multicluster option
2022-03-21 10:05:25 +08:00
Xinzhao Xu
146cff34a1 Check if the cluster is the same when updating kubeconfig 2022-03-17 16:59:49 +08:00
KubeSphere CI Bot
9bdb986f4b Merge pull request #4721 from iawia002/workspace-api
Refactor workspace API and introduced tenant v1alpha3 version
2022-03-15 12:07:47 +08:00
KubeSphere CI Bot
84df2e9e59 Merge pull request #4718 from f10atin9/snapshot
Add "snapshot-count" annotation for volumesnapshotClass
2022-03-10 16:11:14 +08:00
f10atin9
d871f0e6ee Test: update ListVolumeSnapshotClassTest
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-03-09 14:59:55 +08:00
Xinzhao Xu
09d0eef61a update codegen 2022-03-09 14:31:04 +08:00
Xinzhao Xu
6a3e1ac099 Refactor workspace API and introduced tenant v1alpha3 version 2022-03-09 14:12:08 +08:00
f10atin9
d224df444c Fix: Modified the function to get the list of snapshots in countVolumeSnapshots.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-03-09 14:07:39 +08:00
f10atin9
902997b207 Fix: add deepcopy
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-03-09 11:14:26 +08:00
Xinzhao Xu
1e760b0069 Cleanup cluster controller and remove unused code 2022-03-09 10:52:33 +08:00
f10atin9
2e34bdf9a2 Add "snapshot-count" annotation for volumesnapshotClass
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-03-09 10:30:47 +08:00
mango
f018a23023 chore: add licenses check tools (#4706)
* feat: check licenses header with skywalking-eye and support check tools.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* feat: check licenses header with skywalking-eye and support check tools.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* feat: check licenses header with skywalking-eye and support check tools.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* remove verify-licenses because verify-all exist.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* update modules.txt

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* revert go.mod

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* update vendor directory.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* revert go.sum

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* revert go.sum

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* ignore `pkg/controller/application/status.go`

Signed-off-by: mango <xu.weiKyrie@foxmail.com>

* add license header.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>
2022-03-09 10:25:13 +08:00
KubeSphere CI Bot
a76ba958cb Merge pull request #4701 from f10atin9/snapshot
Add "readyToUse" filter field for volumesnapshotcontent
2022-03-09 10:24:12 +08:00
KubeSphere CI Bot
d6424eee67 Merge pull request #4695 from wansir/fix-4442
Fix cannot change user status to disabled
2022-03-09 10:22:13 +08:00
Xinzhao Xu
0065d0dca3 remove the unused EnableFederation field 2022-03-07 18:32:56 +08:00
Xinzhao Xu
ca4661a686 Add ClusterRole field in the multicluster option 2022-03-07 18:32:04 +08:00
KubeSphere CI Bot
7281996603 Merge pull request #4711 from junotx/proc-monitor
add container processes/threads metrics
2022-03-07 16:31:12 +08:00
KubeSphere CI Bot
19048d52dc Merge pull request #4679 from iawia002/cluster-name
Set the name of the current cluster into the kubesphere-config configmap
2022-03-07 13:22:11 +08:00
KubeSphere CI Bot
e97a66ba5e Merge pull request #4686 from JohnNiang/feat/proxy-devops-v1alpha-apis
Proxy DevOps APIs with group name and version
2022-03-07 13:21:45 +08:00
junot
b205529bd6 add container processes/threads metrics
Signed-off-by: junot <junotxiang@kubesphere.io>
2022-03-07 11:09:29 +08:00
KubeSphere CI Bot
2e596d5340 Merge pull request #4705 from junotx/device-monitor
add node device usage metrics
2022-03-04 14:52:44 +08:00
KubeSphere CI Bot
cffb60328f Merge pull request #4691 from larryliuqing/metrics-sort-issue
Fix the "index out of range" issue when sort metrics
2022-03-03 09:28:43 +08:00
f10atin9
ca39efe137 Add "readyToUse" filter field to volumesnapshotcontent
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-03-02 18:02:57 +08:00
junot
15e7f36e61 add node device usage metrics
Signed-off-by: junot <junotxiang@kubesphere.io>
2022-03-02 17:41:30 +08:00
KubeSphere CI Bot
003b96bf7a Merge pull request #4660 from f10atin9/pvc_autoresizer
add pvc-autoresizer controller to ks-controller-manager
2022-03-02 09:41:43 +08:00
Xinzhao Xu
7ae117cbbd Update the clusterName field when the kubesphere-config configmap is updated 2022-03-01 16:22:02 +08:00
hongming
4457f61a22 Fix cannot change user status to disabled 2022-03-01 14:08:04 +08:00
f10atin9
dda5432e14 Rename workload-restarter to pvc-workload-restarter
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-02-28 14:01:07 +08:00
johnniang
0e9d30ffe4 Add gitops.kubesphere.io group proxy 2022-02-28 11:06:20 +08:00
larryliuqing
615298c530 correct the variable name 2022-02-25 11:30:40 +08:00
larryliuqing
d275a007b9 Merge remote-tracking branch 'origin/metrics-sort-issue' into metrics-sort-issue 2022-02-25 11:12:06 +08:00
larryliuqing
29d2858215 Fix the "index out of range" issue when sort metrics 2022-02-25 11:11:46 +08:00
larryliuqing
f37495bc32 Fix the "index out of range" issue when sort metrics 2022-02-25 09:35:47 +08:00
johnniang
291d35cf93 Refactor DevOps API proxy
Signed-off-by: johnniang <johnniang@fastmail.com>
2022-02-24 17:31:55 +08:00
f10atin9
a810256f30 fix prometheusURL
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-02-24 16:19:52 +08:00
f10atin9
fdf5d73cb1 add some constants, fixed prometheusURL hard code
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-02-24 16:16:23 +08:00
f10atin9
7f5a90bf52 add pvc-autoresizer controller and workload restarter controller.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-02-24 16:16:23 +08:00
f10atin9
5ab8515312 update vendor, add pvc-autoresizer to the vendor.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-02-24 16:16:23 +08:00
Xinzhao Xu
e966a1da6f Set the name of the current cluster into the kubesphere-config configmap 2022-02-24 11:51:23 +08:00
KubeSphere CI Bot
970780993e Merge pull request #4681 from iawia002/yaml
Unify the omitempty configuration of YAML annotation
2022-02-24 11:33:41 +08:00
KubeSphere CI Bot
8bbccabb97 Merge pull request #4659 from x893675/master
feat: live-reload when configuration changed
2022-02-24 11:01:41 +08:00
johnniang
35cf45a0b7 Fix verification error and failing tests
Signed-off-by: johnniang <johnniang@fastmail.com>
2022-02-23 17:04:11 +08:00
Xinzhao Xu
c53001c5dc Unify the omitempty configuration of YAML annotation 2022-02-23 16:41:51 +08:00
johnniang
ef1d0fdf1d Proxy DevOps APIs with version v1alpha1
Signed-off-by: johnniang <johnniang@fastmail.com>
2022-02-23 16:03:16 +08:00
x893675
f5bcbda0c9 optimize config package
Signed-off-by: x893675 <x893675@icloud.com>
2022-02-22 11:21:03 +08:00
KubeSphere CI Bot
f50de9af65 Merge pull request #4651 from iawia002/validation
Use the kube-system UID to identify if the member cluster already exists
2022-02-21 10:02:40 +08:00
KubeSphere CI Bot
fe1d98879a Merge pull request #4678 from wansir/fix-4676
Fix registry verification failed
2022-02-17 15:29:16 +08:00
hongming
fecc331697 Fix registry verification failed 2022-02-17 14:19:38 +08:00
Xinzhao Xu
7deb9c2746 update codegen 2022-02-16 11:13:59 +08:00
Xinzhao Xu
d3ed81059f Use the kube-system UID to identify if the member cluster already exists 2022-02-16 11:09:52 +08:00
KubeSphere CI Bot
794129d056 Merge pull request #4669 from iawia002/codegen
Update automatically generated files
2022-02-16 11:08:39 +08:00
Xinzhao Xu
57f51b7ca1 Update automatically generated files 2022-02-14 16:30:58 +08:00
KubeSphere CI Bot
80fc715eea Merge pull request #4664 from lining2020x/fixtypo
fix typo in comment
2022-02-11 11:47:09 +08:00
Ning Li
64c512faf0 fix typo in comment
Signed-off-by: Ning Li <lining2020x@163.com>
2022-02-11 11:28:28 +08:00
x893675
2a521bb157 add feature for live-reload when configuration changed
Signed-off-by: x893675 <x893675@icloud.com>
2022-02-08 16:28:01 +08:00
KubeSphere CI Bot
b8e1261989 Merge pull request #4643 from wenchajun/eserror
Optimize the error message
2022-01-28 11:04:40 +08:00
chengdehao
37369334f1 Optimize the error message
Signed-off-by: chengdehao <dehaocheng@yunify.com>
2022-01-25 11:38:51 +08:00
KubeSphere CI Bot
77d14fe4dc Merge pull request #4596 from f10atin9/volumesnapshotcontent
Support snapshotcontent management
2022-01-20 11:46:36 +08:00
KubeSphere CI Bot
1845eb2db5 Merge pull request #4617 from RolandMa1986/crd-api
feat: Serving CRD in ks apiserver
2022-01-20 11:44:37 +08:00
KubeSphere CI Bot
9fbb69faa4 Merge pull request #4478 from zhu733756/convert-kubeedge
Convert compoent  kubeedge to edgeruntime
2022-01-19 18:58:37 +08:00
KubeSphere CI Bot
96116f813a Merge pull request #4626 from RolandMa1986/fix-4397
Delete gateway when namespace is deleted
2022-01-19 16:26:36 +08:00
KubeSphere CI Bot
b9a274b500 Merge pull request #4621 from junotx/upgrade-prom-stack
Adjust metrics query for monitoring components upgrade
2022-01-18 20:13:36 +08:00
Roland.Ma
3ed9cfe6ad delete gateway when namespace is deleted
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2022-01-18 02:55:28 +00:00
zhu733756
e42d9517b7 make generic proxy can be marked as deprecated
Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
2022-01-17 16:29:44 +08:00
KubeSphere CI Bot
6bd5061872 Merge pull request #4446 from zhu733756/master
Support importing Grafana templates to the workspace level.
2022-01-17 15:59:36 +08:00
zhu733756
d5861eeac5 rename debug scripts
Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
2022-01-17 11:02:52 +08:00
zhu733756
600a3de051 convert grafana templates to workspace level
Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
2022-01-17 11:02:52 +08:00
zhu733756
b6e960766a support api group edgeruntime.kubesphere.io, deprecate api group kubeedge.kubesphere.io
Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
2022-01-14 21:26:48 +08:00
junot
8938b96673 update metrics to fit upgraded monitoring components
Signed-off-by: junot <junotxiang@kubesphere.io>
2022-01-14 17:42:33 +08:00
KubeSphere CI Bot
c6672b7885 Merge pull request #4618 from RolandMa1986/helm-clear
Remove unused helm template
2022-01-14 11:41:35 +08:00
Roland.Ma
17138c8b5a remove unused helm template
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2022-01-13 08:25:45 +00:00
Roland.Ma
0ec32f29fb feat: Serving CRD in ks apiserver
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2022-01-13 06:29:35 +00:00
KubeSphere CI Bot
365924e76b Merge pull request #4599 from dkeven/fixmappanic
Fix: deepcopy before mutating shared objects
2022-01-11 13:56:35 +08:00
KubeSphere CI Bot
320362b588 Merge pull request #4579 from lynxcat/master
Add a function to shell access to the node in the kubesphere
2022-01-10 16:30:34 +08:00
KubeSphere CI Bot
bce14cc874 Merge pull request #4602 from chaunceyjiang/fix_4601
fix helm_controller assignment to entry in nil map
2022-01-10 15:40:33 +08:00
lynxcat
1b382e81cb update check permission
Signed-off-by: lynxcat <lynxcatdeng@gmail.com>
2022-01-10 15:36:00 +08:00
lynxcat
5e5c9a8d04 Update pkg/kapis/terminal/v1alpha2/handler.go
Co-authored-by: hongming <coder.scala@gmail.com>
2022-01-10 15:34:04 +08:00
chaunceyjiang
4e7d156095 fix helm_controller assignment to entry in nil map 2022-01-10 11:50:12 +08:00
dkeven
d1b0beffd6 Fix: deepcopy before mutating shared objects
Signed-off-by: dkeven <keven@kubesphere.io>
2022-01-10 11:27:50 +08:00
KubeSphere CI Bot
ec0984f7ad Merge pull request #4584 from iawia002/check-kubeconfig
Sync the expiration time of kubeconfig cert file of the cluster
2022-01-10 10:45:33 +08:00
lynxcat
6ef7010533 delete channel
Signed-off-by: lynxcat <lynxcatdeng@gmail.com>
2022-01-06 17:27:24 +08:00
f10atin9
ee35f54cb8 add snapshotcontent func
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2022-01-06 15:44:13 +08:00
Xinzhao Xu
7bbefdd30c Sync the expiration time of kubeconfig cert file of the cluster 2022-01-06 12:33:05 +08:00
lynxcat
0c1ba9e32e formatting code
Signed-off-by: lynxcat <lynxcatdeng@gmail.com>
2022-01-06 09:52:37 +08:00
lynxcat
78730a2b96 use wait.Poll to watch pod status
Signed-off-by: lynxcat <lynxcatdeng@gmail.com>
2022-01-06 09:45:02 +08:00
KubeSphere CI Bot
f0210193c1 Merge pull request #4460 from FeynmanZhou/master
update quick start and feature list in README
2022-01-05 16:31:31 +08:00
KubeSphere CI Bot
c45bc032e8 Merge pull request #4581 from RolandMa1986/fix-istio
fix: the configuration of the Istio virtualservice is overwritten
2022-01-05 15:38:31 +08:00
KubeSphere CI Bot
a89a448bee Merge pull request #4578 from f10atin9/snapshotclass
Support snapshotclass management
2022-01-05 15:34:31 +08:00
lynxcat
1342a9abe1 add shell access to node
Signed-off-by: lynxcat <lynxcatdeng@gmail.com>
2022-01-05 15:14:57 +08:00
Roland.Ma
5a4e4aa316 fix 4287:the configuration of the Istio virtualservice is overwritten
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-12-30 06:26:11 +00:00
KubeSphere CI Bot
e9a62896f7 Merge pull request #4551 from chaunceyjiang/fix_4548
upgrade ingress nginx version
2021-12-28 11:52:28 +08:00
KubeSphere CI Bot
d5260109d8 Merge pull request #4562 from iawia002/kubeconfig
Add update cluster kubeconfig API
2021-12-28 11:32:24 +08:00
f10atin9
c29722ce7a add snapshotclass
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-12-28 11:08:32 +08:00
Xinzhao Xu
883097a3ad Add update cluster kubeconfig API 2021-12-27 11:57:51 +08:00
KubeSphere CI Bot
c88066c212 Merge pull request #4560 from RolandMa1986/fix-4490
fix: All ports should be added to VitrualService
2021-12-27 11:53:28 +08:00
KubeSphere CI Bot
1bbecb5d6e Merge pull request #4572 from songf0011/songf0011
fix: spell mistake: hostClusterNmae -> hostClusterName
2021-12-27 11:42:24 +08:00
songf0011
e86c5dea96 fix: fix spell mistake: hostClusterNmae -> hostClusterName 2021-12-26 00:00:46 +08:00
FeynmanZhou
3861ad0513 update quick start and feature list in README
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2021-12-25 12:59:32 +08:00
chaunceyjiang
a80c94e352 upgrade ingress nginx version 2021-12-23 16:11:16 +08:00
Roland.Ma
ae74cdee3a fix: all ports should be added to VitrualService
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-12-20 09:07:27 +00:00
KubeSphere CI Bot
e1df8bc5bb Merge pull request #4512 from live77/feat/selective_enable_controllers
add --controllers option in ks-controller-manager
2021-12-13 18:51:24 +08:00
KubeSphere CI Bot
f8e4e96f56 Merge pull request #4528 from lxm/feature/cluster-external-access
feat: add ExternalKubeAPIEnabled to cluster
2021-12-13 17:41:05 +08:00
live77
522d2db3a5 run gofmt to fix format. 2021-12-11 09:03:39 +08:00
live77
79bfab0ca9 rename ControllerSelectors to ControllerGates 2021-12-11 08:54:13 +08:00
lxm
53c48995a7 feat: add ExternalKubeAPIEnabled to cluster
Signed-off-by: lxm <lxm.xupt@gmail.com>
2021-12-10 15:50:46 +08:00
live77
97c02652bc fix code format 2021-12-06 22:04:22 +08:00
live77
108284d3cd fix build & unittest for helm repo controller 2021-12-06 21:56:29 +08:00
KubeSphere CI Bot
d202425a94 Merge pull request #4495 from zryfish/cleanup
remove unused files
2021-12-06 13:55:21 +08:00
KubeSphere CI Bot
5faa5b6536 Merge pull request #4476 from anhoder/master
fix: generate manifests
2021-12-06 11:18:57 +08:00
live77
81db894741 add --controllers option in ks-controller-manager
imple controller enable/disable check logic
add unittest for selective controller enable/disable
move all controllers init code to a single place
2021-12-05 16:06:08 +08:00
zryfish
bdb4763d2a update vendor 2021-12-01 15:16:39 +08:00
zryfish
f1803c9fda remove unused files 2021-12-01 11:48:55 +08:00
KubeSphere CI Bot
6ed02d3059 Merge pull request #4481 from live77/bug/password_validator
fix: Account password settings can have no capital letters
2021-11-30 15:44:19 +08:00
anhoder
f6c1261900 rm: devops 2021-11-29 18:16:45 +08:00
live77
393a3e3be0 add comment for password pattern explaination. 2021-11-27 13:22:33 +08:00
live77
7d68cbd18e fix: enable user password pattern checking via CRD validation. 2021-11-27 13:22:33 +08:00
anhoder
3760ed2325 fix: generate manifests 2021-11-26 13:56:54 +08:00
KubeSphere CI Bot
87efbfdfa3 Merge pull request #4471 from wansir/fix-unittest
fix groupbinding controller unittest
2021-11-25 14:41:15 +08:00
KubeSphere CI Bot
f67e1baf34 Merge pull request #4455 from wangyao-cmss/fix_readme
fix hyperlink format in README_zh.md
2021-11-24 17:27:09 +08:00
hongming
3543573c9d fix groupbinding controller unittest 2021-11-24 16:37:33 +08:00
KubeSphere CI Bot
d771b357c0 Merge pull request #4463 from 123liubao/hotfix/remove-mysql-package
remove obsolete package pkg/simple/client/mysql
2021-11-23 10:29:07 +08:00
123liubao
25fbf2cbb7 remove obsolete package pkg/simple/client/mysql
Signed-off-by: 123liubao <chenly_61@163.com>
2021-11-22 15:59:56 +08:00
KubeSphere CI Bot
53733e63e5 Merge pull request #4402 from Lnek/patch-1
Typo fixing in the README_zh.md file
2021-11-22 10:09:06 +08:00
KubeSphere CI Bot
96af77b754 Merge pull request #4443 from 123liubao/hotfix/fix-version-error
fix : modify the version of ks core components
2021-11-22 09:59:06 +08:00
KubeSphere CI Bot
8005a4729e Merge pull request #4457 from RolandMa1986/fix-4451
Namespace should not be filterd for Cluster Gateway
2021-11-18 19:16:40 +08:00
Roland.Ma
3364551b03 Namespace should not be filterd for Cluster Gateway
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-11-18 03:49:44 +00:00
wangyao
20c6752f3b fix hyperlink format in README_zh.md 2021-11-17 22:54:40 +08:00
123liubao
08c772ca72 fix:Add app version parameter. 2021-11-15 16:40:23 +08:00
123liubao
7a27c79f60 fix : modify the version.
Signed-off-by: 123liubao <chenly_61@163.com>
2021-11-12 14:09:12 +08:00
KubeSphere CI Bot
a41a942819 Merge pull request #4436 from RolandMa1986/fix-ldap
fix: users can't login with ldap provider
2021-11-12 09:41:10 +08:00
KubeSphere CI Bot
8a0403e972 Merge pull request #4434 from iawia002/query
Support query pods by status
2021-11-11 16:18:10 +08:00
Roland.Ma
23c3a0b975 fixs users can't login with ldap provider
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-11-11 02:58:22 +00:00
Xinzhao Xu
61b037d291 Support query pods by status 2021-11-11 10:15:16 +08:00
Eric Wang
18bee023a2 Create README_zh.md
typo
2021-11-10 17:17:18 +08:00
KubeSphere CI Bot
ab807ea17c Merge pull request #4419 from FeynmanZhou/master
Update the download version to 3.2.0
2021-11-08 16:14:09 +08:00
KubeSphere CI Bot
8e88147a44 Merge pull request #4418 from RolandMa1986/fix-overide-image
Allows to override nginx ingress controller image in kubesphere config
2021-11-05 14:54:08 +08:00
FeynmanZhou
5380e39107 update the download version to 3.2.0
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2021-11-04 20:44:15 +08:00
KubeSphere CI Bot
6c558d8e3d Merge pull request #4401 from FeynmanZhou/master
add kubesphere icon animation and katacoda scenario
2021-11-04 19:16:25 +08:00
FeynmanZhou
8ac33adde0 Merge branch 'master' of https://github.com/kubesphere/kubesphere 2021-11-04 19:01:17 +08:00
Roland.Ma
4050e5d388 allow to override docker image in kubesphere config
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-11-03 09:36:40 +00:00
KubeSphere CI Bot
4d87f5969c Merge pull request #4406 from RolandMa1986/fix-quility
Fix sonarqube scan results
2021-11-02 15:13:07 +08:00
Roland.Ma
d1adef00f6 fix bugs reported by sonarqube
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-11-01 09:01:49 +00:00
Eric Wang
643e932204 Update README_zh.md
typo
2021-10-31 23:21:33 +08:00
FeynmanZhou
ee458b8a7d add kubesphere icon animation and katacoda scenario
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2021-10-31 17:28:43 +08:00
KubeSphere CI Bot
eee3b7d1a3 Merge pull request #4399 from styshoo/master
enable es v7 TrackTotalHits parameter, make sure kubesphere cosole wo…
2021-10-30 21:51:20 +08:00
styshoo
a9f28a0805 enable es v7 TrackTotalHits parameter, make sure kubesphere cosole would get correct total number 2021-10-28 18:39:16 +08:00
KubeSphere CI Bot
18527f895e Merge pull request #4385 from liuan1986/master
if error is not NULL,Maybe return error would be better.
2021-10-22 12:30:11 +08:00
KubeSphere CI Bot
8ab489c51b Merge pull request #4377 from 123liubao/hotfix/fix-4367
Refactor the Chinese version of README
2021-10-22 12:20:11 +08:00
KubeSphere CI Bot
5a855a8306 Merge pull request #4387 from RolandMa1986/fix-e2e
fix e2e auth error
2021-10-22 11:19:11 +08:00
123liubao
d865305983 Modify the document 2021-10-22 10:10:18 +08:00
Roland.Ma
64a4b65d66 fix e2e auth error
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-10-22 01:27:17 +00:00
KubeSphere CI Bot
d341e55b8b Merge pull request #4382 from wansir/master
Fix failed to delete workspace in multi-cluster enviroment
2021-10-21 17:40:02 +08:00
liuan
8657cd31b2 if error is not NULL,return error 2021-10-21 17:23:42 +08:00
hongming
20163dd795 Fix no kind FederatedGroupBinding is registered 2021-10-21 11:49:47 +08:00
123liubao
3a50e1c244 Optimized code 2021-10-20 15:58:29 +08:00
123liubao
738a451433 URL modified to Chinese 2021-10-20 15:29:15 +08:00
KubeSphere CI Bot
744233b3a3 Merge pull request #4374 from iawia002/bump-controller-runtime-version-0.9
Bump controller-runtime version to the latest of release-0.9
2021-10-20 14:55:03 +08:00
iawia002
dae7d92dab Bump controller-runtime version to the latest of release-0.9 2021-10-20 10:11:21 +08:00
iawia002
2eeb7262c6 update vendor 2021-10-20 10:09:48 +08:00
123liubao
840a3d25f8 fix:Refactor the Chinese version of README 2021-10-19 23:17:31 +08:00
KubeSphere CI Bot
9720aa9806 Merge pull request #4365 from wansir/fix-4364
Fix namespace cannot be deleted after workspace has been deleted
2021-10-18 09:16:02 +08:00
hongming
0e3159e1e8 Fix namespace cannot be deleted after workspace has been deleted 2021-10-15 15:12:28 +08:00
zryfish
edcd8e1449 fix gitMajor and gitMinor missing in version api (#4361)
* fix version missing
* suppress shellcheck warnings
2021-10-13 17:40:54 +08:00
KubeSphere CI Bot
98b9009a58 Merge pull request #4351 from wansir/fix-regression-bug
Fix NPE in user_controller
2021-10-13 15:04:06 +08:00
KubeSphere CI Bot
e82236366d Merge pull request #4356 from RolandMa1986/feat-gateway-log-export
Supports to export gateway logs
2021-10-13 15:04:00 +08:00
hongming
776593001e Fix NPE in user_controller 2021-10-13 11:02:43 +08:00
Roland.Ma
6dc99e181e supports to export gateway logs
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-10-12 08:15:58 +00:00
KubeSphere CI Bot
735f0c7731 Merge pull request #4337 from RolandMa1986/fix-4333
Fix: support fuzzy query with ObjectMeta for gateway query api
2021-10-11 13:27:59 +08:00
KubeSphere CI Bot
2af76aff79 Merge pull request #4325 from wansir/fix-regression-bug
Fix failed to delete rolebindings
2021-10-11 09:43:59 +08:00
KubeSphere CI Bot
7a0dafd59d Merge pull request #4331 from wansir/fix-remote-ip
Fix incorrect source IP
2021-10-10 22:09:59 +08:00
KubeSphere CI Bot
813c341574 Merge pull request #4342 from RolandMa1986/fix-metric
Use regex query instead of equal in promethues query
2021-10-09 19:40:56 +08:00
Roland.Ma
59e03a0c19 append status to all gateways
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-10-09 10:01:49 +00:00
Roland.Ma
2d066f86d4 use regex query instead of equal
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-10-09 08:35:09 +00:00
KubeSphere CI Bot
b94c7966d1 Merge pull request #4336 from LinuxSuRen/fix-buildx-err
Fix the docker build error due to missing buildx setting
2021-10-09 09:39:55 +08:00
Roland.Ma
6b3af2d19d fuzzy query with defautl ObjectMeta
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-10-09 01:13:44 +00:00
rick
d8fc168948 Fix the docker build error due to missing buildx setting
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-10-08 23:06:59 +08:00
hongming
1641b9920b Fix incorrect source IP 2021-10-08 16:19:27 +08:00
hongming
1956f83af0 Fix failed to delete rolebindings 2021-10-08 11:17:02 +08:00
KubeSphere CI Bot
22a8bebcae Merge pull request #4321 from mazak-ui/master
Updating readme CNCF deprecated links
2021-10-07 16:57:54 +08:00
mazak-ui
d0ae0f210f Update CNCF Landscape URL
Updating the deprecated link, as it is currently redirecting to the new one and an orange banner appears.
2021-10-03 09:11:37 -05:00
mazak-ui
8ef0605858 Update CNCF Landscape URL
Updating the deprecated link, as it is currently redirecting to the new one and an orange banner appears.
2021-10-03 09:10:36 -05:00
zryfish
6f434252df fix missing constants (#4308) 2021-09-29 14:25:01 +08:00
zryfish
185ab75053 update vendor directory (#4305) 2021-09-29 13:50:34 +08:00
zryfish
84f66199ed add kind-e2e to Makefile (#4304) 2021-09-29 12:11:29 +08:00
KubeSphere CI Bot
22ae83a431 Merge pull request #4250 from xyz-li/app_store
Dynamically load helm app into app-store
2021-09-29 10:14:54 +08:00
LiHui
09fc2867c4 remove mathutil.Max 2021-09-29 09:35:18 +08:00
KubeSphere CI Bot
60af01c10d Merge pull request #4302 from pixiake/master
Add scheduling parameters for ks-core chart
2021-09-28 19:45:54 +08:00
pixiake
1bd8ede93d Add scheduling parameters for ks-core chart
Signed-off-by: pixiake <guofeng@yunify.com>
2021-09-28 18:18:43 +08:00
KubeSphere CI Bot
1cf3493e8f Merge pull request #4290 from f10atin9/capability
update capability_controller.go, make sure that annotations is genera…
2021-09-28 18:13:55 +08:00
zryfish
e83b77dc3a fix workflow syntax error (#4301) 2021-09-28 18:12:11 +08:00
zryfish
ef398dd56f simply github workflow since we migrate most of CI steps to prow (#4299) 2021-09-28 17:54:07 +08:00
f10atin9
60cd523a0f [fix] fix update logic
Now controller will judge whether the storageClassClient need to send the update request.

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-28 16:20:10 +08:00
KubeSphere CI Bot
09ef175e90 Merge pull request #4286 from RolandMa1986/feat-gateway-logging
Search gateway logs with ES
2021-09-28 15:25:55 +08:00
f10atin9
be5421f00b update capability_controller.go, make sure that annotations is generated correctly.StorageClass without csiDriver will no longer generate false annotations.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-27 16:42:19 +08:00
LiHui
ad69b08a75 add display fields
Signed-off-by: LiHui <andrewli@kubesphere.io>
2021-09-27 15:44:00 +08:00
LiHui
4eb5401f76 calculate the category for the app
Signed-off-by: LiHui <andrewli@kubesphere.io>
2021-09-27 15:35:29 +08:00
LiHui
745ca088a7 add built-in repo to dynamiclly load app into app-store
Signed-off-by: LiHui <andrewli@kubesphere.io>
2021-09-27 15:35:29 +08:00
LiHui
b8d85fb75c add sync period to helm repo
Signed-off-by: LiHui <andrewli@kubesphere.io>
2021-09-27 15:35:29 +08:00
KubeSphere CI Bot
bab5cf27e3 Merge pull request #4284 from RolandMa1986/fix-ingress
update ingress version in ks-core chart
2021-09-27 15:19:53 +08:00
Roland.Ma
fb2e557baa remove docker mount
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-27 03:23:42 +00:00
Roland.Ma
28f6784aff Search gateway logs with ES
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-26 10:33:34 +00:00
Roland.Ma
5ad7d16788 update ingress version in ks-core chart
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-26 07:36:52 +00:00
KubeSphere CI Bot
15205cbc40 Merge pull request #4271 from LinuxSuRen/fix-am-devops-client
Fix the devopsProjectLister is nil
2021-09-24 11:51:54 +08:00
KubeSphere CI Bot
9734c99508 Merge pull request #4273 from RolandMa1986/fix-4265
fix: duplicated items show in the list api
2021-09-24 11:49:54 +08:00
Roland.Ma
49204f64be fix: duplicated items show in the list api
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-24 02:08:13 +00:00
KubeSphere CI Bot
cbfdb545ab Merge pull request #4254 from wansir/fix-regression-bug
fix regression bug failed to create federateduser
2021-09-24 08:59:54 +08:00
rick
182c4acbbb Fix the devopsProjectLister is nil
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-09-23 19:32:20 +08:00
KubeSphere CI Bot
a56368e125 Merge pull request #4264 from RolandMa1986/feat-gateway-affinity
feat: add default gateway pod affinity
2021-09-23 13:59:54 +08:00
Roland.Ma
949b1c790b add default pod antiaffinity
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-22 09:28:11 +00:00
hongming
b087afed65 fix regression bug failed to create federateduser
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-18 16:02:13 +08:00
KubeSphere CI Bot
d9c6a75f65 Merge pull request #3525 from wansir/oidc-protocol
support OIDC protocol
2021-09-17 20:05:52 +08:00
hongming
97326a89b9 add userinfo endpoint
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-17 18:03:32 +08:00
hongming
8c5c6a7dee support OIDC protocol
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-17 16:39:21 +08:00
hongming
4b5b1c64bc Refactor authenticator
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-17 16:39:20 +08:00
KubeSphere CI Bot
83df7d1ffd Merge pull request #4228 from wansir/fix-4167
Fix inconsistent user status in member cluster
2021-09-17 16:09:52 +08:00
KubeSphere CI Bot
0cdbe3821f Merge pull request #4238 from wansir/feat-4177
Support skip information reconfirm when using external IDP
2021-09-17 09:18:51 +08:00
KubeSphere CI Bot
47d891a6bd Merge pull request #4243 from RolandMa1986/feat-gateway-pods
feat: get gateway's workload and status
2021-09-16 22:32:52 +08:00
KubeSphere CI Bot
511d0d02ff Merge pull request #4227 from RolandMa1986/feat-gateway-matrics
feat: ingress metrics query apis
2021-09-16 22:30:52 +08:00
Roland.Ma
e3a14ca299 retrive pods and logs by gateway
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-16 07:21:08 +00:00
Roland.Ma
81c19701ef append service status of the gateway
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-16 07:20:23 +00:00
KubeSphere CI Bot
e44f4ec81d Merge pull request #4216 from wenchajun/notification
Add notification setting validation API
2021-09-16 14:25:51 +08:00
root
c455afeccf Add notification setting validation API
Signed-off-by: root <dehaocheng@yunify.com>
2021-09-16 14:21:06 +08:00
hongming
cb947ce505 Support skip information reconfirm when using external IDP
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-16 11:46:02 +08:00
hongming
559a378ca4 Fix inconsistent user status in member cluster
Signed-off-by: hongming <hongming@kubesphere.io>
2021-09-16 10:20:42 +08:00
Roland.Ma
19ac4bc2b0 cpu and memory matric
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-15 09:01:59 +00:00
Roland.Ma
4b4c6e0f79 add duration parameter
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-15 06:54:05 +00:00
KubeSphere CI Bot
8586e36e52 Merge pull request #4224 from yuswift/validate-name
add validation for host cluster name
2021-09-15 10:48:51 +08:00
KubeSphere CI Bot
f0ea384a47 Merge pull request #4230 from RolandMa1986/fix-gateway-upgrade
feat: upgrade gateway with all legacy settings
2021-09-15 10:35:51 +08:00
KubeSphere CI Bot
7f2397678d Merge pull request #4225 from zhu733756/master
feat: integrate API GPU kinds
2021-09-14 18:47:51 +08:00
zhu733756
eb64401e8c fix gpu options stripEmptyOptions
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-09-14 16:23:36 +08:00
zhu733756
48f63c3da0 feat: integrate API GPU kinds to group config.kubesphere.io
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-09-14 15:53:12 +08:00
KubeSphere CI Bot
fa4c899667 Merge pull request #4220 from yuswift/default_name
support setting cluster name under single cluster scenario
2021-09-13 10:20:51 +08:00
Roland.Ma
2219fd3041 format imports
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-10 10:32:17 +00:00
Roland.Ma
57eb59e8c7 feat: upgrade gateway with lagaccy configmap configs
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
2021-09-10 09:06:06 +00:00
Roland.Ma
1ee5e49ac0 feat: ingress metrics query apis
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-09-10 02:13:22 +00:00
KubeSphere CI Bot
565bf0d496 Merge pull request #4223 from junotx/master
add etcd_server_is_leader metric to query
2021-09-09 17:35:12 +08:00
yuswift
afca5672d6 add validation for cluster name
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-09-09 15:20:56 +08:00
yuswift
854c036a58 support setting cluster name under signle cluster scenario
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-09-09 11:49:53 +08:00
junot
c1dfd9937b add etcd_server_is_leader metric to query
Signed-off-by: junot <junotxiang@yunify.com>
2021-09-09 11:37:40 +08:00
KubeSphere CI Bot
12e5131aaf Merge pull request #4222 from yuswift/webhook
upgrade ValidatingWebhookConfiguration to v1
2021-09-09 11:34:16 +08:00
KubeSphere CI Bot
ff8df62b88 Merge pull request #4205 from f10atin9/update_csiDriver
Update csi driver apiVersion
2021-09-09 11:33:15 +08:00
yuswift
8741c6014a upgrade ValidatingWebhookConfiguration to v1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-09-08 18:03:56 +08:00
KubeSphere CI Bot
b0506c35a4 Merge pull request #4128 from xyz-li/cleanup_app
clean up app when workspace is deleted
2021-09-07 16:58:15 +08:00
KubeSphere CI Bot
3797049cba Merge pull request #4208 from RolandMa1986/feat-gateway-image
feat: package gateway helm chart into docker image
2021-09-07 15:14:15 +08:00
KubeSphere CI Bot
f88e5811d5 Merge pull request #4215 from dkeven/moveresourcegetter
Move scope-misplaced resource getters to the right place
2021-09-07 15:13:15 +08:00
f10atin9
22b77960c9 update apiserver
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-07 14:18:37 +08:00
f10atin9
a82617af5f remove snapshotter v3
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 18:08:08 +08:00
f10atin9
8e4d729f79 resolve conflicted
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 18:05:59 +08:00
f10atin9
1755ac5443 update snapshotter
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 18:05:59 +08:00
f10atin9
d99434f60d update csiDriver apiVersion
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 18:05:59 +08:00
f10atin9
b68ff57e60 update csiDriver apiVersion
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 18:05:59 +08:00
KubeSphere CI Bot
9455ab92a9 Merge pull request #4209 from f10atin9/manage_pv
Manage pv in console
2021-09-06 17:21:15 +08:00
KubeSphere CI Bot
59c633fb5d Merge pull request #4193 from RolandMa1986/feat-gateway-api
Feat: add gateway api
2021-09-06 17:20:15 +08:00
KubeSphere CI Bot
15edef636f Merge pull request #4211 from yuswift/host-name
feature: support setting host cluster name
2021-09-06 16:29:15 +08:00
dkeven
89c792b584 Move scope-misplaced resource getters to the right place
Signed-off-by: dkeven <keven@kubesphere.io>
2021-09-06 13:14:24 +08:00
f10atin9
463feb8a61 update return and apiserver
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-06 11:30:19 +08:00
Roland.Ma
9360dfd1b2 add config property to save the additional configuration
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-09-06 03:16:23 +00:00
Roland.Ma
f5b98a39e5 add cluster list api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-09-06 03:15:19 +00:00
KubeSphere CI Bot
51955831a7 Merge pull request #4212 from LinuxSuRen/fix-ci-failed
Fix the nightly build failed due to rely on a missing file
2021-09-06 09:53:14 +08:00
rick
dc55e2e1a4 Fix the nightly build failed due to rely on a missing file
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-09-06 09:27:53 +08:00
yuswift
8da8c5deb1 support setting host cluster name
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-09-05 23:26:37 +08:00
f10atin9
faca834364 update goimports
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-03 16:22:10 +08:00
f10atin9
a2efda820d add pv.go
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-03 14:29:50 +08:00
Roland.Ma
261fb8f29d package gateway helm chart into docker image
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-09-03 06:14:01 +00:00
KubeSphere CI Bot
73b65b12ec Merge pull request #4204 from RolandMa1986/feat-helm
helm: allows ks-core to mount extra volumes
2021-09-03 11:20:13 +08:00
Roland.Ma
638f0c9fa0 refine comments
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-09-03 01:20:20 +00:00
KubeSphere CI Bot
02f9fd5212 Merge pull request #4206 from jrkeen/fix/deadlock_for_node_getter
fix deadlock for node getter
2021-09-02 18:19:14 +08:00
jrkeen
d359d03dc3 fix deadlock for node getter
Signed-off-by: jrkeen <jrkeen@hotmail.com>
2021-09-02 17:42:19 +08:00
KubeSphere CI Bot
3ddb05b8bf Merge pull request #4203 from zhu733756/master
fix API specification for #4194
2021-09-02 11:45:13 +08:00
zhu733756
f328e909d7 convert clusterdashboard to clusterdashboards.
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-09-02 10:48:52 +08:00
zhu733756
4d19d1a0e4 add field description for the API
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-09-02 09:32:07 +08:00
KubeSphere CI Bot
89a474ef70 Merge pull request #4199 from wansir/csrv1
Fix CertificateSigningRequest create failed after upgrade to certificates.k8s.io/v1
2021-09-01 19:52:13 +08:00
zhu733756
ad02644674 fix API specification for #4194
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-09-01 15:34:11 +08:00
KubeSphere CI Bot
52c0cbbee8 Merge pull request #4188 from nathan-415/nathan/remove-kubebuilder
Removed hack/install_kubebuilder.sh
2021-09-01 13:45:13 +08:00
nathannaveen
1de0490637 Removed Install kubebuilder 2021-08-31 18:01:39 -05:00
nathannaveen
5d5f7366d5 Removed hack/install_kubebuilder.sh
* removed hack/install_kubebuilder.sh https://github.com/kubesphere/kubesphere/issues/4187
2021-08-31 18:01:39 -05:00
Roland.Ma
9cab2b8339 add gateway api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-31 08:44:54 +00:00
KubeSphere CI Bot
80c2290b14 Merge pull request #4202 from zhu733756/master
fix: revert packages from vendor/kubesphere.io
2021-08-31 16:25:03 +08:00
zhu733756
5920e35651 revert packages from vendor/kubesphere.io
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-08-31 16:09:19 +08:00
hongming
db1a70a45b Fix CertificateSigningRequest create failed after upgrade to v1
Signed-off-by: hongming <hongming@kubesphere.io>
2021-08-31 14:21:51 +08:00
KubeSphere CI Bot
5a5db211df Merge pull request #4194 from zhu733756/master
[v3.2] Add grafana dashboard importing API
2021-08-31 14:18:13 +08:00
zhu733756
242ceb54f6 [v3.2] Add grafana dashboard importing API (#11)
* Add API to import grafana templates to kubesphere dashboard
* Merge and fix the latest codes from kubesphere #2501

Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-08-31 12:24:46 +08:00
KubeSphere CI Bot
9df6df5544 Merge pull request #4181 from yuswift/bump-ingress
bump Ingress version from v1beta1 to v1
2021-08-31 10:13:12 +08:00
yuswift
524d5d858e bump Ingress version from v1beta1 to v1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-31 09:37:34 +08:00
KubeSphere CI Bot
2bdc2ac0c6 Merge pull request #4178 from RolandMa1986/feat-gateway-controller
feat: integrate a helm sdk that use to install gateway helm chart
2021-08-31 08:56:13 +08:00
KubeSphere CI Bot
dbdef5fc3c Merge pull request #4186 from yuswift/upgrade-kubebuilder
upgrade kubebuilder envtest to v3
2021-08-31 08:55:13 +08:00
yuswift
a242eaa4eb fix shellcheck typo
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-30 19:40:39 +08:00
yuswift
6064853692 add new entry for env setup
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-30 18:04:18 +08:00
Roland.Ma
52f7a51007 fix coding style
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-30 04:53:18 +00:00
KubeSphere CI Bot
da7c041310 Merge pull request #4190 from yuswift/csr-patch
patch: bump CertificateSigningRequest version from v1beta1 to v1
2021-08-30 12:06:12 +08:00
KubeSphere CI Bot
1f0cb0bd72 Merge pull request #4183 from FeynmanZhou/master
update the outdated information in README
2021-08-30 12:05:01 +08:00
yuswift
0bb1f468f5 patch: bump CertificateSigningRequest version from v1beta1 to v1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-28 13:00:42 +08:00
yuswift
60977b150c upgrade kubebuilder envtest way
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-27 22:59:29 +08:00
Roland.Ma
818d41b394 add helm operator sdk and gateway helm chart
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-27 06:37:31 +00:00
Roland.Ma
7bb8124a61 pin dependencies
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-27 06:37:31 +00:00
FeynmanZhou
8d6ef13738 update the outdated information in README
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2021-08-27 13:39:44 +08:00
KubeSphere CI Bot
eae248b3c9 Merge pull request #4180 from yuswift/upgrade-csr
bump CertificateSigningRequest version from v1beta1 to v1
2021-08-27 13:39:12 +08:00
KubeSphere CI Bot
2b32df1c3f Merge pull request #4172 from zryfish/refactor_registry
Refactor registry API to remove dependency on docker.sock
2021-08-27 13:38:11 +08:00
yuswift
620178ce81 bump CertificateSigningRequest version from v1beta1 to v1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-27 00:20:24 +08:00
KubeSphere CI Bot
d313d8f307 Merge pull request #4176 from wanjunlei/https
Support external es that enables HTTPS
2021-08-26 14:26:11 +08:00
Jeff
136a2fd1fc change registry secret verify api path 2021-08-26 13:56:41 +08:00
KubeSphere CI Bot
360221a0fe Merge pull request #4163 from f10atin9/storage_capability
remove capability CRDs and update controller
2021-08-26 10:08:10 +08:00
KubeSphere CI Bot
9ea452a647 Merge pull request #4175 from styshoo/master
fix duplicate args generated when creating more than one ingress-controllers
2021-08-25 22:31:11 +08:00
KubeSphere CI Bot
2720916aa3 Merge pull request #4174 from RolandMa1986/update-rule
Update kubesphere/api sync rule
2021-08-25 22:26:10 +08:00
wanjunlei
41b3551526 Support external es that enables HTTPS
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-08-25 16:39:53 +08:00
Roland.Ma
8796ba46e8 update sync rule
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-25 03:51:42 +00:00
styshoo
637e3a4b0a when create more than two ingress-controllers, the ingress-controller pod args are duplicate 2021-08-25 11:19:30 +08:00
f10atin9
a8d36f232a rename snapshot_controller to snapshotclass_controller
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-08-25 10:36:05 +08:00
KubeSphere CI Bot
9dfb736a03 Merge pull request #4166 from RolandMa1986/fix-kubesphereapi
fix: kubesphere/api package UT failed
2021-08-25 10:19:11 +08:00
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
Jeff
3d2fd1b538 This PR does the following things:
1. add new registry api under resources.kubesphere.io/v1alpha3
2. deprecate registry api v1alpha2

Registry API v1alpha2 uses docker client to authenticate image registry
secret, which depends on docker.sock. We used to mount host
`/var/run/docker.sock` to deployment. It will prevent us imgrating to
containerd since no `docker.sock` exists. Registry API v1alpha3 comes to
rescure, it wraps library go-containerregistry and compatible with
docker registry, Harbor etc.
2021-08-24 13:37:42 +08:00
KubeSphere CI Bot
52d2df08a6 Merge pull request #4162 from LinuxSuRen/fix-apiserver-panic
Fix the ks-apiserver panic due to the devopsprojects CRD missing
2021-08-24 11:19:52 +08:00
f10atin9
b3123547a4 Capability controller can add annotations, no matter whether the storageClass has CSIDriver. Snapshot controller will create volumeSnapshotClass based on allowSnapshot annotation.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-08-23 18:04:19 +08:00
f10atin9
5e9679941b split snapshot controller and update capability.
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-08-23 13:05:24 +08:00
KubeSphere CI Bot
c740fef5b4 Merge pull request #4164 from wenhuwang/upgrade_ingress_apigroup
Upgrade ingress api version to networking.k8s.io/v1
2021-08-23 12:59:51 +08:00
Roland.Ma
709e0c92f1 helm: allows to mount extra volumes
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-23 02:34:00 +00:00
Roland.Ma
5a4f172b31 taddclient-go and api package ut to makefile
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-20 10:28:01 +00:00
Roland.Ma
0b4c22a72c fix client-go go mod
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-20 09:53:19 +00:00
Roland.Ma
373f78f2ed fix: kubesphere/api package UT failed
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-20 08:46:26 +00:00
wenhuwang
adfd3d7aaf Upgrade ingress api version to networking.k8s.io/v1
Signed-off-by: wenhuwang <976400757@qq.com>
2021-08-19 15:36:04 +08:00
f10atin9
574eb221ab remove capability CRDs and update controller
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-08-19 15:12:04 +08:00
KubeSphere CI Bot
ddc645838d Merge pull request #4159 from yuswift/remove-webhook-file
remove config/webhook config/samples config/servicemesh config/rbac config/default dir
2021-08-19 14:10:09 +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
KubeSphere CI Bot
75cf8b51c8 Merge pull request #4161 from yuswift/fix-api
fix `go mod tidy` error
2021-08-19 12:58:09 +08:00
yuswift
91fa1b352e fix api go mod tidy error
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-19 11:15:25 +08:00
yuswift
fd128c213f remove config/webhook config/samples config /servicemesh config/rbac config/default dir
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-08-18 16:11:16 +08:00
KubeSphere CI Bot
1ad5a07a58 Merge pull request #4141 from RolandMa1986/upgrade-k8s
Upgrade k8s package version
2021-08-17 09:54:08 +08:00
Roland.Ma
457d8c36be remove unused module
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:59:20 +00:00
Roland.Ma
5899bb5041 fix github build pipeline
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:59:20 +00:00
Roland.Ma
c23c1adcd1 fix openapi build
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:59:20 +00:00
Roland.Ma
3bfae73318 fix ks-apiserver missing interfaces
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:58:12 +00:00
Roland.Ma
2fcfb81066 fix controller Start method signature
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:58:12 +00:00
Roland.Ma
810bfb618a fix client.Object type
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:58:12 +00:00
Roland.Ma
d5f4b2f5ef pin go mod
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:58:12 +00:00
Roland.Ma
ea8f47c73a update vendor
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-08-16 06:58:12 +00:00
KubeSphere CI Bot
a18f72b565 Merge pull request #4144 from liangyuanpeng/feature_support_makehelp
Support make help
2021-08-16 11:12:44 +08:00
Lan Liang
58cc37f123 format desc 2021-08-15 23:28:34 +08:00
Lan Liang
989ab40952 Support make help 2021-08-13 00:15:37 +08:00
KubeSphere CI Bot
a923715062 Merge pull request #4121 from wenhuwang/remove_expansion_controller
remove workload auto-restart function when pvc expanded
2021-08-12 17:33:49 +08:00
KubeSphere CI Bot
0f55ea521d Merge pull request #4129 from LinuxSuRen/devops-proxy
Add proxy devops APIs request to ks-devops
2021-08-12 10:05:40 +08:00
LiHui
06cdab56f6 Fix typo && Add comments
Signed-off-by: LiHui <andrewli@yunify.com>
2021-08-10 14:13:39 +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
LiHui
3e5822a0b2 cleanup app when workspace is deleted
Signed-off-by: LiHui <andrewli@yunify.com>
2021-08-06 17:27:04 +08:00
rick
6d9cf166c6 Add proxy devops APIs request to ks-devops
move devops controllers into ks-devops

Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-08-06 17:11:59 +08:00
wang_wenhu
364941d5d2 remove workload auto-restart function when pvc expanded
Signed-off-by: wang_wenhu <976400757@qq.com>
2021-08-05 13:58:46 +08:00
KubeSphere CI Bot
418a2a09c7 Merge pull request #4116 from xyz-li/upgrade_kustomize
upgrade kustomize to v4.2.0
2021-08-04 16:23:46 +08:00
LiHui
e49f3f4910 upgrade kustomize version
Signed-off-by: LiHui <andrewli@yunify.com>
2021-08-04 15:14:36 +08:00
KubeSphere CI Bot
b4e510966f Merge pull request #4112 from nanjofan/nanjobranch
modify comments in pkg/apiserver/authentication/identityprovider/identity_provider.go
2021-08-04 14:24:47 +08:00
nanjofan
ad6acc5fb6 Update pkg/apiserver/authentication/identityprovider/identity_provider.go
Co-authored-by: hongming <coder.scala@gmail.com>
2021-08-04 13:48:06 +08:00
Yoshino
8fbfc734d2 Modify function error comments:"RegisterGenericProvider" and "GetOAuthProvider" 2021-08-03 14:48:06 +08:00
KubeSphere CI Bot
0e975d3f65 Merge pull request #4103 from RolandMa1986/feat-env-param
feat: load configuration from Environment variables
2021-08-03 11:13:46 +08:00
KubeSphere CI Bot
2aa55c5d6b Merge pull request #4095 from xyz-li/master
go build with vendor by default
2021-07-30 10:34:45 +08:00
Roland.Ma
14adfc4326 inject env with helm values
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-07-30 02:10:46 +00:00
Roland.Ma
4c16276a8d feat: load configuration from Environment variables
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-07-29 06:23:10 +00:00
LiHui
1b5590d3dd downloads vendor for hack/tools 2021-07-21 17:23:55 +08:00
LiHui
059eb64c9b go build with vendor
Signed-off-by: LiHui <andrewli@yunify.com>
2021-07-21 16:05:23 +08:00
KubeSphere CI Bot
6560337a0a Merge pull request #4048 from RolandMa1986/feat-kialiauth
Add kiali client with authentication supports
2021-07-21 16:02:10 +08:00
KubeSphere CI Bot
703efe9b84 Merge pull request #4073 from zryfish/fix_make_cross
fix make cross target failed
2021-07-21 14:45:49 +08:00
Jeff
c6c61cb5a2 fix make cross target failed 2021-07-20 07:01:36 +00:00
Roland.Ma
85fd94b922 add kiali client with authentication supports
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-07-19 08:36:08 +00:00
KubeSphere CI Bot
a897caa366 Merge pull request #4063 from yuswift/update-gofmt
fix gofmt typo and spelling typo and shellcheck typo to pass the prow ci
2021-07-19 14:45:10 +08:00
yuswift
04645180c4 fix shellcheck typo
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-07-15 12:14:35 +08:00
yuswift
e9695cba4c fix spelling typo
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-07-15 11:06:07 +08:00
yuswift
cd30e6eba5 update gofmt
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-07-15 10:13:04 +08:00
KubeSphere CI Bot
8b7a7b3342 Merge pull request #4050 from RolandMa1986/fix-e2e
Update kind-action to v1.2.0
2021-07-09 11:39:30 +08:00
Roland.Ma
1fbe5d305c update kind-action to v1.2.0
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-07-09 03:25:14 +00:00
KubeSphere CI Bot
900b230d72 Merge pull request #4044 from RolandMa1986/fix-template
Fix typo in kubesphere gateway template and bookstore sample
2021-07-06 20:34:29 +08:00
KubeSphere CI Bot
1c5510138d Merge pull request #4042 from xyz-li/master
Change helm path
2021-07-05 18:35:28 +08:00
LiHui
4d03665cba Change helm path
Signed-off-by: LiHui <andrewli@yunify.com>
2021-07-05 18:00:48 +08:00
Roland.Ma
1aabaf8cc5 fix typo in comfigmap
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-07-05 08:18:05 +00:00
KubeSphere CI Bot
bacc717bf2 Merge pull request #4034 from wansir/fix-image-push
Fix failed to push docker images with a specified tag
2021-07-02 10:21:25 +08:00
hongming
1f4098b70c Fix failed to push docker images with a specified tag
Signed-off-by: hongming <talonwan@yunify.com>
2021-07-02 09:50:57 +08:00
Zhengyi Lai
427c3fb6c1 Merge pull request #4026 from yuswift/fix_.gitbug
fix .dockerignore file ignores .git dir bug
2021-07-01 19:01:19 +08:00
yuswift
8c0462e89f fix .dockerignore file ignores .git dir bug
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-07-01 18:42:28 +08:00
KubeSphere CI Bot
cfacc18736 Merge pull request #4019 from yuswift/fix_nightly_build
fix wrong Makefile usage in nightly build workflow
2021-06-30 22:35:25 +08:00
yuswift
bb7294cdce fix nightly build error
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-06-30 18:04:19 +08:00
KubeSphere CI Bot
b34767e7fd Merge pull request #4003 from wansir/fix-3041
Fix panic due to nil pointer exception
2021-06-25 15:13:21 +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
hongming
df98ea98cc Fix panic due to nil pointer exception
Signed-off-by: hongming <talonwan@yunify.com>
2021-06-25 14:52:51 +08:00
KubeSphere CI Bot
ca404cf5a8 Merge pull request #4000 from zryfish/fix_typo_in_dockerfile
fix wrong target in Dockerfile
2021-06-25 14:43:28 +08:00
Jeff
341a51d28e fix wrong target in Dockerfile
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-25 06:21:30 +00:00
KubeSphere CI Bot
290bf309ff Merge pull request #3990 from zryfish/refactor_makefile
Add development verify scripts and refactor Dockerfile
2021-06-25 13:56:00 +08:00
KubeSphere CI Bot
9e59ce3516 Merge pull request #3997 from RolandMa1986/fix-cve
Update golang.org/x/crypto module to latest release
2021-06-25 13:49:22 +08:00
KubeSphere CI Bot
2baa0faa75 Merge pull request #3936 from wansir/remove-useless-crd
Remove useless federated resources(users, roles, rolebindings) CRD files from config/crds
2021-06-25 09:38:22 +08:00
KubeSphere CI Bot
8fc6533a2d Merge pull request #3956 from wansir/fix-3041
Verify the permission of create pods exec before creating terminal WebSocket connection
2021-06-24 18:02:00 +08:00
Roland.Ma
016165072d update golang.org/x/crypto module to latest release
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-06-24 01:31:13 +00:00
Jeff
4d90295474 remove unused line
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-23 16:38:24 +00:00
Jeff
6cdd050184 * rewrite dockerfile to multiple stage build
* add verification scripts

Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-23 16:27:05 +00:00
KubeSphere CI Bot
d1fdc7c9e0 Merge pull request #3978 from opsnull/remote-redundant-gvr
apiserver: remove redundant GroupVersionResource
2021-06-23 23:27:21 +08:00
ZhangJun
6d264572dc apiserver: remove redundant GroupVersionResource
Signed-off-by: opsnull <geekard@qq.com>
2021-06-22 18:43:05 +08:00
KubeSphere CI Bot
d4be6d704a Merge pull request #3961 from LinuxSuRen/feat-k8s-local-client
Make ks-apiserver be easier to run locally with kube config
2021-06-21 14:07:27 +08:00
KubeSphere CI Bot
9eed3382bd Merge pull request #3967 from zryfish/update_pr_template
update pull request template
2021-06-21 11:26:59 +08:00
Jeff
cfc0ac1eed update pull request template
Signed-off-by: Jeff <jeffzhang@yunify.com>

fix goimports

Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-21 01:02:51 +00:00
rick
8e40702b75 try os/user.HomeDir when $HOME is unset when find kubeconfig file
Signed-off-by: rick <linuxsuren@users.noreply.github.com>
2021-06-18 11:32:23 +08:00
rick
90f5a44911 Make ks-apiserver be easier to run locally with kube config
Signed-off-by: rick <linuxsuren@users.noreply.github.com>
2021-06-18 11:31:50 +08:00
KubeSphere CI Bot
c2c5348f9b Merge pull request #3944 from RolandMa1986/update-deps
update protobuf to v1.3.2
2021-06-17 11:28:54 +08:00
KubeSphere CI Bot
5cb68808c1 Merge pull request #3965 from dkkb/s3
Improve the s3 uploader for better performance.
2021-06-17 11:24:05 +08:00
dkkb
3ec5a5aea6 Improve the s3 uploader for better performance.
Signed-off-by: dkkb <dabkb@aol.com>
2021-06-16 12:29:31 +08:00
KubeSphere CI Bot
d97bdffd94 Merge pull request #3964 from zryfish/update_owner
add approvers and reviewers
2021-06-15 14:50:46 +08:00
Jeff
55b7c000b0 fix typo
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-15 02:19:45 +00:00
Jeff
67083e9def add more reviewers
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-15 02:18:30 +00:00
Jeff
2ab926adb7 add approvers and reviewers
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-06-15 02:10:09 +00:00
KubeSphere CI Bot
ec7d392b7b Merge pull request #3946 from RolandMa1986/update-jwt
Moving to a fork for jwt-go
2021-06-15 10:05:46 +08:00
KubeSphere CI Bot
f3d7cb3394 Merge pull request #3947 from dkeven/removecapdetection
remove storage capability auto detection
2021-06-11 10:52:12 +08:00
hongming
2c60762cfc Fix container terminal security risk
Signed-off-by: hongming <talonwan@yunify.com>
2021-06-10 16:25:55 +08:00
dkven
eadf8cc4c8 remove storage capability auto detection
Signed-off-by: dkven <dkvvven@gmail.com>
2021-06-09 14:49:58 +08:00
Roland.Ma
e6736a4e0e 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-08 10:11:56 +00:00
Roland.Ma
43959a714d update protobuf to v1.3.2
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-06-08 09:07:01 +00:00
KubeSphere CI Bot
b77beedbf7 Merge pull request #3931 from yuswift/update-Makefile-for-helm
Feature: support installing kubesphere-core with helm
2021-06-06 10:27:09 +08:00
hongming
3f1830397f Remove useless CRD
Signed-off-by: hongming <talonwan@yunify.com>
2021-06-03 18:50:03 +08:00
yuswift
70c53cc723 update Makefile for helm-deplp && helm-uninstall
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-06-03 10:50:03 +08:00
KubeSphere CI Bot
2cc897534d Merge pull request #3929 from LinuxSuRen/fix-wrong-ctrl-mgr-ver-output
Fix the wrong version output of controller-manager
2021-06-01 16:40:17 +08:00
rick
679109969f Fix the wrong version output of controller-manager
Signed-off-by: rick <linuxsuren@users.noreply.github.com>
2021-06-01 15:38:39 +08:00
KubeSphere CI Bot
cc99cdc9c6 Merge pull request #3924 from wansir/cherry-pick
Add cherry_pick_pull.sh
2021-06-01 15:09:18 +08:00
hongming
3d391ec31b Add cherry_pick_pull.sh
Signed-off-by: hongming <talonwan@yunify.com>
2021-06-01 14:16:30 +08:00
KubeSphere CI Bot
113bb73061 Merge pull request #3896 from RolandMa1986/feat-helmchart
create helm chart for ks-core
2021-06-01 14:09:42 +08:00
KubeSphere CI Bot
49cad3a411 Merge pull request #3894 from xyz-li/app-fix2
Fix: nil pointer when enable HTTPS
2021-06-01 14:09:18 +08:00
KubeSphere CI Bot
318ecfdfd5 Merge pull request #3919 from RolandMa1986/fix-manifests
change controller-gen crds source path
2021-06-01 13:34:35 +08:00
KubeSphere CI Bot
902ca0ed6d Merge pull request #3902 from zackzhangkai/master
fix servicemesh traffic governance
2021-06-01 11:21:17 +08:00
Roland.Ma
02d4378765 fix: notification ut test
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 09:37:02 +00:00
Roland.Ma
0ba9f28aac fix: dashboard ut test
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 07:42:46 +00:00
Roland.Ma
e5bde9e00b generate crds by folder
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:28:48 +00:00
Roland.Ma
25bfb3d199 delete snapshot crds
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:24:00 +00:00
Roland.Ma
e908150836 delete istio crds
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:19:39 +00:00
Roland.Ma
98dc7ac691 delete calico crds
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:18:38 +00:00
Roland.Ma
9666cab2c2 delete auditing,monitoring,notification crds
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:16:26 +00:00
Roland.Ma
bd99daac2f delete kubefed crds, they should be generated by kubefedctl
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-31 02:03:56 +00:00
KubeSphere CI Bot
9aeb2d55a8 Merge pull request #3886 from xyz-li/app-fix
Fix: parse chart data by loader.LoadArchive
2021-05-28 14:46:32 +08:00
Roland.Ma
a97163b88c change controller-gen crds source path
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-27 09:12:34 +00:00
Roland.Ma
91ebc2cd01 use helm release variable for service account name and namespace
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-26 09:55:04 +00:00
Roland.Ma
999711f1cf replace podAntiAffinity namespaces with helm release name
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-26 09:17:35 +00:00
Roland.Ma
dc3d5bf08c user helm release namespace
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-26 09:09:49 +00:00
KubeSphere CI Bot
3361a51d44 Merge pull request #3897 from RolandMa1986/rolebinding-api
Query workspacerolebindings by rolename
2021-05-24 19:50:13 +08:00
KubeSphere CI Bot
d15e29fa0b Merge pull request #3868 from JohnNiang/fix/typo
Fix client typo
2021-05-24 16:41:13 +08:00
KubeSphere CI Bot
1703eafba9 Merge pull request #3859 from yunkunrao/master
Fixed namespace resource filter.
2021-05-24 16:40:13 +08:00
Roland.Ma
f7d7ed55ff inital admin account
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-21 09:10:13 +00:00
zackzhangkai
afaafbfea7 fix servicemesh traffic governance
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
2021-05-20 11:18:21 +08:00
Roland.Ma
7b565e2412 generate random jwtSecret
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-20 02:42:15 +00:00
Roland.Ma
2a258c4530 create helm chart for ks-core
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-19 07:10:04 +00:00
LiHui
e7f7497a39 Fix: nil pointer when enable secure port
Signed-off-by: LiHui <andrewli@yunify.com>
2021-05-18 14:38:25 +08:00
LiHui
b0e727bf4e Fix: parse chart data by loader.LoadArchive
Signed-off-by: LiHui <andrewli@yunify.com>
2021-05-17 15:19:34 +08:00
Roland.Ma
ee55e26e3c query role by rolename
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-14 02:08:16 +00:00
KubeSphere CI Bot
738b1eecc4 Merge pull request #3848 from zackzhangkai/master
fix servicemesh crd
2021-05-13 16:52:54 +08:00
KubeSphere CI Bot
fcff981be8 Merge pull request #3864 from 94rain/fix-link-in-readme
fix dead links and update versions in README
2021-05-12 20:35:54 +08:00
LiHui
8db1e3772b Fix: resolve openpitrix resources
Signed-off-by: LiHui <andrewli@yunify.com>
2021-05-12 14:01:30 +08:00
johnniang
d88de6dca7 Fix client typo
Signed-off-by: johnniang <johnniang@fastmail.com>
2021-05-11 22:42:07 +08:00
KubeSphere CI Bot
c879c0497e Merge pull request #3863 from RolandMa1986/fix-api-mod
Fix: UT failed in api repo
2021-05-11 16:19:53 +08:00
94rain
57949a24fb fix dead links and update versions in README
Signed-off-by: 94rain <94rain@msn.com>
2021-05-10 20:57:12 +08:00
Roland.Ma
bd3cf2cf44 fix ut error for api repo
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-10 10:07:15 +00:00
Roland.Ma
6eb3c9f158 fix go mod tidy error
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-10 10:06:09 +00:00
Rao Yunkun
80d3e91791 Fixed namespace resource filter.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-05-10 15:20:06 +08:00
KubeSphere CI Bot
9d64b8104a Merge pull request #3855 from RolandMa1986/fix-e2e
Remove useless e2e test
2021-05-10 09:43:53 +08:00
KubeSphere CI Bot
f19f77da61 Merge pull request #3795 from RolandMa1986/fix-crd
add RawExtension type annotation
2021-05-10 09:42:53 +08:00
Roland.Ma
d580e13e80 remove useless e2e test
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-09 00:36:47 +00:00
Roland.Ma
b05ef6714c fix ClusterOverride field
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-08 02:54:04 +00:00
Roland.Ma
ad6f22c715 add RawExtension type annotation
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-05-08 02:54:03 +00:00
KubeSphere CI Bot
cc6b1f9f0a Merge pull request #3767 from xyz-li/app-fix
Fix: validate repo when modify url
2021-05-08 10:47:34 +08:00
KubeSphere CI Bot
ae9e0d84bc Merge pull request #3831 from RolandMa1986/feat-refactorapi
move api to staging and sychnorized to kubepshere/api repo
2021-05-08 10:46:52 +08:00
zackzhangkai
7b84622fb6 fix servicemesh crd
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
2021-05-07 16:58:50 +08:00
KubeSphere CI Bot
1f57ec2e38 Merge pull request #3838 from RolandMa1986/add-sync
sync release-3.1 branch
2021-04-30 17:11:05 +08:00
Roland.Ma
f6601d9e8b sync release-3.1 branch
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-30 08:05:57 +00:00
Roland.Ma
cb7ca04d37 fix openapi build
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-29 09:33:30 +00:00
Roland.Ma
c37a11c5f9 move api to staging
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-29 08:20:05 +00:00
KubeSphere CI Bot
24ee83271f Merge pull request #3796 from wansir/fix-3784
Fix SelectorFromSet ignore errors and select everything
2021-04-29 12:38:05 +08:00
KubeSphere CI Bot
cf8d71c4ca Merge pull request #3823 from lxm/hotfix/mulitarch-build
multi arch build error
2021-04-28 14:39:12 +08:00
lxm
b7043621f1 multi arch build error
Signed-off-by: lxm <lxm.xupt@gmail.com>
2021-04-28 13:51:14 +08:00
KubeSphere CI Bot
cad6296f4e Merge pull request #3704 from lxm/feature/multiarch
[feature] use buildx to produce multi arch image #3683
2021-04-27 16:15:04 +08:00
lxm
ae641d957f only trigger github action on push
Signed-off-by: lxm <lxm.xupt@gmail.com>
2021-04-26 18:53:01 +08:00
KubeSphere CI Bot
c3522d940a Merge pull request #3797 from zackzhangkai/master
allow notification to slact when e2e failed
2021-04-26 16:53:04 +08:00
KubeSphere CI Bot
4ab94c1b7e Merge pull request #3806 from yunkunrao/master
Fix metering chart display error when switched into network flows consumption.
2021-04-26 10:09:03 +08:00
KubeSphere CI Bot
133a596c32 Merge pull request #3799 from LinuxSuRen/clean-up-devops-roadmap
Update the status of DevOps roadmap for upgrade section and the 3.0 section
2021-04-26 10:00:04 +08:00
Rao Yunkun
e9fdb01a96 Fix issue #3805
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-25 15:07:39 +08:00
Zhengyi Lai
895c0c449a Merge pull request #3798 from xyz-li/app-fix1
update roadmap
2021-04-23 22:15:37 +08:00
Zhengyi Lai
b72f794004 Mark metering completed in roadmap
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2021-04-23 22:14:46 +08:00
rick
291317ca86 Update the status of DevOps roadmap for upgrade section and the 3.0 section
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-04-23 17:02:02 +08:00
LiHui
685f82d077 update roadmap
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-23 16:53:08 +08:00
zackzhangkai
3762701fa2 allow notification to slact when e2e failed
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
2021-04-23 15:15:37 +08:00
hongming
1b33d6e31b Fix SelectorFromSet ignore errors and select everything
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-23 14:29:42 +08:00
KubeSphere CI Bot
a77ed95a5b Merge pull request #3792 from wansir/roadmap
Update roadmap for multitenancy & IAM
2021-04-22 16:39:13 +08:00
hongming
cec6c297db Update roadmap
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-22 16:09:33 +08:00
KubeSphere CI Bot
7a8aaeeb83 Merge pull request #3790 from LinuxSuRen/roadmap-devops
Mark all DevOps roadmap item as complete
2021-04-22 15:44:13 +08:00
KubeSphere CI Bot
c943f0d99e Merge pull request #3791 from benjaminhuo/master
Update roadmap for o11y & edge
2021-04-22 15:43:13 +08:00
Benjamin
1a77bbb54b Update roadmap for o11y & edge
Signed-off-by: Benjamin <benjamin@yunify.com>
2021-04-22 15:24:17 +08:00
rick
2d3e2a7d1e Mark all DevOps roadmap item as complete
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-04-22 15:09:20 +08:00
lxm
31fbe51327 add suffix to image tag
Signed-off-by: lxm <lxm.xupt@gmail.com>
2021-04-22 11:34:13 +08:00
KubeSphere CI Bot
d4451205dc Merge pull request #3781 from yuswift/fix_crd_upgrade
fix crd upgrade error
2021-04-21 17:40:12 +08:00
yuswift
556219a5ed fix crd update error
Signed-off-by: yuswiftli <yuswiftli@yunify.com>
2021-04-21 17:19:05 +08:00
KubeSphere CI Bot
e9c963c58d Merge pull request #3776 from wansir/feat-logout
Support RP-Initiated Logout
2021-04-20 20:17:12 +08:00
KubeSphere CI Bot
3a7caffc36 Merge pull request #3779 from junotx/ca
remove trailing dollar char of namespacedResourcesFilter for monitoring api
2021-04-20 17:20:12 +08:00
hongming
8fdd8beb08 Support RP-Initiated Logout
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-20 15:17:40 +08:00
junot
8ed8a61bd0 remove trailing dollar char of namespacedResourcesFilter for monitoring api
Signed-off-by: junot <junotxiang@yunify.com>
2021-04-20 15:09:52 +08:00
KubeSphere CI Bot
763b3f1899 Merge pull request #3768 from wansir/ldap-idp
Fix issue with case-sensitive username
2021-04-20 14:54:11 +08:00
hongming
595f7a03e4 Fix issue with case-sensitive username
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-20 14:18:31 +08:00
KubeSphere CI Bot
b9ea449a4b Merge pull request #3773 from LinuxSuRen/fix-filter-parse-err
Fix the error caused by the wrong filter parse
2021-04-20 14:06:11 +08:00
KubeSphere CI Bot
fa088425ff Merge pull request #3770 from yunkunrao/master
Remove metering ConfigMap dependency.
2021-04-20 14:03:20 +08:00
Rao Yunkun
bc387ca3fd Add metering default config.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-20 12:10:41 +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
ab86f606a8 Update UT.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-20 10:02:46 +08:00
rick
4ba8645bcf Fix the error caused by the wrong filter parse
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-04-19 22:28:11 +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
77f6c9067d Fix: validate repo when modify url
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-19 17:13:02 +08:00
KubeSphere CI Bot
37c53db57f Merge pull request #3743 from xyz-li/app-fix
Fix: return all items when limit=-1
2021-04-19 10:59:10 +08:00
KubeSphere CI Bot
f43685f5a7 Merge pull request #3753 from yunkunrao/master
Keep 3 decimal places for metering fee value.
2021-04-19 10:44:10 +08:00
Rao Yunkun
6952cf218f Update Unit Test.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-17 09:39:31 +08:00
Rao Yunkun
129ae3d6ee Keep 3 decimal places for metering fee value.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-16 17:34:43 +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
KubeSphere CI Bot
330148094f Merge pull request #3750 from wansir/master
Fix user status change after update
2021-04-16 13:08:02 +08:00
KubeSphere CI Bot
3b589cb5d2 Merge pull request #3731 from Sherlock113/automes
Update host cluster desc
2021-04-16 13:07:08 +08:00
hongming
744f88ea19 Fix user status change after update
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-16 11:24:48 +08:00
KubeSphere CI Bot
f3dc09ffe4 Merge pull request #3727 from xyz-li/app-fix1
Add labels to all objects but not selectors
2021-04-16 11:23:18 +08:00
KubeSphere CI Bot
ffb0de0f5a Merge pull request #3741 from xyz-li/app-fix
Fix search bugs in app template page
2021-04-15 18:20:07 +08:00
LiHui
5e09533483 Fix: make search case-insensitive
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-15 16:36:48 +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
LiHui
ce4cfbee51 update modules kustomize add helm
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-15 15:45:47 +08:00
LiHui
8697fd5d3c Fix: trim chart name prefix from chart file path
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-15 14:58:05 +08:00
KubeSphere CI Bot
e587887aac Merge pull request #3733 from zhu733756/master
fix bug that edge metrcis test run failed
2021-04-15 10:59:07 +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
KubeSphere CI Bot
0f55e466ab Merge pull request #3728 from xyz-li/app-fix
Fix: add kubeconfig when check release status
2021-04-15 09:49:07 +08:00
Sherlock113
cdcd42a6a3 Update host cluster desc
Signed-off-by: Sherlock113 <sherlockxu@yunify.com>
2021-04-14 17:46:29 +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
KubeSphere CI Bot
1a24c99c45 Merge pull request #3715 from zhu733756/fix-bug-for-node-metrics-on-overview-page
fix bug for node metrics on overview page
2021-04-13 23:01:02 +08:00
KubeSphere CI Bot
4a4d5d4a03 Merge pull request #3721 from xyz-li/app-fix1
Fix: filter app by app_id
2021-04-13 18:33:02 +08:00
zryfish
1031853757 Fix: filter app by app_id
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-13 17:43:10 +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
zryfish
26e5c31d8f fix nightly build version (#3717)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-04-13 15:42:16 +08:00
KubeSphere CI Bot
fdfdc3c995 Merge pull request #3702 from yuswift/update_manifests
upgrade crd to apiextensions.k8s.io/v1 && generate crd files
2021-04-13 15:41:16 +08:00
yuswift
644a08aff3 upgrade controller-tools to v0.4.1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-04-12 16:31:10 +08:00
KubeSphere CI Bot
a9a0be79d1 Merge pull request #3711 from yuswift/upgrade_crd
upgrade crd to apiextensions/v1
2021-04-11 13:35:15 +08:00
KubeSphere CI Bot
a055e8edd1 Merge pull request #3709 from faweizhao26/master1
Fix the broken link of 'what-is-kubesphere'
2021-04-11 13:33:00 +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
lxm
af536c0c96 [feature] use buildx to produce multi arch image kubesphere#3683
Signed-off-by: lxm <lxm.xupt@gmail.com>
2021-04-10 00:06:07 +08:00
KubeSphere CI Bot
c3530af84a Merge pull request #3712 from xyz-li/app-fix1
Fix: update time of charts
2021-04-09 17:15:59 +08:00
LiHui
5bb2884f76 Fix: update time of charts
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-09 16:55:09 +08:00
yuswift
a35da047f3 upgrade crd to apiextensions/v1
Signed-off-by: yuswift <yuswift2018@gmail.com>
2021-04-09 16:00:28 +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
KubeSphere CI Bot
6ef2a019c9 Merge pull request #3703 from xyz-li/app-fix1
Fix: update chart data & sort by time of release list
2021-04-09 11:43:59 +08:00
LiHui
74fb76a48e reverse order of release list
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-09 11:27:10 +08:00
LiHui
c023fb13a0 update chart data
Signed-off-by: LiHui <andrewli@yunify.com>
2021-04-09 11:27:05 +08:00
faweizhao26
db344c84d0 modified README_zh.md
Signed-off-by: faweizhao26 <faweizhao@yunify.com>
2021-04-09 11:16:38 +08:00
KubeSphere CI Bot
bb440927d2 Merge pull request #3706 from junotx/ca
fix notification triggering again after alerting rule changes
2021-04-09 10:27:59 +08:00
KubeSphere CI Bot
0688ca4472 Merge pull request #3696 from wanjunlei/notification
fix bug member cluster can not view the notification channels
2021-04-09 10:02:59 +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
junot
5346c6b1ae fix notification triggering again after alerting rule changes
Signed-off-by: junot <junotxiang@yunify.com>
2021-04-08 17:18:36 +08:00
yuswift
adef4b5e43 upgrade crd to apiextensions.k8s.io/v1 && generate crd files
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-04-08 17:05:04 +08:00
zryfish
6a58572167 set fetch depth of checkout action to fetch all history and tags (#3699)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-04-08 12:00:21 +08:00
wanjunlei
cbdc81a10a resolve conversation and add some test code
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-04-08 11:48:20 +08:00
KubeSphere CI Bot
4fc4e48d35 Merge pull request #3692 from yunkunrao/bug-fix
Add namespacedResourcesFilter field back in reqParams struct.
2021-04-07 23:03:13 +08:00
wanjunlei
8f62294760 fix bug member cluster can not view the notification channels
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-04-07 18:13:02 +08:00
Rao Yunkun
d531d6b671 Update UT.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-07 17:15:44 +08:00
KubeSphere CI Bot
3bebc4f03b Merge pull request #3688 from RolandMa1986/feat-deleteworkspace
feat: optional cascade delete resources when deleting workspace
2021-04-07 16:58:13 +08:00
KubeSphere CI Bot
ea80ca727a Merge pull request #3691 from yuswift/add_ksVersion_field
add kubesphereversion field for cluser.status
2021-04-07 15:29:13 +08:00
Rao Yunkun
43eaf904f6 Add namespacedResourcesFilter field back in reqParams struct.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-04-07 15:22:56 +08:00
yuswift
3b00fc6d5e add kubesphereversion field for cluser.status
Signed-off-by: yuswift <yuswiftli@yunify.com>

adopt reviews from @LinuxSuRen
2021-04-07 15:12:15 +08:00
Roland.Ma
68e8327453 refine code
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-07 03:53:05 +00:00
KubeSphere CI Bot
f382847fb7 Merge pull request #3690 from yuswift/update_kubefed_dependency
upgrade kubefed client to v0.6.1
2021-04-07 10:23:58 +08:00
yuswift
82cd5c454e upgrade kubefed client to v0.6.1
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-04-06 19:43:43 +08:00
KubeSphere CI Bot
565a97fb6d Merge pull request #3547 from pingstar/dev
Fix: the panic caused by parsing requestinfo slice access out of bounds
2021-04-06 16:29:13 +08:00
Roland.Ma
c3723a3738 refined e2e testing
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-06 07:32:53 +00: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
KubeSphere CI Bot
828d2c6d37 Merge pull request #3687 from zryfish/add_version_sub_command
add version sub command
2021-04-06 10:01:56 +08:00
Jeff
2952bf4a3b add version sub command
Signed-off-by: Jeff <zw0948@gmail.com>
2021-04-06 02:00:33 +00:00
Jeff
d98c4e8311 add version sub command
Signed-off-by: Jeff <zw0948@gmail.com>
2021-04-05 15:44:27 +00: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
06fa276d60 Merge pull request #3680 from RolandMa1986/fix-3671
Cascade deleting groups when workspace is deleted
2021-04-02 21:42: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
Roland.Ma
94a50e5c6b add ut
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-02 08:28:37 +00:00
Roland.Ma
2e5adb6e36 cascade deleting groups when workspace is deleted.
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-02 06:11:44 +00: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
066dfe7066 Merge pull request #3674 from junotx/ca
fix case-insensitive keyword query and consistent state for alerting
2021-04-02 11:07:10 +08:00
KubeSphere CI Bot
524f98c50f Merge pull request #3662 from RolandMa1986/fix-fedgroup
fix:group was updated continuously in member cluster
2021-04-02 11:06:53 +08:00
junotx
935df8622a make func more readable for alerting
Signed-off-by: junotx <junotxiang@yunify.com>
2021-04-02 10:53:44 +08:00
junotx
66c0e0dad1 fix consistent state for alerting rule
Signed-off-by: junotx <junotxiang@yunify.com>
2021-04-02 10:53:05 +08:00
junotx
68b0b8f4ba fix case-insensitive keyword query for alerting
Signed-off-by: junotx <junotxiang@yunify.com>
2021-04-02 10:51:14 +08: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
KubeSphere CI Bot
e0cecf9fa4 Merge pull request #3663 from yuswift/update_verify-goimports.sh
ignore pkg/apis dir when running make goimports
2021-04-02 10:09:10 +08:00
KubeSphere CI Bot
6973f7895c Merge pull request #3667 from wansir/fix-3652
Fix workspace controller manager
2021-04-01 19:04:52 +08: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
KubeSphere CI Bot
364c806ddd Merge pull request #3659 from RolandMa1986/fix-3620
Renew kubeconfig certificate
2021-04-01 17:45:52 +08:00
hongming
f23771b3eb Fix owner reference conflict
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-01 12:09:38 +08:00
Roland.Ma
8e1aa7848d refine comments
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-04-01 03:15:14 +00:00
hongming
3e8597cf76 decoupling Jenkins and LDAP
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-01 11:10:02 +08:00
KubeSphere CI Bot
cae0c6c37e Merge pull request #3654 from wansir/fix-3652
Fix owner reference conflict
2021-04-01 11:02:53 +08:00
yuswift
9bc6e6eedb ignore pkg/apis dir when running make goimports
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-04-01 10:29:30 +08:00
hongming
b7f0ce44f2 Fix owner reference conflict
Signed-off-by: hongming <talonwan@yunify.com>
2021-04-01 09:59:15 +08:00
Roland.Ma
60f1f5240b fix:group was updated continuously in member cluster
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-31 14:16:27 +00:00
Rao Yunkun
836b279fee Update metering UT.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-31 22:04:17 +08:00
KubeSphere CI Bot
a7cbc6f878 Merge pull request #3651 from xyz-li/app-fix
Fix: fix app repo and helm app bugs
2021-03-31 20:29:52 +08:00
KubeSphere CI Bot
20106d9f92 Merge pull request #3658 from yuswift/upgrade_kubefed
upgrade kubefed to v0.7.0
2021-03-31 19:49:52 +08:00
Roland.Ma
23b6ca3806 renew kubeconfig certificate
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-31 10:13:37 +00:00
yuswift
b34c9fb9f5 upgrade kubefed to v0.7.0
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-03-31 18:12:10 +08:00
Rao Yunkun
76ffaa8794 Update UT
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-31 16:58:10 +08:00
LiHui
610393bb57 Fix: show app icon
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-31 15:00:37 +08:00
LiHui
61a990c75e Fix: update repo
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-31 15:00:37 +08:00
LiHui
2ae3823a5e Fix: show app name in review list
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-31 15:00:30 +08:00
KubeSphere CI Bot
6cdbf33635 Merge pull request #3526 from zhu733756/add-pod-level-metrics
Add pod level metrics for edge node
2021-03-31 14:43:48 +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
LiHui
9e235ce0df Fix: update application status when it has changed
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-31 11:48:58 +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
KubeSphere CI Bot
2dfa248952 Merge pull request #3441 from yunkunrao/master
Update metering csv export format and intergrate metering module.
2021-03-30 16:52:35 +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
KubeSphere CI Bot
40e3751e43 Merge pull request #3588 from LinuxSuRen/pipeline-json-missing-env
Fix fields missing when convert Jenkinsfile to JSON
2021-03-29 18:07:30 +08:00
KubeSphere CI Bot
64fc89212f Merge pull request #3590 from xyz-li/app-fix1
Fix: remove checks when delete release
2021-03-29 14:54:47 +08:00
KubeSphere CI Bot
7d661e90b9 Merge pull request #3486 from wansir/update-vendor
update vendor directory
2021-03-29 10:54:47 +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
652c1a4c68 Merge pull request #3595 from LinuxSuRen/fix-pipe-input-admin
Fix that devops admin users cannot approve a Pipeline input
2021-03-29 10:42:09 +08:00
KubeSphere CI Bot
0f2ac8ae17 Merge pull request #3584 from wansir/refactor
Remove useless log output
2021-03-29 09:04:09 +08:00
KubeSphere CI Bot
f9c807fab3 Merge pull request #3594 from zhu733756/fix-request-edgenode-metrics-everytime
Request edge metrics only if prometheus metrics data is empty
2021-03-29 08:35:47 +08:00
KubeSphere CI Bot
c356789aca Merge pull request #3600 from yuswift/change_http_code
change http response code to 400 when the cluster is not ready
2021-03-29 08:34:09 +08:00
yuswift
fe23feff85 change http response code to 400 when the cluster is not ready
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-03-26 16:00:29 +08:00
rick
baa7ae4d69 Fix that devops admin users cannot approve a Pipeline input
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-26 13:29:25 +08:00
zhu733756
78a97fea05 fix variable naming errors
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-03-26 11:18:47 +08:00
hongming
b83b3232cb remove useless log output
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-26 11:15:45 +08:00
zhu733756
5b3bced5d7 Request edge metrics only if prometheus metrics data is empty
Signed-off-by: zhu733756 <talonzhu@yunify.com>
2021-03-26 10:30:18 +08:00
KubeSphere CI Bot
fbd200b4ab Merge pull request #3589 from yuswift/fix/502_error_when_joining_clusters_again
fix 502 error when joining the same cluster with a different name
2021-03-26 09:32:29 +08:00
天璇
cba14936c5 Update powered-by-kubesphere.md (#3576) 2021-03-26 09:25:48 +08:00
KubeSphere CI Bot
40e5920c3e Merge pull request #3574 from xyz-li/app-fix
Fix: handle invalid semver
2021-03-26 09:24:45 +08:00
KubeSphere CI Bot
84d28f3186 Merge pull request #3575 from RolandMa1986/fix-uttimeout
fix ut timeout issue example
2021-03-26 09:19:07 +08:00
LiHui
cac5daa429 Fix: save description when install release
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-25 23:57:39 +08:00
LiHui
9fc0f8d89b Fix: remove checks of the exists of release when delete app and repo
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-25 23:57:39 +08:00
LiHui
542eb180c5 Fix: return app creator
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-25 23:57:33 +08:00
yuswift
ce3b5a026a fix 502 error when joining the same cluster with a different name
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-03-25 22:08:08 +08:00
LiHui
231d2213d3 Fix: handlet invalid semver
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-25 21:52:34 +08:00
KubeSphere CI Bot
8ca0c86b39 Merge pull request #3577 from wansir/fix-unit-test
fix unit test timeout
2021-03-25 12:18:07 +08:00
hongming
c1574175e1 update vendor directory
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-25 11:33:41 +08:00
hongming
4663f70ec4 fix unit test timeout
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-25 11:28:13 +08:00
Roland.Ma
702d181fb6 fix ut timeout issue
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-25 02:00:00 +00:00
KubeSphere CI Bot
e6bbff1111 Merge pull request #3548 from zackzhangkai/master
fix import error
2021-03-25 08:56:46 +08:00
KubeSphere CI Bot
d5fdfd5172 Merge pull request #3550 from LinuxSuRen/fix-url-redundant-check
Fix the BitBucket endpoint URL redundant checking
2021-03-25 08:55:45 +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
KubeSphere CI Bot
8d96805592 Merge pull request #3527 from wanjunlei/nm
fix bug can not delete notification secret
2021-03-24 09:07:07 +08:00
rick
57ffd36282 Fix the BitBucket endpoint URL redundant checking
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-03-23 10:25:52 +08:00
zackzhangkai
ab7abe5e35 fix import error
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
2021-03-23 09:33:18 +08:00
pingstar
8e2fc3a425 Fix: the panic caused by parsing requestinfo slice access out of bounds
Signed-off-by: pingstar <kubeshared.com@gmail.com>
2021-03-22 22:29:55 +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
KubeSphere CI Bot
6fbaedfaf2 Merge pull request #3524 from LinuxSuRen/set-default-weather-score
Set default value of weatherScore to 100
2021-03-22 13:17:06 +08:00
zryfish
fb2db3e164 fix concurrent map writes (#3529)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-22 13:14:14 +08:00
wanjunlei
1fdeeaeb42 fix bug can not delete notification secret
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-21 09:50:34 +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
9c614bef98 Merge pull request #3490 from wanjunlei/nm
change kubesphere-monitoring-federated to system namespace
2021-03-19 14:48:06 +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
KubeSphere CI Bot
0a40cfdf0c Merge pull request #3465 from xyz-li/app-fix
Fix nil pointer and delete helmRelease
2021-03-19 14:20:05 +08:00
KubeSphere CI Bot
b2fc11808b Merge pull request #3462 from junotx/cmfix
add monitoring dashboard query api
2021-03-19 14:19: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
ac3e83b4eb Merge pull request #3491 from duanjiong/ippool
modify ippool api resource to namespace scope
2021-03-17 10:15:41 +08:00
Duan Jiong
ff1587f445 modify ippool api resource to namespace scope
sync namespace annotation when ippool is deleting

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
2021-03-16 19:41:26 +08:00
wanjunlei
3ff10a65d2 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-16 19:13:04 +08:00
wanjunlei
8e28925df3 change kubesphere-monitoring-federated to system namespace
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-16 18:40:26 +08:00
KubeSphere CI Bot
3a79df0da5 Merge pull request #3467 from RolandMa1986/feat-e2e-restclient
Refine group e2e test
2021-03-16 11:49:40 +08:00
junotx
a8b9211416 updating dashboard dependency version and resolve conflicts
Signed-off-by: junotx <junotx@126.com>
2021-03-16 10:49:49 +08:00
junotx
0c1f994695 monitoring dashboard dependency vendor
Signed-off-by: junotx <junotx@126.com>
2021-03-16 10:27:20 +08:00
junotx
4f5c1378f8 add monitoring dashboard query api
Signed-off-by: junotx <junotx@126.com>
2021-03-16 10:27:19 +08:00
Roland.Ma
8a1c453412 refine group e2e test
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-15 02:54:31 +00:00
KubeSphere CI Bot
b573d7ec58 Merge pull request #3461 from wansir/fix-3460
fix unauthorized resource access
2021-03-14 21:08:39 +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
hongming
ad38e692ff fix unauthorized resource access
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-12 18:13:00 +08:00
KubeSphere CI Bot
147f502257 Merge pull request #3356 from wanjunlei/nm
support customize notification receiver
2021-03-12 16:53:01 +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
263f07fe30 Fix: add router
Signed-off-by: LiHui <andrewli@yunify.com>
2021-03-12 10:05:44 +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
KubeSphere CI Bot
93ede4b770 Merge pull request #3440 from junotx/ca
fix alerts not retriggered when updating rule
2021-03-11 11:39:37 +08:00
KubeSphere CI Bot
2407511da3 Merge pull request #3437 from zackzhangkai/support_multi_port
support virtualservice multi port
2021-03-11 11:33:01 +08:00
zackzhangkai
676062d760 support virtualservice multi port
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
2021-03-11 11:12:51 +08:00
wanjunlei
e3cf58e84b Integrate all receivers into one crd, and all configs into another crd
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 18:55:46 +08:00
wanjunlei
d6d2cf002f resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:40:51 +08:00
wanjunlei
f4f5f8283e change notification crd version to v2alpha1
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:36:06 +08:00
wanjunlei
d79104b8a2 change api version to v2alpha1
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:33:30 +08:00
wanjunlei
5e39b7c752 add tenant-level apis for notification secret
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:32:49 +08:00
wanjunlei
d4a8f9bf88 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:32:49 +08:00
wanjunlei
f9213fcdc8 support customize notification receiver
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2021-03-10 17:32:48 +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
junotx
a3d44252f2 fix alerts unretriggered when updating rule
Signed-off-by: junotx <junotx@126.com>
2021-03-09 18:22:05 +08:00
KubeSphere CI Bot
f652be4395 Merge pull request #3436 from lshmouse/typo
Fix a typo of Amazon and the doc link of GKE
2021-03-09 16:41:36 +08:00
Shaohui Liu
2e3d8c4e3b Fix a typo of Amazon and some wrong doc links in README.md
Signed-off-by: Shaohui Liu <liushaohui@xiaomi.com>
2021-03-08 20:09:24 +08:00
KubeSphere CI Bot
6f719e0af6 Merge pull request #3427 from Ma-Dan/master
Add kubeedge API
2021-03-08 19:24:36 +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
KubeSphere CI Bot
737639020b Merge pull request #3433 from wansir/loginrecord
limit login record entries
2021-03-06 19:47:04 +08:00
KubeSphere CI Bot
88eb1af436 Merge pull request #3409 from junotx/ca
add alerting rule bulk api
2021-03-06 19:46:29 +08:00
hongming
70a0ee40d6 limit login record entries
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-06 14:45:11 +08:00
junotx
302000a650 tweak some variables and comments to alerting bulk
Signed-off-by: junotx <junotx@126.com>
2021-03-05 21:54:56 +08:00
KubeSphere CI Bot
490bb9ec30 Merge pull request #3018 from yunkunrao/metering
Add metering api
2021-03-05 15:34:29 +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
Rao Yunkun
36a6b6682d code clean
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-05 14:33:51 +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
KubeSphere CI Bot
6428160dae Merge pull request #3410 from duanjiong/ippool
fix ippool status statistics
2021-03-05 13:39:03 +08:00
junotx
c92431547f add some comments to alerting bulk
Signed-off-by: junotx <junotx@126.com>
2021-03-05 10:57:39 +08:00
junotx
91f85254aa add alerting rule bulk api
Signed-off-by: junotx <junotx@126.com>
2021-03-05 10:57:39 +08:00
junotx
390647c82a limit size of a rule group
Signed-off-by: junotx <junotx@126.com>
2021-03-05 10:57:39 +08:00
KubeSphere CI Bot
5acce77ad0 Merge pull request #3429 from RolandMa1986/staging-rules
Update staging repo sync rules
2021-03-04 19:04:27 +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
Roland.Ma
e058f938d1 staging repo sync rules
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-04 06:51:20 +00:00
KubeSphere CI Bot
65f935d0df Merge pull request #3344 from wansir/workspace-quota
support workspace resource quota
2021-03-03 11:19:59 +08:00
KubeSphere CI Bot
b4b7cc4d67 Merge pull request #3412 from yuswift/update_roadmap
update roadmap for multi-cluster
2021-03-03 09:58:25 +08:00
KubeSphere CI Bot
3004ed0eb1 Merge pull request #3423 from RolandMa1986/fix-vendor
Fix update-vendor.sh script
2021-03-02 16:26:24 +08:00
KubeSphere CI Bot
454ffb3288 Merge pull request #3424 from shaowenchen/master
fix: pipeline sync annotations
2021-03-02 15:29:24 +08:00
shaowenchen
921341d8ce fix: pipeline sync annotations
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2021-03-02 15:11:12 +08:00
Roland.Ma
298a5d3827 fix update vendor script
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-03-02 05:35:05 +00:00
Rao Yunkun
5bddda51e7 Change metering exported format to csv.
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2021-03-02 11:56:08 +08:00
hongming
70fa24010c support workspace resource quota
Signed-off-by: hongming <talonwan@yunify.com>
2021-03-02 10:42:09 +08:00
KubeSphere CI Bot
d412fdae98 Merge pull request #3416 from zryfish/fix_fmt_issue
fix code format issues
2021-03-01 15:47:58 +08:00
Jeff
a2ede11ee7 fix code format issues
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-01 15:21:15 +08:00
KubeSphere CI Bot
12f8407218 Merge pull request #3403 from zryfish/reconcile_application_with_specified_label
support selective application reconcilation
2021-03-01 15:19:24 +08:00
Jeff
c28afabdd5 application controller will only reconcile applications matched with given label selector
Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-01 13:19:26 +08:00
yuswift
88eb5b8f3a update roadmap for multi-cluster
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-03-01 11:16:45 +08:00
KubeSphere CI Bot
befebadc21 Merge pull request #3408 from wansir/fix-3407
Fix cannot modify UserSpec
2021-02-27 17:23:23 +08:00
hongming
7929dd361e Fix cannot modify UserSpec
Signed-off-by: hongming <talonwan@yunify.com>
2021-02-26 16:13:25 +08:00
KubeSphere CI Bot
ee9c2d114c Merge pull request #3375 from RolandMa1986/feat-e2e-pipeline
add e2e github action
2021-02-26 13:53:10 +08:00
KubeSphere CI Bot
1ff873141a Merge pull request #3396 from RolandMa1986/fix-devopsrole
DevOps roles not been initialed
2021-02-26 13:52:56 +08:00
Roland.Ma
d0c766c311 fix: devops roles not been initialed
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-02-25 06:32:44 +00:00
KubeSphere CI Bot
8500a22803 Merge pull request #3394 from duanjiong/ippool
Update calico lib
2021-02-25 11:42:21 +08:00
KubeSphere CI Bot
a57359e97a Merge pull request #3383 from shaowenchen/add_annotations_to_pipeline
feature: add annotations to pipelines for getting syncstatus
2021-02-25 11:05:17 +08:00
KubeSphere CI Bot
e48306d74b Merge pull request #3380 from yuswift/refactor_cluster_controller
refactor cluster controller
2021-02-25 10:52:58 +08:00
Duan Jiong
2705d25e83 Update calico lib
fix struct definition error in v3

Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
2021-02-24 18:06:36 +08:00
Roland.Ma
7aa602e124 e2e github action
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-02-24 06:56:23 +00:00
shaowenchen
f6bcdc50fd feature: add annotations to pipelines for getting syncstatus
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2021-02-24 14:19:09 +08:00
yuswift
194d054973 refactor cluster controller
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-02-24 10:12:42 +08:00
KubeSphere CI Bot
000d309785 Merge pull request #3376 from duanjiong/ippool
Don't exit while synchronizing calico ippool
2021-02-23 14:51:57 +08:00
Duan Jiong
78c7b81ce5 Don't exit while synchronizing calico ippool
Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
2021-02-23 11:31:05 +08:00
KubeSphere CI Bot
a4310e67ee Merge pull request #3372 from benjaminhuo/master
Update roadmap for o11y & edge
2021-02-23 10:16:57 +08:00
KubeSphere CI Bot
68ff7b8328 Merge pull request #3364 from LinuxSuRen/devops-credential-sync
Fix the issues that devops credentials cannot be deleted
2021-02-22 16:54:56 +08:00
KubeSphere CI Bot
898ba72bcb Merge pull request #3370 from zheng1/master
Update OpenPitrix and Network roadmap
2021-02-22 16:38:19 +08:00
Benjamin
27eb3f7da6 Update roadmap for o11y & edge
Signed-off-by: Benjamin <benjamin@yunify.com>
2021-02-22 15:43:34 +08:00
Zhengyi Lai
c7e522afc2 Update OpenPitrix and Network roadmap
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2021-02-22 14:51:05 +08:00
KubeSphere CI Bot
e74ca0ead0 Merge pull request #3335 from LinuxSuRen/fix-pipeline-run-err-count
Fix the wrong count of total Pipeline Run number
2021-02-22 14:32:19 +08:00
yunkunrao
e9073f0486 Add metering api.
Signed-off-by: yunkunrao <yunkunrao@yunify.com>
2021-02-22 14:31:10 +08:00
rick
a5ec7b4b00 Set a explicit loggger level in func SendPureRequestWithHeaderResp
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-02-22 14:29:53 +08:00
rick
054d85e6c4 Fix the wrong count of total Pipeline Run number
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-02-22 14:22:08 +08:00
KubeSphere CI Bot
2f5202f38a Merge pull request #3366 from RolandMa1986/feat-e2e
e2e: add client library
2021-02-22 12:19:52 +08:00
KubeSphere CI Bot
dfa1566bb9 Merge pull request #3342 from LinuxSuRen/fix-pip-filter
Fix the Pipeline name filter issues
2021-02-22 11:59:19 +08:00
Roland.Ma
72441f4f14 update e2e build script
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-02-22 02:01:13 +00:00
KubeSphere CI Bot
470a87ef63 Merge pull request #3352 from wansir/feature-cas
support CAS identity provider
2021-02-21 11:39:19 +08:00
Rick
6fc5baaca0 Fix the issues that devops credentials cannot be deleted
Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
2021-02-20 18:49:08 +08:00
Roland.Ma
fd2f213f3a e2e test framework
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-02-20 07:34:31 +00:00
hongming
5f0727cf34 support CAS identity provider
Signed-off-by: hongming <talonwan@yunify.com>
2021-02-20 10:45:55 +08:00
KubeSphere CI Bot
5972c4b66a Merge pull request #3349 from LinuxSuRen/get-latest-resource-version
Trying to avoid the error of `Operation cannot be fulfilled on` by getting the latest resourceVersion
2021-02-20 10:11:18 +08:00
KubeSphere CI Bot
2d73e777f4 Merge pull request #3362 from LinuxSuRen/remove-k8s.io-module
Remove k8s.io/kubernetes from go.mod
2021-02-19 11:59:53 +08:00
rick
5a8e8ca35e Remove k8s.io/kubernetes from go.mod
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-02-19 10:05:19 +08:00
KubeSphere CI Bot
5d9445d18a Merge pull request #3254 from yuswift/feature/validate-member_cluster-config
validate member cluster config while joining member clusters.
2021-02-18 16:57:26 +08:00
KubeSphere CI Bot
e477a213b5 Merge pull request #3360 from yuswift/update_dependency
run update-vendor.sh to update dependencies
2021-02-18 16:38:27 +08:00
yuswift
dcf451dd41 run update-vendor.sh to update dependcy
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-02-18 15:49:08 +08:00
yuswift
93addfd1cc validate member cluster config
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-02-18 15:36:36 +08:00
KubeSphere CI Bot
57d72472c3 Merge pull request #3286 from LinuxSuRen/fix-pip-input-approve-check
Fix the incorrect approvable check of Pipeline input
2021-02-18 10:41:26 +08:00
KubeSphere CI Bot
a0780e2bee Merge pull request #3338 from junotx/ca
custom alerting tuning
2021-02-18 10:40:26 +08:00
rick
ff384d30a6 trying to avoid the error of Operation cannot be fulfilled on by getting the latest resourceVersion
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-02-05 09:43:52 +08:00
KubeSphere CI Bot
166dd4ff73 Merge pull request #3346 from RolandMa1986/fix-3343
Fix workspace member count
2021-02-04 22:18:46 +08:00
KubeSphere CI Bot
71b038990b Merge pull request #3330 from zackzhangkai/application-unit-test
add application unit test files
2021-02-04 22:08:46 +08:00
KubeSphere CI Bot
5331ad8fa5 Merge pull request #3319 from yuswift/remove_http1.1_support_code
remove http1.1 support code
2021-02-04 22:07:46 +08:00
Roland.Ma
dc9f0ed4cf fix workspace member count
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-02-03 06:38:30 +00:00
junotx
bac3d66fd2 alerting rules default to sort by update time
Signed-off-by: junotx <junotx@126.com>
2021-02-02 17:52:48 +08:00
rick
cab4915795 Fix the Pipeline name filter issues
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-02-02 15:19:55 +08:00
yuswift
c83a0a508e remove_http1.1_support_code
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-02-02 14:43:45 +08:00
junotx
f57d91511d optimize operations for the latest rule resources
Signed-off-by: junotx <junotx@126.com>
2021-02-02 10:24:49 +08:00
KubeSphere CI Bot
f32e53fce3 Merge pull request #3294 from LinuxSuRen/fix-jenkins-api-proxy
Add support to proxy Jenkins API with POST method
2021-02-01 17:39:17 +08:00
KubeSphere CI Bot
b83b8f89a6 Merge pull request #3337 from shaowenchen/clear_devops
improvement: update owners for devops
2021-02-01 17:34:17 +08:00
junotx
5e7f40e6b9 exclude alerting rule replica label
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:25:56 +08:00
junotx
a120969be7 optimize alerting rule concurrency
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:25:30 +08:00
junotx
2893f4cc0e update alerting page param
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:24:45 +08:00
junotx
cdbce887dd enhance the alerting rule validation
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:23:35 +08:00
junotx
3a0e089129 add request err with api not enabled to alerting
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:22:43 +08:00
junotx
5467b2a1a3 make the responses of listing alerts apis consistent
Signed-off-by: junotx <junotx@126.com>
2021-02-01 17:22:18 +08:00
KubeSphere CI Bot
2f490470db Merge pull request #3317 from shaowenchen/fix_query_image
add parameter to allow ignore cert
2021-02-01 17:17:17 +08:00
shaowenchen
2380c3b5cc improvement: update owners for devops
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2021-02-01 17:11:02 +08:00
KubeSphere CI Bot
626c30b9ab Merge pull request #3296 from SxunS/bugfix/ipv4
When the ip4 addres is nil, it should try the next.
2021-02-01 10:59:44 +08:00
zackzhang
31f5f8477b add application unit test files
Signed-off-by: zackzhang <zackzhang@yunify.com>
2021-02-01 09:59:04 +08:00
shaowenchen
774cefcbee add parameter to allow ignore cert
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2021-01-29 18:17:35 +08:00
KubeSphere CI Bot
4fd6e3e95f Merge pull request #3173 from Ma-Dan/master
Add metrics-server client to monitoring
2021-01-29 15:55:43 +08:00
KubeSphere CI Bot
011c4853cc Merge pull request #3291 from LinuxSuRen/pipeline-choice-param
Fix the wrong XML parse of Pipeline choice parameter
2021-01-29 15:23:44 +08:00
KubeSphere CI Bot
c029751dc0 Merge pull request #3289 from yuswift/bugfix/proxy-upgrade
fix proxy upgrade error when using kubeconfig with token
2021-01-29 15:21:43 +08:00
yuswift
a97048b08d fix proxy upgrade error when using kubeconfig with token
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-01-28 16:07:39 +08:00
rick
530c6911a5 Fix the incorrect approvable check of Pipeline input
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-01-27 11:25:14 +08:00
root
3095fd9403 Add test code to metrics client, and fix metrics items process
Signed-off-by: root <danma@yunify.com>
2021-01-26 08:30:41 +00:00
黎咏
cd4cbf1962 When the ip4 addres is nil, it should try the next.
Signed-off-by: 黎咏 <s_xun_s@163.com>
2021-01-26 12:42:56 +08:00
root
8c86c9e1a5 Add metrics-server client to monitoring
Signed-off-by: root <danma@yunify.com>
2021-01-25 07:10:41 +00:00
KubeSphere CI Bot
38eaa5cde0 Merge pull request #3279 from LinuxSuRen/fix-pipe-list
Fix the pipeline list with incorrect paging calculating
2021-01-25 14:58:41 +08:00
KubeSphere CI Bot
e6365c62d5 Merge pull request #3214 from yuswift/feature/support_configurable_cluster_resync_perioud
Configurable cluster resync perioud
2021-01-25 14:04:42 +08:00
rick
81c0df01fe Fix the wrong XML parse of Pipeline choice parameter
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-01-25 12:01:04 +08:00
rick
2e9367fb70 Add support to proxy Jenkins API with POST method
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-01-25 11:25:59 +08:00
yuswift
9e0a4b69e8 support configurable cluster resync perioud
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-01-22 18:06:13 +08:00
KubeSphere CI Bot
3c79548262 Merge pull request #3268 from RolandMa1986/feat-sa
Feat ServiceAccount management
2021-01-21 20:03:40 +08:00
KubeSphere CI Bot
7ab1eb1d6a Merge pull request #3189 from wansir/oidc
support OIDC identity provider
2021-01-21 16:13:40 +08:00
KubeSphere CI Bot
eca6a2d07c Merge pull request #3267 from zackzhangkai/fix-controller-manager
fix application reconcile
2021-01-21 15:57:40 +08:00
KubeSphere CI Bot
2e9b42eaf1 Merge pull request #3242 from zackzhangkai/roadmap
add microservice roadmap
2021-01-19 17:11:39 +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
zackzhang
2b0b36672b fix application reconcile
Signed-off-by: zackzhang <zackzhang@yunify.com>
2021-01-19 14:58:07 +08:00
hongming
ac2bdf2509 support oidc identity provider
Signed-off-by: hongming <talonwan@yunify.com>
2021-01-18 15:12:35 +08:00
rick
c72a106bab Fix the pipeline list with incorrect paging calculating
Signed-off-by: rick <rick@jenkins-zh.cn>
2021-01-18 10:48:35 +08:00
KubeSphere CI Bot
1f4d5cb686 Merge pull request #3181 from junotx/custom-alerting
feature: custom alerting
2021-01-18 10:19:14 +08:00
KubeSphere CI Bot
edbbd682b5 Merge pull request #3239 from yuswift/multi-cluster-roadmap
add roadmap for multi-cluster
2021-01-18 10:17:38 +08:00
yuswift
99c33b37ef add roadmap for multi-cluster
Signed-off-by: yuswift <yuswiftli@yunify.com>
2021-01-18 10:10:37 +08:00
junotx
514fec7eb4 custom alerting use the same API group and flagset to alerting
Signed-off-by: junotx <junotx@126.com>
2021-01-15 13:48:48 +08:00
Roland.Ma
02b0d9247f add serviceaccount contorller
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-01-15 05:23:58 +00:00
Roland.Ma
35f7e46c65 feat: add serviceaccounts api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2021-01-15 05:23:57 +00:00
zackzhang
1ddea23f27 add microservice roadmap
Signed-off-by: zackzhang <zackzhang@yunify.com>
2021-01-15 12:13:34 +08:00
KubeSphere CI Bot
f5e2b05240 Merge pull request #3220 from xyz-li/master
add metrics
2021-01-15 10:16:37 +08:00
KubeSphere CI Bot
ff0861bd1c Merge pull request #3243 from zheng1/roadmap
Add AppStore/Network/Metering Roadmap in v3.1
2021-01-15 10:07:08 +08:00
junotx
6f9d306368 custom alerting resolve conflicts
Signed-off-by: junotx <junotx@126.com>
2021-01-12 16:52:37 +08:00
junotx
9831eb3533 custom alerting optimize
Signed-off-by: junotx <junotx@126.com>
2021-01-12 16:52:36 +08:00
junotx
371c9b187d custom alerting
Signed-off-by: junotx <junotx@126.com>
2021-01-12 16:52:36 +08:00
KubeSphere CI Bot
242193ddb0 Merge pull request #3255 from benjaminhuo/master
Add roadmap for O11y and Edge
2021-01-12 13:57:35 +08:00
KubeSphere CI Bot
a638df58ab Merge pull request #3235 from LinuxSuRen/fix-pipeline-not-sync
Fix the pipeline do not sync with Jenkins
2021-01-11 10:13:35 +08:00
KubeSphere CI Bot
3788124641 Merge pull request #3256 from zheng1/network.topology
Add network.topology into conf.ToMap()
2021-01-11 10:03:35 +08:00
LiHui
e57e602b69 change method name
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-08 14:16:02 +08:00
KubeSphere CI Bot
b3b7f53583 Merge pull request #3224 from junotx/cme
fix metrics query bug for pods with duplicate name in one node
2021-01-08 14:01:34 +08:00
junotx
9304e839b1 fix metrics query bug for pods with duplicate name in one node
Signed-off-by: junotx <junotx@126.com>
2021-01-08 13:53:49 +08:00
Benjamin
1cfe84d217 Add roadmap for O11y and Edge
Signed-off-by: Benjamin <benjamin@yunify.com>
2021-01-07 18:07:42 +08:00
Zhengyi Lai
492b4ae8c2 Add network.topology into conf.ToMap()
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2021-01-06 15:04:43 +08:00
LiHui
bc9fe7f656 add process and goroutine metrics
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-06 10:23:30 +08:00
LiHui
1ecec78379 enable metrics by default
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-06 10:18:14 +08:00
LiHui
611f1c6991 add metrics to controller-manager
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-06 10:18:14 +08:00
LiHui
056bebdec6 fix test
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-06 10:18:14 +08:00
LiHui
5c8ac10d26 add metrics
Signed-off-by: LiHui <andrewli@yunify.com>
2021-01-06 10:18:14 +08:00
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
f2e96bce7f Merge pull request #3250 from zackzhangkai/support-customized-repo
support pass customized repo
2021-01-06 09:56:33 +08:00
KubeSphere CI Bot
80a6faf95a Merge pull request #3249 from shaowenchen/feature_devops_roadmap
feature: add devops roadmap
2021-01-06 09:55:33 +08:00
KubeSphere CI Bot
db54eff566 Merge pull request #3240 from wansir/roadmap
update roadmap
2021-01-06 09:54:33 +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
KubeSphere CI Bot
a7c58617e1 Merge pull request #3222 from wansir/master
update dependencies
2021-01-06 09:47:33 +08:00
zackzhang
324f4aebbb support pass customized repo
Signed-off-by: zackzhang <zackzhang@yunify.com>
2021-01-05 16:21:25 +08:00
Zhengyi Lai
a4cc1d189a Add AppStore/Network/Metering Roadmap in v3.1
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2021-01-05 13:34:47 +08:00
shaowenchen
e97947870e feature: add devops 3.1 roadmap
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2021-01-05 11:41:35 +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
hongming
6a68925d19 update roadmap
Signed-off-by: hongming <talonwan@yunify.com>
2021-01-04 13:18:57 +08:00
KubeSphere CI Bot
4a11a50544 Merge pull request #3238 from RolandMa1986/roadmap
Updates roadmap
2021-01-04 10:48:56 +08:00
Roland.Ma
c8d47446ae update roadmap
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-12-31 03:04:58 +00:00
zryfish
d7c214acf5 add v3.1 roadmap (#3237)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2020-12-30 20:17:52 +08:00
KubeSphere CI Bot
078dead7fe Merge pull request #3216 from duanjiong/ippool
add ippool resource api
2020-12-29 19:47:52 +08:00
wanjunlei
83c010c691 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-12-29 14:58:26 +08:00
Duan Jiong
27b335a9c9 Support ippool configuration status field
Signed-off-by: Duan Jiong <djduanjiong@gmail.com>
2020-12-29 14:32:21 +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
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
KubeSphere CI Bot
8a6ce2d7ac Merge pull request #3233 from wansir/informer
fix no informer found
2020-12-29 11:02:52 +08:00
KubeSphere CI Bot
7b0d0682a8 Merge pull request #3228 from LinuxSuRen/daily-build
Add a GitHub action for building nightly images
2020-12-29 10:57:52 +08:00
hongming
0fa3dab250 fix no informer found
Signed-off-by: hongming <talonwan@yunify.com>
2020-12-29 10:26:38 +08:00
KubeSphere CI Bot
d7a8490cde Merge pull request #3229 from wanjunlei/audit-ldap
fix bug Failed to configure LDAP login, error message: socket hang up
2020-12-29 10:23:53 +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
ed18749172 Merge pull request #3201 from wanjunlei/auditing-log2
fix bug get goroutine for audit timeout
2020-12-28 13:55:40 +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
wanjunlei
ea34bda865 fix bug #3226
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-12-25 11:56:02 +08:00
rick
490a2802c1 Add a GitHub action for building nightly images
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-25 11:16:52 +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
Roland.Ma
bec38d7e0f add group api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-12-24 09:27:59 +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
KubeSphere CI Bot
ce9ca401c3 Merge pull request #3146 from zackzhangkai/kiali-use-pod-2
using Kiali API directly
2020-12-18 14:02:48 +08:00
zackzhangkai
f153390468 support using Kiali API directly
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-12-17 21:28:16 +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
KubeSphere CI Bot
ce0f417949 Merge pull request #3149 from LinuxSuRen/import-pipeline-list
Mix up the pipeline list between ks and Jenkins
2020-12-15 11:35:46 +08:00
zryfish
6da7ab03dd remove unused package (#3204)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2020-12-15 11:32:05 +08:00
KubeSphere CI Bot
41fc9636c3 Merge pull request #3199 from fafucoder/master
fixed: check the cluster has initialized
2020-12-14 16:05:45 +08:00
wanjunlei
ee95aeff15 resolve conversation
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-12-14 15:38:11 +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
wanjunlei
b543ae1a12 fix bug get goroutine for audit timeout
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
2020-12-14 11:10:40 +08:00
rick
e2fee2cd90 Fix two issues according to review opinions
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-11 13:38:25 +08:00
rick
3d12019e23 Mix up the pipeline list between ks and Jenkins
Technically we should take the Pipeline list from ks or mixup the instead of only taking it from Jenkins. Because we always manipulate Pipeline from ks.

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-11 13:38:20 +08:00
KubeSphere CI Bot
a314b31bf0 Merge pull request #3177 from LinuxSuRen/fix/multi-branch-panic-with-nil
Fix ks-controller panic due to missing nil checking in mutli-branch pipeline
2020-12-11 12:00:45 +08:00
KubeSphere CI Bot
d7607b3eaf Merge pull request #3167 from wansir/sensitive-config
config data desensitization
2020-12-11 10:06:45 +08:00
KubeSphere CI Bot
af5b1fe6be Merge pull request #3193 from junotx/custom-monitoring-enhance
custom monitoring with cluster level
2020-12-11 09:54:45 +08:00
KubeSphere CI Bot
cdc03e78e6 Merge pull request #3190 from LinuxSuRen/fix/artifact-download-er
Fix devops artifact cannot be download due to auth checking
2020-12-10 21:48:44 +08:00
rick
4d9268be3d Fix devops artifact cannot be download due to auth checking
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-10 20:33:42 +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
junotx
933d0b5571 custom monitoring with cluster level
Signed-off-by: junotx <junotx@126.com>
2020-12-10 17:16:38 +08:00
KubeSphere CI Bot
8330e9eb7a Merge pull request #3186 from junotx/monitoring
support for querying pods metrics from the cluster level
2020-12-10 14:38: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
rick
f50f30e6a3 Refactory pr discover with Bitbucket, avoid using number to compare
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-09 14:27:06 +08:00
KubeSphere CI Bot
e4e6405c8c Merge pull request #3178 from RolandMa1986/feat-group-api
filter groupbinding by user field
2020-12-09 13:59:43 +08:00
rick
e4782b37f0 Remove the specified version of jenkins plugin scm-api
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-09 13:41:01 +08:00
junotx
1df035ed06 support for querying pods metrics from the cluster level
Signed-off-by: junotx <junotx@126.com>
2020-12-09 10:23:33 +08:00
Roland.Ma
ca041bf4bd filter groupbinding by user field
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-12-08 14:27:20 +00: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
KubeSphere CI Bot
1d2204cdfa Merge pull request #3165 from LinuxSuRen/fix/pipeline-cron-tips
Fix the inapproprite errors handle with cron expression checking
2020-12-08 17:59:43 +08:00
KubeSphere CI Bot
bfdef0e67b Merge pull request #3156 from LinuxSuRen/pipeline-approve
Restrict only specific users or admin can approve a pipeline
2020-12-08 17:49:43 +08:00
KubeSphere CI Bot
68979b8f02 Merge pull request #3175 from zackzhangkai/master
add kubeconfig check
2020-12-07 11:55:42 +08:00
rick
4d19c4dbb4 Provide a specific log level instead of using log.error
unifi variable declare style

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-07 11:09:37 +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
rick
0b4ed3f8c8 Fix ks-controller panic due to missing nil checking in mutli-branch pipeline
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-03 13:48:25 +08:00
rick
730657166c Add more error handling when request cron validation
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-03 09:45:25 +08:00
KubeSphere CI Bot
e16219be55 Merge pull request #3163 from LinuxSuRen/improve-docker-build
Improve the process of build docker images.
2020-12-02 17:47:40 +08:00
KubeSphere CI Bot
18bb1c116b Merge pull request #3145 from LinuxSuRen/master
Provide a hunman readable error message instead of the raw
2020-12-02 17:44:40 +08:00
KubeSphere CI Bot
efde8dc9a5 Merge pull request #3168 from zackzhangkai/fix_comments
fix comments
2020-12-02 17:41:40 +08:00
rick
164ffbbfda Discard these changes base the discussion on github
discussion thread is here https://github.com/kubesphere/kubesphere/pull/3163#discussion_r533959311

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-02 16:12:41 +08:00
rick
92e7349cf9 Fix an issue which the pipeline owner cannot approve his pipeline
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-02 14:07:55 +08:00
hongming
13ede7dacc config data desensitization
Signed-off-by: hongming <talonwan@yunify.com>
2020-12-01 15:08:00 +08:00
zackzhangkai
96fe71173a fix comments
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-12-01 12:50:30 +08:00
KubeSphere CI Bot
a31b8dc1cb Merge pull request #3159 from LinuxSuRen/fix/docker-login-issues
Fix the docker login isseus
2020-12-01 11:22:39 +08:00
rick
66dd5ac784 Keep the orignal error messages with log printing instead swallow them
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-01 11:14:42 +08:00
KubeSphere CI Bot
2845d4b03b Merge pull request #3151 from zackzhangkai/kiali-filter-ns
just filter out namespace started with kube-
2020-12-01 11:11:39 +08:00
KubeSphere CI Bot
0ce8564535 Merge pull request #3148 from RolandMa1986/feat-userapi
add group filter for user api
2020-12-01 11:09:40 +08:00
KubeSphere CI Bot
fafe5f14e6 Merge pull request #3131 from LinuxSuRen/gitlab-multi-branch-pipeline
Add gitlab multi-branch pipeline support
2020-12-01 10:56:39 +08:00
rick
039dbf8033 Fix the inapproprite errors handle with cron expression checking
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-12-01 10:07:57 +08:00
rick
53c3204902 Allow users to specific goos via env variable
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-30 15:20:33 +08:00
rick
8451c18277 Add unit tests for pipeline approve functions
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-30 14:09:44 +08:00
rick
df34ee9978 Adding approvable field to indicate if current user can approve a particular step
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-30 11:42:41 +08:00
rick
8f4a6d9b93 Restrict only specific users or admin can approve a pipeline
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-30 09:28:08 +08:00
zackzhangkai
d78d7f0ad0 just filter out kube-* namespaces
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-11-29 22:30:18 +08:00
rick
dab77ef369 Fix the docker login isseus
It was caused by a unknown situation after improve docker_build.sh.

Fixes #3158

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-28 21:31:25 +08:00
KubeSphere CI Bot
c5de21af4a Merge pull request #3129 from LinuxSuRen/fix-docker-login-issues
Avoid docker login everytime even it is done before
2020-11-26 19:35:37 +08:00
KubeSphere CI Bot
1e1c976bca Merge pull request #3147 from LinuxSuRen/fix/default-jenkinsfile
Fix panic against with pipeline-multibranch-defaults-plugin
2020-11-25 19:56:32 +08:00
Roland.Ma
30216c411b add group filter for user api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-25 09:41:26 +00:00
rick
00e8b0e5ef Fix panic against with pipeline-multibranch-defaults-plugin
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-25 15:38:07 +08:00
rick
d35e22f0be Provide a hunman readable error message instead of the raw
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-25 09:07:20 +08:00
zryfish
2e1d75f383 fix makefile build on mac (#3144)
Signed-off-by: Jeff <jeffzhang@yunify.com>
2020-11-24 20:49:51 +08:00
rick
af471bce59 Add unit test cases for gitlab multi-branch pipeline
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-24 16:40:26 +08:00
KubeSphere CI Bot
f6186a39c3 Merge pull request #3141 from LinuxSuRen/feature-request-template
Adding a feature request issue template
2020-11-24 14:28:36 +08:00
rick
52c6f5f479 Use camel case style according to review comments
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-24 13:54:35 +08:00
rick
573dab2208 Make the logger level as 8 in the DevOps code lines
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-24 13:48:29 +08:00
rick
3293948b33 Add gitlab multi-branch pipeline support
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-24 13:48:25 +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
KubeSphere CI Bot
ab7ecee910 Merge pull request #3138 from RolandMa1986/controller-refactoring
refactor controllers
2020-11-24 11:30:36 +08:00
KubeSphere CI Bot
b5e2037f88 Merge pull request #3139 from wansir/ldap-idp
improve LDAP identity provider
2020-11-24 11:29:36 +08:00
KubeSphere CI Bot
6ca2ecf4b6 Merge pull request #3127 from RolandMa1986/feat-group-rolebinding
add rolebinding api
2020-11-24 11:26:36 +08:00
hongming
00920d3d51 improve LDAP identity provider
Signed-off-by: hongming <talonwan@yunify.com>
2020-11-23 17:29:46 +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
Roland.Ma
aa471f998c refine methods
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-23 06:11:49 +00:00
rick
d8397a1c13 Fix the potential issue caused by commented area mark
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-23 11:29:59 +08:00
Roland.Ma
079b43e301 add rolebinding api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-23 02:59:48 +00:00
rick
c240fe11e6 Typo fixes
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-23 10:47:27 +08:00
rick
1a41519b8b Adding a feature request issue template
Using an issue template is always a good practice when we try to submit an issue.

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-23 10:31:48 +08: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
9a9b768aca Add a command to builder docker image without test
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-19 15:37:39 +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
rick
eb503f4051 Avoid docker login everytime even it is done before
Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-18 22:35:08 +08:00
KubeSphere CI Bot
f6fea24a75 Merge pull request #3097 from zackzhangkai/update-prom-client-2
Upgrade prometheus dependencies
2020-11-18 10:08:33 +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
zackzhangkai
745ede8519 upgrade prometheus client-go
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-11-17 18:13:43 +08:00
KubeSphere CI Bot
89de94dbf8 Merge pull request #3121 from LinuxSuRen/fix/vet-errs
Fix the errors found by go vet
2020-11-17 18:03:33 +08:00
KubeSphere CI Bot
01cc686cd3 Merge pull request #3080 from zheng1/weave
Add param WeaveScopeHost
2020-11-17 17:25:33 +08:00
Zhengyi Lai
c8f814acf2 Add param WeaveScopeHost
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2020-11-17 16:57:11 +08:00
KubeSphere CI Bot
343b2e60f4 Merge pull request #3120 from yuswift/feature/lightweight-membercluster-installation
Feat: support runnig ks-apiserver without redis option && change log level
2020-11-17 11:32:25 +08:00
yuswift
2278132d08 Feat: support runnig ks-apiserver without redis option && change log level
Signed-off-by: yuswift <yuswiftli@yunify.com>
2020-11-17 10:51:07 +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
KubeSphere CI Bot
e9f709057a Merge pull request #3042 from wansir/fix-3041
Fix container terminal security risk
2020-11-16 13:35:33 +08:00
KubeSphere CI Bot
e7a5955aa5 Merge pull request #3118 from yuswift/feature/lightweight-membercluster-installation
Feat: support runnig ks-controller-manager without ldap option
2020-11-16 13:34:32 +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
KubeSphere CI Bot
0b18c571a4 Merge pull request #3109 from RolandMa1986/fix-e2e
fix e2e build issue
2020-11-13 16:38:32 +08:00
hongming
cd99f78768 Fix container terminal security risk
Signed-off-by: hongming <talonwan@yunify.com>
2020-11-13 16:37:33 +08:00
KubeSphere CI Bot
1cb1eb4f6d Merge pull request #3104 from LinuxSuRen/imporove-issues-template
Make the issues template can keep comment section
2020-11-13 14:28:08 +08:00
Roland.Ma
37abb4f313 fix e2e build issue
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-13 02:26:07 +00:00
rick
4bbb18f902 Make the issues template can keep comment section
Always clean the unnecessary part of issues template is really a boring thing. But we can just keep it by using comment syntax of markdown

Signed-off-by: rick <rick@jenkins-zh.cn>
2020-11-12 09:45:37 +08:00
KubeSphere CI Bot
b14081ce9f Merge pull request #3073 from RolandMa1986/feat-group-api
feat: group auth, add group & groupbinding api
2020-11-11 17:10:30 +08:00
KubeSphere CI Bot
6736379888 Merge pull request #3032 from RolandMa1986/feat-group-auth-v5
feat: add group and groupbinding controller
2020-11-11 17:05:32 +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
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
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
KubeSphere CI Bot
6f7e59ca16 Merge pull request #3045 from zackzhangkai/ks-kiali-support-out-cluster
kiali k8s client support out-cluster
2020-11-11 10:49:31 +08:00
Roland.Ma
af271a49ce feat: group auth, add group & groupbinding api
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-11-10 07:19:59 +00:00
zackzhangkai
e4049e4e66 kiali k8s client support out-cluster
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-11-07 17:53:49 +08:00
KubeSphere CI Bot
675823b978 Merge pull request #3087 from yuswift/bugfix/print-configfile-load-error
fix issue #3086
2020-11-06 18:02:37 +08:00
KubeSphere CI Bot
1b0bcb5d63 Merge pull request #3069 from huanggze/master
minor cleanup
2020-11-06 17:49:38 +08:00
KubeSphere CI Bot
aa64c745c9 Merge pull request #3033 from duanjiong/ippool
implement ippool
2020-11-06 17:32:43 +08:00
KubeSphere CI Bot
c86dfbc7ad Merge pull request #3002 from yunkunrao/add_kubelet_pleg_relist_quantile
Add node metric: node_pleg_quantile
2020-11-06 17:24:58 +08:00
KubeSphere CI Bot
ed271f0205 Merge pull request #3046 from shaowenchen/fix_inscm_bool_parameter
fix: adapt to  different parameter types for pipeline
2020-11-06 17:19:45 +08:00
KubeSphere CI Bot
a227f04e84 Merge pull request #3016 from OhBonsai/master
chore: fix typing error
2020-11-05 18:17:24 +08:00
yuswift
51168c730c fix issue #3086
Signed-off-by: yuswift <yuswiftli@yunify.com>
2020-11-05 15:26:12 +08:00
huanggze
10fedfe432 minor cleanup
Signed-off-by: huanggze <loganhuang@yunify.com>
2020-11-03 11:58:16 +08:00
KubeSphere CI Bot
f61d882046 Merge pull request #3050 from FeynmanZhou/master
Fix the out-of-date slack invitation link in the issue and PR templates
2020-11-01 18:26:50 +08:00
FeynmanZhou
2f5cfae35e fix the out-of-date slack invitation link
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2020-11-01 18:07:48 +08:00
FeynmanZhou
5e9c6fc02a Merge branch 'master' of https://github.com/kubesphere/kubesphere 2020-11-01 11:10:19 +08:00
shaowenchen
635de6da45 fix: adapt to different parameter types for pipeline
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2020-10-30 15:22:29 +08:00
pengfei
b4ab781439 Merge pull request #3039 from stoneshi-yunify/fix-readme
fix dead links in readme
2020-10-29 11:07:29 +08: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
stoneshi-yunify
b792438106 fix dead links in readme
Signed-off-by: stoneshi-yunify <stoneshi@yunify.com>
2020-10-28 18:02:16 +08:00
KubeSphere CI Bot
abe9975b95 Merge pull request #3029 from wansir/master
refine api docs
2020-10-27 20:01:32 +08:00
hongming
496db42be6 refine api docs
Signed-off-by: hongming <talonwan@yunify.com>
2020-10-27 18:48:36 +08:00
KubeSphere CI Bot
a7d31930f8 Merge pull request #3023 from RolandMa1986/feat-group-auth-crds
feat: group authorization
2020-10-23 10:25:59 +08:00
Roland.Ma
7c6723da46 feat:group authorizetion. Add group and groupbinding crds, generated clientset
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-10-21 08:26:50 +00: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
KubeSphere CI Bot
ffa995f2a4 Merge pull request #3014 from zackzhangkai/fix_app_status
fix application status
2020-10-15 16:50:26 +08:00
OhBonsai
419d66e7c1 chore: fix typing error
Signed-off-by: OhBonsai <letbonsaibe@gmail.com>
2020-10-14 16:52:43 +08:00
zackzhangkai
d1e7f35b3e fix application status
Signed-off-by: zackzhangkai <zackzhang@yunify.com>
2020-10-13 10:13:51 +08:00
KubeSphere CI Bot
9961a1df60 Merge pull request #2997 from lxm/oauth-aliyunidaas
support aliyun idaas oauth login
2020-10-09 19:50:47 +08:00
KubeSphere CI Bot
686dfef96b Merge pull request #3003 from Howie59/master
Fix for issue #2832
2020-10-09 19:47:47 +08:00
lihaowei
d5c1d93fe5 Merge branch 'master' of https://github.com/kubesphere/kubesphere 2020-10-09 19:32:14 +08:00
min zhang
34d84dc865 fmt (#3004)
Signed-off-by: zhangmin <arminzhang@yunify.com>
2020-10-09 15:00:03 +08:00
lihaowei
2c1fdd35f6 squash err handle
Signed-off-by: lihaowei <haoweili35@gmail.com>
2020-10-09 14:34:10 +08:00
KubeSphere CI Bot
98bcc70b0d Merge pull request #2980 from min-zh/dev
add status deleting of volumesnapshot
2020-10-09 10:25:47 +08:00
KubeSphere CI Bot
5e7561ecaa Merge pull request #2935 from shaowenchen/fix_update_credential
fix: upgrade credential
2020-10-09 10:04:25 +08:00
Rao Yunkun
97b054d99d Add node metric: node_pleg_quantile
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
2020-10-06 20:06:27 +08:00
luxingmin
1a39d62f63 support aliyun idaas oauth login
Signed-off-by: luxingmin <luxingmin@hongyaa.com.cn>
2020-09-29 11:14:23 +08:00
KubeSphere CI Bot
a8c9be6dae Merge pull request #2992 from stoneshi-yunify/addreviewer
add stone as reviewer
2020-09-25 17:38:56 +08:00
stoneshi-yunify
320a7dd1a7 add stone as reviewer
Signed-off-by: stoneshi-yunify <stoneshi@yunify.com>
2020-09-25 16:51:26 +08:00
KubeSphere CI Bot
c8e8dc66bb Merge pull request #2987 from zheng1/op_swagger
Add OpenPitrix API in swagger file
2020-09-23 13:48:13 +08:00
Zhengyi Lai
8cb40c46cd Add OpenPitrix API in swagger file
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
2020-09-23 12:08:57 +08:00
KubeSphere CI Bot
84e815f620 Merge pull request #2984 from RolandMa1986/fix-build
optimize docker build
2020-09-22 19:05:02 +08:00
Roland.Ma
979cfdaf38 optimize docker build
Signed-off-by: Roland.Ma <rolandma@yunify.com>
2020-09-22 09:14:52 +00:00
Zhengyi Lai
0689ec6049 Merge pull request #2976 from stoneshi-yunify/fix1109
fix: add nil check for storage class name
2020-09-21 13:21:40 +08:00
zhangmin
20f4c4ba7d add status deleting of volumesnapshot
Signed-off-by: zhangmin <arminzhang@yunify.com>
2020-09-21 11:43:42 +08:00
stoneshi-yunify
7fe78e485b add ut for storageclasses.go
Signed-off-by: stoneshi-yunify <70880165+stoneshi-yunify@users.noreply.github.com>
2020-09-21 10:44:20 +08:00
stoneshi-yunify
81fe75fae2 fix: add nil check for storage class name
Signed-off-by: stoneshi-yunify <70880165+stoneshi-yunify@users.noreply.github.com>
2020-09-14 18:40:07 +08:00
pengfei
6f12f72d3a update Readme-zh to v3.0.0 (#2972)
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2020-09-14 09:14:42 +08:00
FeynmanZhou
c99badb230 update Readme-zh to v3.0.0
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2020-09-11 17:04:22 +08:00
KubeSphere CI Bot
ca34a8ce87 Merge pull request #2971 from FeynmanZhou/master
update readme to v3.0.0.
2020-09-11 12:34:06 +08:00
FeynmanZhou
22aa18bfa8 update the URLs to v3.0.0
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2020-09-10 18:39:13 +08:00
FeynmanZhou
18a945c4b9 update readme to 3.00.
Signed-off-by: FeynmanZhou <pengfeizhou@yunify.com>
2020-09-10 15:47:51 +08:00
zryfish
454caf27dd Create codeql-analysis.yml
Setup codeql analysis
2020-09-10 10:38:10 +08:00
zryfish
05fe1d9e1d Update build.yml (#2968)
Add release branch to pull request ci
2020-09-08 17:45:55 +08:00
shaowenchen
1bd6c7f489 fix: upgrade credential
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2020-08-28 20:44:24 +08:00
KubeSphere CI Bot
d567f438ff Merge pull request #2934 from shaowenchen/fix_scm_choice
fix: scm choices
2020-08-28 18:04:59 +08:00
shaowenchen
018a18e784 fix: scm choices
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2020-08-28 17:44:25 +08:00
KubeSphere CI Bot
34d5bee27d Merge pull request #2931 from shaowenchen/fix_credential_sync
fix crendential sync
2020-08-28 17:34:59 +08:00
shaowenchen
2dcabb0bdb fix crendential sync
Signed-off-by: shaowenchen <mail@chenshaowen.com>
2020-08-28 16:54:07 +08:00
8167 changed files with 1063032 additions and 363331 deletions

View File

@@ -1,2 +0,0 @@
tmp/
.github

2
.env
View File

@@ -1,2 +0,0 @@
DATA_PATH=./tmp
KUBESPHERE_LOG_LEVEL=debug

View File

@@ -1,18 +1,19 @@
---
name: Bug report
labels: ["kind/bug"]
about: Create a report to help us improve
---
## English only!
<!--
You don't need to remove this comment section, it's invisible on the issues page.
**注意GitHub Issue 仅支持英文,中文 Issue 请在 [论坛](https://kubesphere.com.cn/forum/) 提交。**
## General remarks
**General remarks**
> Please delete this section including header before submitting
>
> This form is to report bugs. For general usage questions refer to our Slack channel
> [KubeSphere-users](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTdkNTc3OTdmNzdiODViZjViNTU5ZDY3M2I2MzY4MTI4OGZlOTJmMDg5ZTFiMDAwYzNlZDY5NjA0NzZlNDU5NmY)
* Attention, please fill out this issues form using English only!
* 注意GitHub Issue 仅支持英文,中文 Issue 请在 [论坛](https://kubesphere.com.cn/forum/) 提交。
* This form is to report bugs. For general usage questions you can join our Slack channel
[KubeSphere-users](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE)
-->
**Describe the Bug**
A clear and concise description of what the bug is.

View File

@@ -0,0 +1,69 @@
---
name: Feature Request
about: Have a good idea? Please don't hesitate to write it down, describe the new feature.
---
<!--
You don't need to remove this comment section, it's invisible on the issues page.
## General remarks
* Attention, please fill out this issues form using English only!
* 注意GitHub Issue 仅支持英文,中文 Issue 请在 [论坛](https://kubesphere.com.cn/forum/) 提交。
* This form is to report bugs. For general usage questions, you can join our Slack channel
[KubeSphere-users](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE)
-->
**What's it about?**
<!--
A clear and concise description of what this feature request is.
-->
**What's the reason why we need it?**
<!--
Please tell us if you think it's a necessary feature for Kubesphere. Give us as many details about it as you can.
Two or more use cases might be very helpful when other contributors try to go through this request. If you have some references,
please just add it below.
-->
I believe this is an important feature for Kubesphere. There're a few use cases:
* case one
* case two
* ...
Please leave your comments below if there's anyone agrees with me. Or just give me a thumb up.
**Area Suggestion**
<!--
In order to have a clear issue list, giving an accuracy area is necessary. If you are not sure about it, please just leave it alone.
You can find some possible areas below. Please attention, sometimes crossing multiple areas might be possible. So, you
can keep one or more areas in this issue.
> /area alerting
> /area api
> /area apiserver
> /area app-management
> /area audit
> /area console
> /area devops
> /area documentation
> /area edge
> /area iam
> /area installation
> /area logging
> /area microservice
> /area monitoring
> /area multicluster
> /area networking
> /area notification
> /area observability
> /area performance
> /area security
> /area storage
> /area test
> /area upgrade
-->
/kind feature-request

View File

@@ -7,6 +7,13 @@ about: Create an issue to help us improve installation
**注意GitHub Issue 仅支持英文,中文 Issue 请在 [论坛](https://kubesphere.com.cn/forum/) 提交。**
**General remarks**
> Please delete this section including header before submitting
>
> This form is to report installation issues. For general usage questions you can refer to [KubeSphere Documentation](https://kubesphere.io/docs) or join our Slack channel
> [KubeSphere-users](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE)
**What's your question**
@@ -20,4 +27,4 @@ about: Create an issue to help us improve installation
**Installer Version**
> e.g. v2.1.0, v2.1.1
> e.g. v2.1.0, v2.1.1, v3.0.0

View File

@@ -1,30 +1,54 @@
**What type of PR is this?**
> Uncomment only one ` /kind <>` line, hit enter to put that in a new line, and remove leading whitespaces from that line:
>
> /kind api-change
> /kind bug
> /kind cleanup
> /kind design
> /kind documentation
> /kind failing-test
> /kind feature
> /kind flake
<!-- Thanks for sending a pull request! Here are some tips for you:
**What this PR does / why we need it**:
1. If you want **faster** PR reviews, read how: https://github.com/kubesphere/community/blob/master/developer-guide/development/the-pr-author-guide-to-getting-through-code-review.md
2. In case you want to know how your PR got reviewed, read: https://github.com/kubesphere/community/blob/master/developer-guide/development/code-review-guide.md
3. Here are some coding convetions followed by KubeSphere community: https://github.com/kubesphere/community/blob/master/developer-guide/development/coding-conventions.md
-->
**Which issue(s) this PR fixes**:
### What type of PR is this?
<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind design
Optionally add one or more of the following kinds if applicable:
/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
-->
### What this PR does / why we need it:
### Which issue(s) this PR fixes:
<!--
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
-->
Fixes #
**Special notes for reviewers**:
### Special notes for reviewers:
```
```
**Additional documentation, usage docs, etc.**:
### Does this PR introduced a user-facing change?
<!--
If no, just write "None" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
For more information on release notes see: https://github.com/kubernetes/community/blob/master/contributors/guide/release-notes.md
-->
```release-note
```
### Additional documentation, usage docs, etc.:
<!--
This section can be blank if this pull request does not require a release note.
Please use the following format for linking documentation or pass the

42
.github/workflows/build-multiarch.yaml vendored Normal file
View File

@@ -0,0 +1,42 @@
name: BuildContainerImage
on:
push:
branches:
- 'master'
- 'release-*'
tags:
- 'v*'
pull_request:
branches:
- 'master'
- 'release-*'
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
with:
platforms: all
- name: Set up Docker buildx
uses: docker/setup-buildx-action@v1
- name: Build and push docker images
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
if: github.event_name == 'push'
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
REPO=kubespheredev TAG="${GITHUB_REF#refs/*/}" make container-cross-push

View File

@@ -1,65 +0,0 @@
name: Go
on:
push:
branches:
- 'master'
- 'release*'
tags:
- 'v*'
pull_request:
branches:
- 'master'
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Set up Go 1.13
uses: actions/setup-go@v1
with:
go-version: 1.13
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Check pr is properly formatted
run: diff -u <(echo -n) <(gofmt -d ./pkg ./cmd ./tools ./test)
- name: Downloading go dependencies
run: go mod vendor
- name: Install kubebuilder
run: bash hack/install_kubebuilder.sh
- name: Build
run: make all
- name: Make OpenAPI Spec
run: make openapi
- name: Uploading code coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.txt
flags: unittests
name: codecov-umbrella
fail_ci_if_error: false
- name: Get branch name
id: extract_branch
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
- name: Build and push docker images
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
if: github.event_name == 'push'
run: bash hack/docker_build.sh ${{ steps.extract_branch.outputs.branch }}

44
.github/workflows/e2e-test.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
name: e2e
on:
schedule:
# run e2e test every 4 hours
- cron: 0 */4 * * *
workflow_dispatch:
jobs:
build:
name: Test
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.16
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Create kind cluster
uses: helm/kind-action@v1.2.0
with:
config: .github/workflows/kind/kind.yaml
- name: Deploy KubeSphere to Kind
run: KIND_CLUSTER_NAME=chart-testing hack/deploy-kubesphere.sh
- name: Run e2e testing
run: go test ./test/e2e
- name: slack
uses: 8398a7/action-slack@v3
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
with:
status: ${{ job.status }}
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
if: failure()

11
.github/workflows/kind/kind.yaml vendored Normal file
View File

@@ -0,0 +1,11 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.21.1
extraMounts:
- hostPath: /etc/localtime
containerPath: /etc/localtime
extraPortMappings:
- containerPort: 30881
hostPort: 9090

53
.github/workflows/nightly-builds.yml vendored Normal file
View File

@@ -0,0 +1,53 @@
name: NightlyBuild
on:
schedule:
# This is a UTC time
- cron: "0 16 * * *"
# Keep it only for test purpose, comment it once everything is ok
workflow_dispatch:
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: 1.16
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
with:
platforms: all
- name: Set up Docker buildx
uses: docker/setup-buildx-action@v1
- name: Build and push docker images
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
tag=nightly-$(date '+%Y%m%d')
REPO=kubespheredev TAG=${tag} make container-cross-push
- name: slack
uses: 8398a7/action-slack@v3
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
with:
status: ${{ job.status }}
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
if: failure()

4
.gitignore vendored
View File

@@ -19,6 +19,7 @@ bin/
# Vscode files
.vscode/
__debug_bin
# OSX trash
.DS_Store
@@ -30,4 +31,5 @@ coverage.txt
kustomize/network/etcd
apiserver.local.config
tmp/
kubesphere.yaml
testbin/

62
.licenserc.yaml Normal file
View File

@@ -0,0 +1,62 @@
#
# Copyright 2022 The KubeSphere Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
header:
license:
spdx-id: Apache-2.0
copyright-owner: KubeSphere Authors
content: |
Copyright 2022 The KubeSphere Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
paths-ignore:
- 'api'
- 'build'
- 'docs'
- 'config'
- 'test'
- 'install'
- 'hack'
- 'vendor'
- 'staging'
- 'LICENSE'
- 'OWNERS'
- 'Makefile'
- 'pkg/client/**'
- 'pkg/simple/client/**'
- '**/*.md'
- '**/*.json'
- '**/go.mod'
- '**/go.sum'
- '.github/**'
- '.gitignore'
- '.gitattributes'
- 'pkg/controller/application/status.go'
comment: on-failure

156
Makefile
View File

@@ -2,9 +2,16 @@
# Use of this source code is governed by a Apache license
# that can be found in the LICENSE file.
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true"
GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1 gateway:v1alpha1"
MANIFESTS="application/* cluster/* iam/* network/v1alpha1 quota/* storage/* tenant/* gateway/*"
# App Version
APP_VERSION = v3.2.0
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
GOBIN=$(shell go env GOPATH)/bin
@@ -13,7 +20,10 @@ GOBIN=$(shell go env GOBIN)
endif
OUTPUT_DIR=bin
GOFLAGS=-mod=vendor
ifeq (${GOFLAGS},)
# go build with vendor by default.
export GOFLAGS=-mod=vendor
endif
define ALL_HELP_INFO
# Build code.
#
@@ -34,90 +44,118 @@ define ALL_HELP_INFO
# debugging tools like delve.
endef
.PHONY: all
all: test ks-apiserver controller-manager
all: test ks-apiserver ks-controller-manager;$(info $(M)...Begin to test and build all of binary.) @ ## Test and build all of binary.
help:
@grep -hE '^[ a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-17s\033[0m %s\n", $$1, $$2}'
.PHONY: binary
# Build all of binary
binary: | ks-apiserver ks-controller-manager; $(info $(M)...Build all of binary.) @ ## Build all of binary.
# Build ks-apiserver binary
ks-apiserver: fmt vet
hack/gobuild.sh cmd/ks-apiserver
ks-apiserver: ; $(info $(M)...Begin to build ks-apiserver binary.) @ ## Build ks-apiserver.
hack/gobuild.sh cmd/ks-apiserver;
# Build controller-manager binary
controller-manager: fmt vet
# Build ks-controller-manager binary
ks-controller-manager: ; $(info $(M)...Begin to build ks-controller-manager binary.) @ ## Build ks-controller-manager.
hack/gobuild.sh cmd/controller-manager
# Run go fmt against code
fmt: generate
# Run all verify scripts hack/verify-*.sh
verify-all: ; $(info $(M)...Begin to run all verify scripts hack/verify-*.sh.) @ ## Run all verify scripts hack/verify-*.sh.
hack/verify-all.sh
# Build e2e binary
e2e: ;$(info $(M)...Begin to build e2e binary.) @ ## Build e2e binary.
hack/build_e2e.sh test/e2e
kind-e2e: ;$(info $(M)...Run e2e test.) @ ## Run e2e test in kind.
hack/kind_e2e.sh
# Run go fmt against code
fmt: ;$(info $(M)...Begin to run go fmt against code.) @ ## Run go fmt against code.
gofmt -w ./pkg ./cmd ./tools ./api
# Format all import, `goimports` is required.
goimports: ;$(info $(M)...Begin to Format all import.) @ ## Format all import, `goimports` is required.
@hack/update-goimports.sh
# Run go vet against code
vet: generate
vet: ;$(info $(M)...Begin to run go vet against code.) @ ## Run go vet against code.
go vet ./pkg/... ./cmd/...
# Generate manifests e.g. CRD, RBAC etc.
manifests:
go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds
manifests: ;$(info $(M)...Begin to generate manifests e.g. CRD, RBAC etc..) @ ## Generate manifests e.g. CRD, RBAC etc.
hack/generate_manifests.sh ${CRD_OPTIONS} ${MANIFESTS}
deploy: manifests
deploy: manifests ;$(info $(M)...Begin to deploy.) @ ## Deploy.
kubectl apply -f config/crds
kustomize build config/default | kubectl apply -f -
# generate will generate crds' deepcopy & go openapi structs
# Futher more about go:genreate . https://blog.golang.org/generate
generate:
go generate ./pkg/... ./cmd/...
mockgen:
mockgen: ;$(info $(M)...Begin to mockgen.) @ ## Mockgen.
mockgen -package=openpitrix -source=pkg/simple/client/openpitrix/openpitrix.go -destination=pkg/simple/client/openpitrix/mock.go
deepcopy:
GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/deepcopy-gen
${GOPATH}/bin/deepcopy-gen -i kubesphere.io/kubesphere/pkg/apis/... -h ./hack/boilerplate.go.txt -O zz_generated.deepcopy
deepcopy: ;$(info $(M)...Begin to deepcopy.) @ ## Deepcopy.
hack/generate_group.sh "deepcopy" kubesphere.io/api kubesphere.io/api ${GV} --output-base=staging/src/ -h "hack/boilerplate.go.txt"
openapi:
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/tenant/v1alpha1 -p kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/servicemesh/v1alpha2 -p kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/api/networking/v1,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/util/intstr,./pkg/apis/network/v1alpha1 -p kubesphere.io/kubesphere/pkg/apis/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/cluster/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha3,./vendor/k8s.io/apimachinery/pkg/runtime -p kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list
openapi: ;$(info $(M)...Begin to openapi.) @ ## Openapi.
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/tenant/v1alpha1 -p kubesphere.io/api/tenant/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/network/v1alpha1 -p kubesphere.io/api/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/servicemesh/v1alpha2 -p kubesphere.io/api/servicemesh/v1alpha2 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/api/networking/v1,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/util/intstr,./vendor/kubesphere.io/api/network/v1alpha1 -p kubesphere.io/api/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/devops/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/api/devops/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/cluster/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/api/cluster/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/kubesphere.io/api/devops/v1alpha3,./vendor/k8s.io/apimachinery/pkg/runtime -p kubesphere.io/api/devops/v1alpha3 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list --output-base=staging/src/
go run ./tools/cmd/crd-doc-gen/main.go
go run ./tools/cmd/doc-gen/main.go
# Build the docker image
docker-build: all
container: ;$(info $(M)...Begin to build the docker image.) @ ## Build the docker image.
DRY_RUN=true hack/docker_build.sh
container-push: ;$(info $(M)...Begin to build and push.) @ ## Build and Push.
hack/docker_build.sh
container-cross: ; $(info $(M)...Begin to build container images for multiple platforms.) @ ## Build container images for multiple platforms. Currently, only linux/amd64,linux/arm64 are supported.
DRY_RUN=true hack/docker_build_multiarch.sh
container-cross-push: ; $(info $(M)...Begin to build and push.) @ ## Build and Push.
hack/docker_build_multiarch.sh
helm-package: ; $(info $(M)...Begin to helm-package.) @ ## Helm-package.
ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/
helm package config/ks-core --app-version=${APP_VERSION} --version=0.1.0 -d ./bin
helm-deploy: ; $(info $(M)...Begin to helm-deploy.) @ ## Helm-deploy.
ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/
- kubectl create ns kubesphere-controls-system
helm upgrade --install ks-core ./config/ks-core -n kubesphere-system --create-namespace
kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/roles/ks-core/prepare/files/ks-init/role-templates.yaml
helm-uninstall: ; $(info $(M)...Begin to helm-uninstall.) @ ## Helm-uninstall.
- kubectl delete ns kubesphere-controls-system
helm uninstall ks-core -n kubesphere-system
kubectl delete -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/roles/ks-core/prepare/files/ks-init/role-templates.yaml
# Run tests
test: fmt vet
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT=1m; go test ./pkg/... ./cmd/... -covermode=atomic -coverprofile=coverage.txt
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
test: vet test-env ;$(info $(M)...Begin to run tests.) @ ## Run tests.
export KUBEBUILDER_ASSETS=$(shell pwd)/testbin/bin; go test ./pkg/... ./cmd/... -covermode=atomic -coverprofile=coverage.txt
cd staging/src/kubesphere.io/api ; GOFLAGS="" go test ./...
cd staging/src/kubesphere.io/client-go ; GOFLAGS="" go test ./...
.PHONY: test-env
test-env: ;$(info $(M)...Begin to setup test env) @ ## Download unit test libraries e.g. kube-apiserver etcd.
@hack/setup-kubebuilder-env.sh
.PHONY: clean
clean:
clean: ;$(info $(M)...Begin to clean.) @ ## Clean.
-make -C ./pkg/version clean
@echo "ok"
# find or download controller-gen
# download controller-gen if necessary
clientset:
./hack/generate_client.sh
clientset: ;$(info $(M)...Begin to find or download controller-gen.) @ ## Find or download controller-gen,download controller-gen if necessary.
./hack/generate_client.sh ${GV}
# Currently in the upgrade phase of controller tools.
# But the new controller tools are not compatible with the old version.
# With these commands you may need to manually modify the generated code
# So don't use it unless you know it very deeply
internal-crds:
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/network/..." output:crd:artifacts:config=config/crd/bases
internal-generate-apis: internal-controller-gen
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/network/...
internal-controller-gen:
ifeq (, $(shell which controller-gen))
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.4
CONTROLLER_GEN=$(GOBIN)/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
endif
network-rbac:
$(CONTROLLER_GEN) paths=./pkg/controller/network/provider/ paths=./pkg/controller/network/ rbac:roleName=network-manager output:rbac:artifacts:config=kustomize/network/calico-k8s
$(CONTROLLER_GEN) paths=./pkg/controller/network/ rbac:roleName=network-manager output:rbac:artifacts:config=kustomize/network/calico-etcd
# Fix invalid file's license.
update-licenses: ;$(info $(M)...Begin to update licenses.)
@hack/update-licenses.sh

21
OWNERS
View File

@@ -1,6 +1,9 @@
approvers:
- zryfish #oncall
- rayzhou2017
- wansir
- zheng1
- benjaminhuo
reviewers:
- rayzhou2017
@@ -8,14 +11,16 @@ reviewers:
- benjaminhuo
- calvinyv
- FeynmanZhou
- huanggze
- huojiao2006
- Ma-Dan
- magicsong
- pixiake
- runzexia
- wansir
- wnxn
- zheng1
- soulseen
- shaowenchen
- stoneshi-yunify
- linuxsuren
- RolandMa1986
- wanjunlei
- xyz-li
- junotx
- yuswift
- zhu733756
- JohnNiang
- dkeven

View File

@@ -1,3 +0,0 @@
version: "1"
domain: kubesphere.io
repo: kubesphere.io/kubesphere

220
README.md
View File

@@ -1,11 +1,20 @@
# KubeSphere Container Platform
<p align="center">
<a href="https://kubesphere.io/"><img src="docs/images/kubesphere-icon.gif" alt="banner" width="200px"></a>
</p>
[![License](http://img.shields.io/badge/license-apache%20v2-blue.svg)](https://github.com/KubeSphere/KubeSphere/blob/master/LICENSE)
[![Build Status](https://travis-ci.org/kubesphere/kubesphere.svg?branch=master)](https://travis-ci.org/kubesphere/kubesphere)
[![Go Report Card](https://goreportcard.com/badge/github.com/kubesphere/kubesphere)](https://goreportcard.com/report/github.com/kubesphere/kubesphere)
[![KubeSphere release](https://img.shields.io/github/release/kubesphere/kubesphere.svg?color=release&label=release&logo=release&logoColor=release)](https://github.com/kubesphere/kubesphere/releases/tag/v2.1.1)
<p align="center">
<b>The container platform tailored for <i>Kubernetes multi-cloud, datacenter, and edge</i> management</b>
</p>
<p align=center>
<a href="https://goreportcard.com/report/github.com/kubesphere/kubesphere"><img src="https://goreportcard.com/badge/github.com/kubesphere/kubesphere" alt="A+"></a>
<a href="https://hub.docker.com/r/kubesphere/ks-installer"><img src="https://img.shields.io/docker/pulls/kubesphere/ks-installer"></a>
<a href="https://github.com/search?q=user%3Akubesphere+user%3Akubesphere-sigs+label%3A%22good+first+issue%22+state%3Aopen&type=Issues&ref=advsearch&l=&l="><img src="https://img.shields.io/github/issues/badges/shields/good%20first%20issue" alt="good first"></a>
<a href="https://twitter.com/intent/follow?screen_name=KubeSphere"><img src="https://img.shields.io/twitter/follow/KubeSphere?style=social" alt="follow on Twitter"></a>
<a href="https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE"><img src="https://img.shields.io/badge/Slack-600%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
<a href="https://www.youtube.com/channel/UCyTdUQUYjf7XLjxECx63Hpw"><img src="https://img.shields.io/youtube/channel/subscribers/UCyTdUQUYjf7XLjxECx63Hpw?style=social"></a>
</p>
![logo](docs/images/kubesphere-logo.png)
----
@@ -13,7 +22,7 @@
> English | [中文](README_zh.md)
[KubeSphere](https://kubesphere.io/) is a **distributed operating system providing cloud native stack** with [Kubernetes](https://kubernetes.io) as its kernel, and aims to be plug-and-play architecture for third-party applications seamless integration to boost its ecosystem. KubeSphere is also a multi-tenant enterprise-grade container platform with full-stack automated IT operation and streamlined DevOps workflows. It provides developer-friendly wizard web UI, helping enterprises to build out a more robust and feature-rich platform, which includes most common functionalities needed for enterprise Kubernetes strategy, see [Feature List](#features) for details.
[KubeSphere](https://kubesphere.io/) is a **distributed operating system for cloud-native application management**, using [Kubernetes](https://kubernetes.io) as its kernel. It provides a plug-and-play architecture, allowing third-party applications to be seamlessly integrated into its ecosystem. KubeSphere is also a multi-tenant container platform with full-stack automated IT operation and streamlined DevOps workflows. It provides developer-friendly wizard web UI, helping enterprises to build out a more robust and feature-rich platform, which includes most common functionalities needed for enterprise Kubernetes strategy, see [Feature List](#features) for details.
The following screenshots give a close insight into KubeSphere. Please check [What is KubeSphere](https://kubesphere.io/docs/introduction/what-is-kubesphere/) for further information.
@@ -36,135 +45,146 @@ The following screenshots give a close insight into KubeSphere. Please check [Wh
</tr>
</table>
## Demo Environment
## Demo environment
Using the account `demo1 / Demo123` to log in the [demo environment](https://demo.kubesphere.io/). Please note the account is granted view access. You can also have a quick view of [KubeSphere Demo Video](https://youtu.be/u5lQvhi_Xlc).
🎮 Using the account `demo1 / Demo123` to log in the [demo environment](https://demo.kubesphere.io/). Please note the account is granted view access.
## Architecture
KubeSphere uses a loosely-coupled architecture that separates the [frontend](https://github.com/kubesphere/console) from the [backend](https://github.com/kubesphere/kubesphere). External systems can access the components of the backend which are delivered as Docker containers through the REST APIs. See [Architecture](https://kubesphere.io/docs/introduction/architecture/) for details.
![Architecture](docs/images/architecture.png)
🖥 You can also have a quick view of [Demo video](https://youtu.be/YxZ1YUv0CYs).
## Features
|Feature|Description|
|---|---|
| Provisioning Kubernetes Cluster|Support deploy Kubernetes on your infrastructure out of box, including online and air gapped installation|
| Kubernetes Resource Management | Provide web console for creating and managing Kubernetes resources, with powerful observability including monitoring, logging, events, alerting and notification |
| DevOps System | Provide out-of-box CI/CD based on Jenkins, and offers automated workflow tools including binary-to-image (B2I) and source-to-image (S2I) |
| Application Store | Provide application store for Helm-based applications, and offers application lifecycle management |
| Service Mesh (Istio-based) | Provide fine-grained traffic management, observability and tracing for distributed microservice applications, provides visualization for traffic topology |
| Rich Observability | Provide multi-dimensional monitoring metrics, and provides multi-tenant log query and collection, support alerting and notification for both application and infrastructure |
| Multi-tenant Management | Provide unified authentication with fine-grained roles and three-tier authorization system, supports AD/LDAP authentication |
| Infrastructure Management | Support node management and monitoring, and supports adding new nodes for Kubernetes cluster |
| Storage Support | Support GlusterFS, CephRBD, NFS, Local (default) etc. open source storage solutions, provide CSI plugins to consume storage from cloud providers |
| Network Support | Support Calico, Flannel, etc. open source network solutions, provides load balancer plug-in [Porter](https://github.com/kubesphere/porter) for Kubernetes installed on physical machines |
| GPU Support | Support add GPU node, support vGPU, enables running ML applications on Kubernetes, e.g. TensorFlow |
<details>
<summary><b>🕸 Provisioning Kubernetes Cluster</b></summary>
Support deploy Kubernetes on any infrastructure, support online and air-gapped installation, <a href="https://kubesphere.io/docs/installing-on-linux/introduction/intro/">learn more</a>.
</details>
Please See the [Feature and Benefits](https://kubesphere.io/docs/introduction/features/) for further information.
<details>
<summary><b>🔗 Kubernetes Multi-cluster Management</b></summary>
Provide a centralized control plane to manage multiple Kubernetes clusters, support propagate an app to multiple K8s clusters across different cloud providers.
</details>
<details>
<summary><b>🤖 Kubernetes DevOps</b></summary>
Provide out-of-box CI/CD based on Jenkins, and offers automated workflow tools including binary-to-image (B2I) and source-to-image (S2I), <a href="https://kubesphere.io/devops/">learn more</a>.
</details>
<details>
<summary><b>🔎 Cloud Native Observability</b></summary>
Multi-dimensional monitoring, events and auditing logs are supported; multi-tenant log query and collection, alerting and notification are built-in, <a href="https://kubesphere.io/observability/">learn more</a>.
</details>
<details>
<summary><b>🧩 Service Mesh (Istio-based)</b></summary>
Provide fine-grained traffic management, observability and tracing for distributed microservice applications, provides visualization for traffic topology, <a href="https://kubesphere.io/service-mesh/">learn more</a>.
</details>
<details>
<summary><b>💻 App Store</b></summary>
Provide an App Store for Helm-based applications, and offer application lifecycle management on Kubernetes platform, <a href="https://kubesphere.io/docs/pluggable-components/app-store/">learn more</a>.
</details>
<details>
<summary><b>💡 Edge Computing Platform</b></summary>
KubeSphere integrates <a href="https://kubeedge.io/en/">KubeEdge</a> to enable users to deploy applications on the edge devices and view logs and monitoring metrics of them on the console, <a href="https://kubesphere.io/docs/pluggable-components/kubeedge/">learn more</a>.
</details>
<details>
<summary><b>📊 Metering and Billing</b></summary>
Track resource consumption at different levels on a unified dashboard, which helps you make better-informed decisions on planning and reduce the cost, <a href="https://kubesphere.io/docs/toolbox/metering-and-billing/view-resource-consumption/">learn more</a>.
</details>
<details>
<summary><b>🗃 Support Multiple Storage and Networking Solutions</b></summary>
<li>Support GlusterFS, CephRBD, NFS, LocalPV solutions, and provide CSI plugins to consume storage from multiple cloud providers.</li><li>Provide Load Balancer Implementation <a href="https://github.com/kubesphere/openelb">OpenELB</a> for Kubernetes in bare-metal, edge, and virtualization.</li><li> Provides network policy and Pod IP pools management, support Calico, Flannel, Kube-OVN</li>.</li>.
</details>
<details>
<summary><b>🏘 Multi-tenancy</b></summary>
Provide unified authentication with fine-grained roles and three-tier authorization system, and support AD/LDAP authentication.
</details>
<details>
<summary><b>🧠 GPU Workloads Scheduling and Monitoring</b></summary>
Create GPU workloads on the GUI, schedule GPU resources, and manage GPU resource quotas by tenant.
</details>
## Architecture
KubeSphere uses a loosely-coupled architecture that separates the [frontend](https://github.com/kubesphere/console) from the [backend](https://github.com/kubesphere/kubesphere). External systems can access the components of the backend through the REST APIs.
![Architecture](docs/images/architecture.png)
----
## Latest Release
KubeSphere 2.1.1 was released on **February 23rd, 2020**. See the [Release Notes For 2.1.1](https://kubesphere.io/docs/release/release-v211/) for the updates.
## Latest release
🎉 KubeSphere 3.2.1 was released on Dec 20! It brought enhancements and better user experience, see the [Release Notes For 3.2.1](https://kubesphere.io/docs/release/release-v321/) for the updates.
## Installation
KubeSphere can run anywhere from on-premise datacenter to any cloud to edge. In addition, it can be deployed on any version-compatible running Kubernetes cluster.
KubeSphere can run anywhere from on-premise datacenter to any cloud to edge. In addition, it can be deployed on any version-compatible Kubernetes cluster. The installer will start a minimal installation by default, you can [enable other pluggable components before or after installation](https://kubesphere.io/docs/quick-start/enable-pluggable-components/).
### Quick start
#### Installing on K8s/K3s
### Deploy on Existing Kubernetes Cluster
If your cluster meets the [prerequisites](https://kubesphere.io/docs/quick-start/minimal-kubesphere-on-k8s/#prerequisites), then run the following commands to install KubeSphere on an exiting Kubernetes cluster:
#### Prerequisites
```yaml
kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml
kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/cluster-configuration.yaml
```
#### All-in-one
- `Kubernetes version` `1.15.x, 1.16.x, 1.17.x`
- `2.10.0 ≤ Helm Version 3.0.0` excluding 2.16.0 because of [#6894](https://github.com/helm/helm/issues/6894). Please see [Install and Configure Helm in Kubernetes](https://devopscube.com/install-configure-helm-kubernetes/). Helm v3 will be supported in KubeSphere 3.0.0.
- An existing Storage Class in your Kubernetes cluster, use `kubectl get sc` to verify it
- The CSR signing feature is activated in kube-apiserver, see [RKE installation issue](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309).
👨‍💻 No Kubernetes? You can use [KubeKey](https://github.com/kubesphere/kubekey) to install both KubeSphere and Kubernetes/K3s in single-node mode on your Linux machine. Let's take K3s as an example:
Install KubeSphere using kubectl.
- If there are 1 Core and 2 GB RAM available in your cluster, use the command below to set up a default minimal installation only. You can enable other components after installation if more resource added in later on. See [Pluggable Components Installation](https://kubesphere.io/docs/installation/pluggable-components/) for detailed information.
```bash
kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/kubesphere-minimal.yaml
```yaml
# Download KubeKey
curl -sfL https://get-kk.kubesphere.io | VERSION=v2.0.0 sh -
# Make kk executable
chmod +x kk
# Create a cluster
./kk create cluster --with-kubernetes v1.21.4-k3s --with-kubesphere v3.2.1
```
- If there are 8 Cores and 16 GB RAM available in your cluster, use the command below to install a complete KubeSphere, i.e. with all components enabled:
You can run the following command to view the installation logs. After KubeSphere is successfully installed, you can access the KubeSphere web console at `http://IP:30880` and log in using the default administrator account (admin/P@88w0rd).
```bash
kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/kubesphere-complete-setup.yaml
```
Wait the installation logs using the following command till showing `"Successful"`, then you can log in the console using the default username and password.
```bash
```yaml
kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f
```
```
### 🐯 Katacoda for quick learning
### Deploy on Linux
[Katacoda](https://www.katacoda.com/) allows you to explore how to install KubeSphere on an existing Kubernetes cluster in a browser. You can start the [Katacoda scenario with KubeSphere](https://www.katacoda.com/kubesphere/scenarios/install-kubesphere-on-kubernetes) in minutes.
### KubeSphere for hosted Kubernetes services
KubeSphere Installer can help you to install KubeSphere and Kubernetes on your linux machines. It provides [All-in-One](https://kubesphere.io/docs/installation/all-in-one/) and [Multi-Node](https://kubesphere.io/docs/installation/multi-node/) installation options.
KubeSphere is hosted on the following cloud providers, you can try KubeSphere by one-click installation on their hosted Kubernetes services.
#### Minimum Requirements
- [KubeSphere for Amazon EKS](https://aws.amazon.com/quickstart/architecture/qingcloud-kubesphere/)
- [KubeSphere for Azure AKS](https://market.azure.cn/marketplace/apps/qingcloud.kubesphere)
- [KubeSphere for DigitalOcean Kubernetes](https://marketplace.digitalocean.com/apps/kubesphere)
- [KubeSphere on QingCloud AppCenter(QKE)](https://www.qingcloud.com/products/kubesphereqke)
- Operating Systems
- CentOS 7.4~7.7 (64 bit)
- Ubuntu 16.04/18.04 LTS (64 bit)
- Red Hat Enterprise Linux Server 7.4 (64 bit)
- Debian Stretch 9.5 (64 bit)
- Hardware
- CPU2 Cores, Memory4 GB, Disk Space100 GB
You can also install KubeSphere on other hosted Kubernetes services within minutes, see the [step-by-step guides](https://kubesphere.io/docs/installing-on-kubernetes/) to get started.
> Note: Please disable the firewall, or ensure your firewall meets the [port requirements](https://kubesphere.io/docs/installation/port-firewall/).
> 👨‍💻 No internet access? Refer to the [Air-gapped Installation on Kubernetes](https://kubesphere.io/docs/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/) or [Air-gapped Installation on Linux](https://kubesphere.io/docs/installing-on-linux/introduction/air-gapped-installation/) for instructions on how to use private registry to install KubeSphere.
## Contributing, support, discussion, and community
#### All-in-One (QuickStart)
We :heart: your contribution. The [community](https://github.com/kubesphere/community) walks you through how to get started contributing KubeSphere. The [development guide](https://github.com/kubesphere/community/tree/master/developer-guide/development) explains how to set up development environment.
```bash
curl -L https://kubesphere.io/download/stable/latest > installer.tar.gz \
&& tar -zxf installer.tar.gz && cd kubesphere-all-v2.1.1/scripts
$ ./install.sh
```
Choose `"1) All-in-one"` to start the default minimal installation.
You can enable other components after installation, see [Pluggable Components Installation](https://kubesphere.io/docs/installation/pluggable-components/).
## To start using KubeSphere
- KubeSphere Documentation ([En](https://kubesphere.io/docs/)/[](https://kubesphere.io/docs/zh-CN/)
- [API Documentation](https://kubesphere.io/docs/api-reference/api-docs/)
## Contributing, Support, Discussion, and Community
This [community](https://github.com/kubesphere/community) walks you through how to get started contributing KubeSphere. The [development guide](https://github.com/kubesphere/community/tree/master/developer-guide/development) explains how to set up development environment.
If you need any help with KubeSphere, please join us at [Slack Channel](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE).
We also communicate through [Google Group](https://groups.google.com/forum/#!forum/kubesphere).
- [Slack Channel](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE)
- [Youtube](https://www.youtube.com/channel/UCyTdUQUYjf7XLjxECx63Hpw)
- [Follow us on Twitter](https://twitter.com/KubeSphere)
Please submit any KubeSphere bugs, issues, and feature requests to [KubeSphere GitHub Issue](https://github.com/kubesphere/kubesphere/issues).
## Who are using KubeSphere
The [Powered by KubeSphere](https://kubesphere.io/case/) page includes the user list of the project. You can submit your institution name and homepage if you are using KubeSphere.
## RoadMap
Currently, KubeSphere has released the following 5 major editions. The future releases include multicluster, big data, AI, SDN, etc. See [Plans for 2.1.1 and 3.0.0](https://github.com/kubesphere/kubesphere/issues/1368) for more details.
**Express Edition** => **v1.0.x** => **v2.0.x** => **v2.1.0** => **v2.1.1** => **v3.0.0**
![Roadmap](https://pek3b.qingstor.com/kubesphere-docs/png/20190926000413.png)
The [user case studies](https://kubesphere.io/case/) page includes the user list of the project. You can [leave a comment](https://github.com/kubesphere/kubesphere/issues/4123) to let us know your use case.
## Landscapes
<p align="center">
<br/><br/>
<img src="https://landscape.cncf.io/images/left-logo.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200"/>&nbsp;&nbsp;<img src="https://www.cncf.io/wp-content/uploads/2017/11/certified_kubernetes_color.png" height="40" width="30"/>
<img src="https://landscape.cncf.io/images/left-logo.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200"/>&nbsp;&nbsp;
<br/><br/>
KubeSphere is a member of CNCF and a <a href="https://www.cncf.io/certification/software-conformance/#logos">Kubernetes Conformance Certified platform
</a>, which enriches the <a href="https://landscape.cncf.io/landscape=observability-and-analysis&license=apache-license-2-0">CNCF CLOUD NATIVE Landscape.
</a>, which enriches the <a href="https://landscape.cncf.io/?landscape=observability-and-analysis&license=apache-license-2-0">CNCF CLOUD NATIVE Landscape.
</a>
</p>

View File

@@ -1,10 +1,20 @@
# KubeSphere 容器平台
<p align="center">
<a href="https://kubesphere.com.cn/"><img src="docs/images/kubesphere-icon.gif" alt="banner" width="200px"></a>
</p>
[![License](http://img.shields.io/badge/license-apache%20v2-blue.svg)](https://github.com/KubeSphere/KubeSphere/blob/master/LICENSE)
[![Build Status](https://travis-ci.org/kubesphere/kubesphere.svg?branch=master)](https://travis-ci.org/kubesphere/kubesphere)
[![KubeSphere release](https://img.shields.io/github/release/kubesphere/kubesphere.svg?color=release&label=release&logo=release&logoColor=release)](https://github.com/kubesphere/kubesphere/releases/tag/v2.1.1)
<p align="center">
<b>适用于<i> Kubernetes 多云、数据中心和边缘 </i>管理的容器平台</b>
</p>
<p align=center>
<a href="https://goreportcard.com/report/github.com/kubesphere/kubesphere"><img src="https://goreportcard.com/badge/github.com/kubesphere/kubesphere" alt="A+"></a>
<a href="https://hub.docker.com/r/kubesphere/ks-installer"><img src="https://img.shields.io/docker/pulls/kubesphere/ks-installer"></a>
<a href="https://github.com/search?q=user%3Akubesphere+user%3Akubesphere-sigs+label%3A%22good+first+issue%22+state%3Aopen&type=Issues&ref=advsearch&l=&l="><img src="https://img.shields.io/github/issues/badges/shields/good%20first%20issue" alt="good first"></a>
<a href="https://twitter.com/intent/follow?screen_name=KubeSphere"><img src="https://img.shields.io/twitter/follow/KubeSphere?style=social" alt="follow on Twitter"></a>
<a href="https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE"><img src="https://img.shields.io/badge/Slack-600%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
<a href="https://www.youtube.com/channel/UCyTdUQUYjf7XLjxECx63Hpw"><img src="https://img.shields.io/youtube/channel/subscribers/UCyTdUQUYjf7XLjxECx63Hpw?style=social"></a>
</p>
![logo](docs/images/kubesphere-logo.png)
----
@@ -12,9 +22,9 @@
> [English](README.md) | 中文
[KubeSphere](https://kubesphere.com.cn) 是在 [Kubernetes](https://kubernetes.io) 之上构建的以**应用为中心的**多租户容器平台,提供全栈的 IT 自动化运维的能力,简化企业的 DevOps 工作流。KubeSphere 提供了运维友好的向导式操作界面,帮助企业快速构建一个强大和功能丰富的容器云平台。KubeSphere 愿景是打造一个基于 Kubernetes 的云原生分布式操作系统它的架构可以很方便地与云原生生态进行即插即用plug-and-play的集成
[KubeSphere](https://kubesphere.io/zh/) 愿景是打造一个以 [Kubernetes](https://kubernetes.io/zh/) 为内核的 **云原生分布式操作系统**它的架构可以非常方便地使第三方应用与云原生生态组件进行即插即用plug-and-play的集成支持云原生应用在多云与多集群的统一分发和运维管理。 KubeSphere 也是一个多租户容器平台,提供全栈的 IT 自动化运维的能力,简化企业的 DevOps 工作流。KubeSphere 提供了运维友好的向导式操作界面,帮助企业快速构建一个强大和功能丰富的容器云平台,详情请参阅 [平台功能](#平台功能)
KubeSphere 目前最新的版本为 2.1.1,所有版本 100% 开源,关于 KubeSphere 更详细的介绍与说明请参阅 [什么是 KubeSphere](https://kubesphere.com.cn/docs/zh-CN/introduction/what-is-kubesphere/)。
下面的屏幕截图让我们进一步了解 KubeSphere,关于 KubeSphere 更详细的介绍与说明请参阅 [什么是 KubeSphere](https://kubesphere.io/zh/docs/introduction/what-is-kubesphere/)
<table>
<tr>
@@ -35,132 +45,150 @@ KubeSphere 目前最新的版本为 2.1.1,所有版本 100% 开源,关于 Ku
</tr>
</table>
## 快速体验
## Demo 环境
使用体验账号 `demo1 / Demo123` 登录 [Demo 环境](https://demo.kubesphere.io/),该账号仅授予了 view 权限,建议自行安装体验完整的管理功能。您还可以访问 Youtube 查看 [KubeSphere Demo 视频](https://youtu.be/u5lQvhi_Xlc)
🎮 使用账号 `demo1 / Demo123` 登录 [Demo 环境](https://demo.kubesphere.io/) 。请注意,该帐户仅授予了 view 权限。
## 架构
🖥 您还可以快速查看[Demo 视频](https://youtu.be/YxZ1YUv0CYs) 。
KubeSphere 采用了前后端分离的架构设计,后端的各个功能组件可通过 REST API 对接外部系统,详见 [架构说明](https://kubesphere.com.cn/docs/zh-CN/introduction/architecture/)。本仓库仅包含后端代码,前端代码参考 [Console 项目](https://github.com/kubesphere/console)。
## 平台功能
<details>
<summary><b>🕸 部署 Kubernetes 集群</b></summary>
支持在任何基础设施上部署 Kubernetes支持在线安装和离线安装<a href="https://kubesphere.io/zh/docs/installing-on-linux/introduction/intro/">了解更多</a>。
</details>
<details>
<summary><b>🔗 Kubernetes 多集群管理</b></summary>
提供集中控制平台来管理多个 Kubernetes 集群,支持将应用程序发布到跨不同云供应商的多个 k8s 集群上。
</details>
<details>
<summary><b>🤖 Kubernetes DevOps</b></summary>
提供开箱即用的基于 Jenkins 的 CI/CD并内置自动化流水线插件包括 Binary-to-Image (B2I) 和 Source-to-Image (S2I)<a href="https://kubesphere.io/zh/devops/">了解更多</a>。
</details>
<details>
<summary><b>🔎 云原生可观测性</b></summary>
支持多维度监控、事件和审计日志;内置多租户日志查询和收集,告警和通知,<a href="https://kubesphere.io/zh/observability/">了解更多</a>。
</details>
<details>
<summary><b>🧩 基于 Istio 的微服务治理</b></summary>
为分布式微服务应用程序提供细粒度的流量管理、可观测性和服务跟踪,支持可视化的流量拓扑,<a href="https://kubesphere.io/zh/service-mesh/">了解更多</a>。
</details>
<details>
<summary><b>💻 应用商店</b></summary>
为基于 Helm 的应用程序提供应用商店,并在 Kubernetes 平台上提供应用程序生命周期管理功能,<a href="https://kubesphere.io/zh/docs/pluggable-components/app-store/">了解更多</a>。
</details>
<details>
<summary><b>💡 Kubernetes 边缘节点管理</b></summary>
基于 <a href="https://kubeedge.io/zh/">KubeEdge</a> 实现应用与工作负载在云端与边缘节点的统一分发与管理,解决在海量边、端设备上完成应用交付、运维、管控的需求,<a href= "https://kubesphere.io/zh/docs/pluggable-components/kubeedge/">了解更多</a>。
</details>
<details>
<summary><b>📊 多维度计量与计费</b></summary>
提供基于集群与租户的多维度资源计量与计费的监控报表,让 Kubernetes 运营成本更透明,<a href="https://kubesphere.io/zh/docs/toolbox/metering-and-billing/view-resource-consumption/">了解更多</a>。
</details>
<details>
<summary><b>🗃 支持多种存储和网络解决方案</b></summary>
<li>支持 GlusterFS、CephRBD、NFS、LocalPV ,并提供多个 CSI 插件对接公有云与企业级存储。</li><li>提供 Kubernetes 在裸机、边缘和虚拟化中的负载均衡器实现 <a href="https://github.com/kubesphere/openelb">OpenELB</a> 。</li><li>提供网络策略和容器组 IP 池管理,支持 Calico、Flannel、Kube-OVN。</li>
</details>
<details>
<summary><b>🏘 多租户与统一鉴权认证</b></summary>
提供统一的认证鉴权与细粒度的基于角色的授权系统,支持对接 AD/LDAP 。
</details>
<details>
<summary><b>🧠 GPU 工作负载调度与监控</b></summary>
支持可视化创建 GPU 工作负载,支持 GPU 监控,同时还支持对 GPU 资源进行租户级配额管理。
</details>
## 架构说明
KubeSphere 使用前后端分离的架构,将 [前端](https://github.com/kubesphere/console) 与 [后端](https://github.com/kubesphere/kubesphere) 分开。后端的各个功能组件可通过 REST API 对接外部系统。
![Architecture](docs/images/architecture.png)
## 核心功能
|功能 |介绍 |
| --- | ---|
| Kubernetes 集群搭建与运维 | 支持在线 & 离线安装、升级与扩容 K8s 集群,支持安装 “云原生全家桶” |
| Kubernetes 资源可视化管理 | 可视化纳管原生 Kubernetes 资源,支持向导式创建与管理 K8s 资源 |
| 基于 Jenkins 的 DevOps 系统 | 支持图形化与脚本两种方式构建 CI/CD 流水线,内置 Source to ImageS2I和 Binary to ImageB2I等 CD 工具 |
| 应用商店与应用生命周期管理 | 提供应用商店,内置 Redis、MySQL 等九个常用应用,支持应用的生命周期管理 |
| 基于 Istio 的微服务治理 (Service Mesh) | 提供可视化无代码侵入的 **灰度发布、熔断、流量治理与流量拓扑、分布式 Tracing** |
| 多租户管理 | 提供基于角色的细粒度多租户统一认证,支持 **对接企业 LDAP/AD**,提供多层级的权限管理 |
| 丰富的可观察性功能 | 提供集群/工作负载/Pod/容器等多维度的监控,提供基于多租户的日志查询与日志收集,支持节点与应用层级的告警与通知 |
|基础设施管理|支持 Kubernetes 节点管理,支持节点扩容与集群升级,提供基于节点的多项监控指标与告警规则 |
| 存储管理 | 支持对接 Ceph、GlusterFS、NFS、Local PV支持可视化管理 PVC、PV、StorageClass提供 CSI 插件对接云平台存储 |
| 网络管理 | 支持 Calico、Flannel提供 Porter LB 插件用于暴露物理环境 K8s 集群的 LoadBalancer 服务 |
| GPU support | 集群支持添加 GPU 与 vGPU可运行 TensorFlow 等 ML 框架 |
以上功能说明详见 [产品功能](https://kubesphere.com.cn/docs/zh-CN/introduction/features/)。
----
## 最新发布
## 最新版本
KubeSphere 2.1.1 已于 2020 年 02 月 23 日 正式发布,点击 [Release Notes For 2.1.1](https://kubesphere.com.cn/docs/zh-CN/release/release-v211/) 查看 2.1.1 版本的更新详情
🎉 KubeSphere 3.2.1 全新发布!!多项功能优化,带来更好的用户体验,详见 [v3.2.1 发行记录](https://kubesphere.com.cn/docs/release/release-v321/) 。
## 安装
## 快速安装
KubeSphere 支持在任意平台运行从本地数据中心到混合多云再走向边缘。此外KubeSphere 可以部署在任何版本兼容的 Kubernetes 集群上。Installer 默认将执行最小化安装,您可以在安装前或安装后自定义[安装可插拔功能组件](https://kubesphere.com.cn/docs/quick-start/enable-pluggable-components/)。
### 快速入门
#### 在 K8s/K3s 上安装
### 部署在 Linux
- 操作系统
- CentOS 7.5 (64 bit)
- Ubuntu 16.04/18.04 LTS (64 bit)
- Red Hat Enterprise Linux Server 7.4 (64 bit)
- Debian Stretch 9.5 (64 bit)
- 配置规格(最低)
- CPU2 Cores 内存4 GB 硬盘100 GB
#### All-in-One
执行以下命令下载 Installer请关闭防火墙或 [开放指定的端口](https://kubesphere.com.cn/docs/zh-CN/installation/port-firewall/),建议使用干净的机器并使用 `root` 用户安装:
```bash
curl -L https://kubesphere.io/download/stable/latest > installer.tar.gz \
&& tar -zxf installer.tar.gz && cd kubesphere-all-v2.1.1/scripts
./install.sh
```
直接选择 `"1) All-in-one"` 即可开始快速安装。默认仅开启最小安装,请参考 [开启可插拔功能功能组件](https://kubesphere.com.cn/docs/zh-CN/installation/pluggable-components/) 按需开启其它功能组件。
> 注意All-in-One 仅适用于**测试环境****正式环境** 安装和使用请参考 [安装说明](https://kubesphere.com.cn/docs/zh-CN/installation/intro/)。
### 部署在已有 Kubernetes 集群上
可参考 [前提条件](https://kubesphere.com.cn/docs/zh-CN/installation/prerequisites/) 验证是否满足以下条件:
#### 前提条件
- `Kubernetes` 版本: `1.15.x、1.16.x、1.17.x`
- `Helm`版本: `2.10.0 ≤ Helm Version 3.0.0`(不支持 helm 2.16.0 [#6894](https://github.com/helm/helm/issues/6894)),且已安装了 Tiller参考 [如何安装与配置 Helm](https://devopscube.com/install-configure-helm-kubernetes/) (预计 3.0 支持 Helm v3
- 集群已有默认的存储类型StorageClass若还没有准备存储请参考 [安装 OpenEBS 创建 LocalPV 存储类型](../../appendix/install-openebs) 用作开发测试环境。
用 kubectl 安装
- 若您的集群可用的资源符合 CPU >= 1 Core可用内存 >= 2 G可参考以下命令开启 KubeSphere 最小化安装。后续如果您的集群资源足够可以参考 [开启可插拔功能功能组件](https://kubesphere.com.cn/docs/zh-CN/installation/pluggable-components/) 按需开启其它功能组件。
请确保您的集群满足安装的[前提条件](https://kubesphere.io/zh/docs/quick-start/minimal-kubesphere-on-k8s/),运行以下命令以在现有 Kubernetes 集群上安装 KubeSphere
```yaml
kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/kubesphere-minimal.yaml
kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/kubesphere-installer.yaml
kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.2.1/cluster-configuration.yaml
```
#### All-in-oneLinux 单节点安装)
- 若您的集群可用的资源符合 CPU ≥ 8 Core可用内存 ≥ 16 G建议参考以下命令开启 KubeSphere 完整安装,即开启所有功能组件的安装
👨‍💻 没有 Kubernetes 集群? 可以用 [KubeKey](https://github.com/kubesphere/kubekey) 在 Linux 环境以 All-in-one 快速安装单节点 K8s/K3s 和 KubeSphere下面以 K3s 为例
```yaml
kubectl apply -f https://raw.githubusercontent.com/kubesphere/ks-installer/master/kubesphere-complete-setup.yaml
# 下载 KubeKey
curl -sfL https://get-kk.kubesphere.io | VERSION=v1.2.0 sh -
# 为 kk 赋予可执行权限
chmod +x kk
# 创建集群
./kk create cluster --with-kubernetes v1.21.4-k3s --with-kubesphere v3.2.1
```
查看滚动刷新的安装日志,请耐心等待安装成功。当看到 `"Successful"` 的日志与登录信息提示,则说明 KubeSphere 安装成功,请使用日志提示的管理员账号登陆控制台
可使用以下命令查看安装日志。如果安装成功,可使用 `http://IP:30880` 访问 KubeSphere Console管理员登录帐密为 `admin/P@88w0rd`
```bash
```yaml
kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f
```
```
### 🐯 使用 Katacoda 在线安装体验 KubeSphere
## 开始使用 KubeSphere
[Katacoda](https://www.katacoda.com/) 是一个在线的云原生技术学习实验平台,你可以使用它在浏览器中快速 [安装体验 KubeSphere](https://www.katacoda.com/kubesphere/scenarios/install-kubesphere-on-kubernetes) 。
### 在托管 Kubernetes 上部署 KubeSphere
- KubeSphere 文档中心 ([En](https://kubesphere.com.cn/docs/)/[](https://kubesphere.com.cn/docs/zh-CN/))
- [API 文档](https://kubesphere.com.cn/docs/zh-CN/api-reference/api-docs/)
KubeSphere 托管在以下云供应商上,您可以通过在其托管的 Kubernetes 服务上一键安装来部署 KubeSphere
## 技术社区
- [在 Amazon EKS 上部署 KubeSphere](https://aws.amazon.com/quickstart/architecture/qingcloud-kubesphere/)
- [在 Azure AKS 上部署 KubeSphere](https://market.azure.cn/marketplace/apps/qingcloud.kubesphere)
- [在 DigitalOcean 上部署 KubeSphere](https://marketplace.digitalocean.com/apps/kubesphere)
- [在青云QingCloud QKE 上部署 KubeSphere](https://www.qingcloud.com/products/kubesphereqke)
[KubeSphere 社区](https://github.com/kubesphere/community)包含所有社区的信息,包括如何开发,兴趣小组(SIG)等。比如[开发指南](https://github.com/kubesphere/community/tree/master/developer-guide/development) 详细说明了如何从源码编译、KubeSphere 的 GitHub 工作流、如何贡献代码以及如何测试等
您还可以在几分钟内在其他托管的 Kubernetes 服务上安装 KubeSphere,请参阅 [官方文档](https://kubesphere.io/zh/docs/installing-on-kubernetes/) 以开始使用
- [论坛](https://kubesphere.com.cn/forum/)
> 👨‍💻 不能访问网络?参考 [在Kubernetes上离线安装](https://kubesphere.io/zh/docs/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/) 或者 [在 Linux 上离线安装](https://kubesphere.io/zh/docs/installing-on-linux/introduction/air-gapped-installation/) 了解如何使用私有仓库来安装 KubeSphere。
## 贡献、支持、讨论和社区
我们 :heart: 您的贡献。[社区](https://github.com/kubesphere/community) 将引导您了解如何开始贡献 KubeSphere。[开发指南](https://github.com/kubesphere/community/tree/master/developer-guide/development) 说明了如何安装开发环境。
- [中文论坛](https://kubesphere.com.cn/forum/)
- [社区微信群(见官网底部)](https://kubesphere.com.cn/)
- [Slack Channel](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE)
- [Bilibili](https://space.bilibili.com/438908638)
- [在推特上关注我们](https://twitter.com/KubeSphere)
## Bug 与建议反馈
欢迎在 [GitHub Issue](https://github.com/kubesphere/kubesphere/issues) 提交 Issue。
请将任何 KubeSphere 的 Bug、问题和需求提交到 [KubeSphere GitHub Issue](https://github.com/kubesphere/kubesphere/issues) 。
## 谁在使用 KubeSphere
[Powered by KubeSphere](docs/powered-by-kubesphere.md) 列出了哪些企业在使用 KubeSphere如果您所在的企业已安装使用了 KubeSphere,欢迎提交 PR 至该页面
## 路线图
目前KubeSphere 已发布了 3 个大版本和 1 个小版本和 4 个 fixpack所有版本都是完全开源的参考 [Plans for 2.1.1 and 3.0.0](https://github.com/kubesphere/kubesphere/issues/1368) 了解后续版本的规划,欢迎在 GitHub issue 中提交需求。
**Express Edition** => **v1.0.x** => **v2.0.x** => **v2.1.0** => **v2.1.1** => **v3.0.0**
![Roadmap](https://pek3b.qingstor.com/kubesphere-docs/png/20190926000514.png)
[用户案例学习](https://kubesphere.com.cn/case/) 列出了哪些企业在使用 KubeSphere。欢迎 [发表评论](https://github.com/kubesphere/kubesphere/issues/4123) 来分享您的使用案例
## Landscapes
<p align="center">
<br/><br/>
<img src="https://landscape.cncf.io/images/left-logo.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200"/>&nbsp;&nbsp;<img src="https://www.cncf.io/wp-content/uploads/2017/11/certified_kubernetes_color.png" height="40" width="30"/>
<img src="https://landscape.cncf.io/images/left-logo.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200"/>&nbsp;&nbsp;
<br/><br/>
KubeSphere 是 CNCF 基金会成员并且通过了 <a href="https://www.cncf.io/certification/software-conformance/#logos">Kubernetes 一致性认证
</a>,进一步丰富了 <a href="https://landscape.cncf.io/landscape=observability-and-analysis&license=apache-license-2-0">CNCF 云原生的生态。
</a>,进一步丰富了 <a href="https://landscape.cncf.io/?landscape=observability-and-analysis&license=apache-license-2-0">CNCF 云原生的生态。
</a>
</p>

50
SECURITY.md Normal file
View File

@@ -0,0 +1,50 @@
# Security Policy
## Supported Versions
Use this section to tell people about which versions of your project are
currently being supported with security updates.
| Version | Supported |
| ------- | ------------------ |
| 3.2.x | :white_check_mark: |
| 3.1.x | :white_check_mark: |
| 3.0.x | :white_check_mark: |
| 2.1.x | :white_check_mark: |
| < 2.1.x | :x: |
## Reporting a Vulnerability
# Security Vulnerability Disclosure and Response Process
To ensure KubeSphere security, a security vulnerability disclosure and response process is adopted. And the security team is set up in KubeSphere community, also any issue and PR is welcome for every contributors.
The primary goal of this process is to reduce the total exposure time of users to publicly known vulnerabilities. To quickly fix vulnerabilities of KubeSphere, the security team is responsible for the entire vulnerability management process, including internal communication and external disclosure.
If you find a vulnerability or encounter a security incident involving vulnerabilities of KubeSphere, please report it as soon as possible to the KubeSphere security team (security@kubesphere.io).
Please kindly help provide as much vulnerability information as possible in the following format:
- Issue title(Please add 'Security' lable)*:
- Overview*:
- Affected components and version number*:
- CVE number (if any):
- Vulnerability verification process*:
- Contact information*:
The asterisk (*) indicates the required field.
# Response Time
The KubeSphere security team will confirm the vulnerabilities and contact you within 2 working days after your submission.
We will publicly thank you after fixing the security vulnerability. To avoid negative impact, please keep the vulnerability confidential until we fix it. We would appreciate it if you could obey the following code of conduct:
The vulnerability will not be disclosed until KubeSphere releases a patch for it.
The details of the vulnerability, for example, exploits code, will not be disclosed.

View File

@@ -6,16 +6,15 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIRe
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,Finalizers
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,ManagedFields
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
@@ -26,9 +25,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,DevOpsProjectList,Items
API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,NoScmPipeline,Parameters
API rule violation: list_type_missing,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,PipelineList,Items
API rule violation: list_type_missing,kubesphere.io/api/devops/v1alpha3,NoScmPipeline,Parameters
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object
@@ -39,46 +36,60 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType
API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,ApiUri
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,CloneOption
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,CredentialId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,DiscoverPRFromForks
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,DiscoverPRFromOrigin
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,RegexFilter
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,BitbucketServerSource,ScmId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,DiscarderProperty,DaysToKeep
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,DiscarderProperty,NumToKeep
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GitSource,CloneOption
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GitSource,CredentialId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GitSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GitSource,RegexFilter
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GitSource,ScmId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,ApiUri
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,CloneOption
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,CredentialId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,DiscoverPRFromForks
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,DiscoverPRFromOrigin
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,RegexFilter
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,GithubSource,ScmId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchJobTrigger,CreateActionJobsToTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchJobTrigger,DeleteActionJobsToTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,BitbucketServerSource
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,GitHubSource
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,GitSource
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,MultiBranchJobTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,ScriptPath
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,SingleSvnSource
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,SourceType
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,SvnSource
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,MultiBranchPipeline,TimerTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,NoScmPipeline,DisableConcurrent
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,NoScmPipeline,RemoteTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,NoScmPipeline,TimerTrigger
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,Parameter,DefaultValue
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,PipelineSpec,MultiBranchPipeline
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,SingleSvnSource,CredentialId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,SingleSvnSource,ScmId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,SvnSource,CredentialId
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3,SvnSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,ApiUri
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,CloneOption
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,DiscoverPRFromForks
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,DiscoverPRFromOrigin
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,DiscoverTags
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,RegexFilter
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,BitbucketServerSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,DiscarderProperty,DaysToKeep
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,DiscarderProperty,NumToKeep
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,CloneOption
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,DiscoverTags
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,RegexFilter
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,ApiUri
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,CloneOption
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,DiscoverPRFromForks
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,DiscoverPRFromOrigin
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,DiscoverTags
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,RegexFilter
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GithubSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,ApiUri
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,CloneOption
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,DiscoverBranches
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,DiscoverPRFromForks
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,DiscoverPRFromOrigin
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,DiscoverTags
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,RegexFilter
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,GitlabSource,ServerName
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchJobTrigger,CreateActionJobsToTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchJobTrigger,DeleteActionJobsToTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,BitbucketServerSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,GitHubSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,GitSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,GitlabSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,MultiBranchJobTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,ScriptPath
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,SingleSvnSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,SourceType
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,SvnSource
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,MultiBranchPipeline,TimerTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,NoScmPipeline,DisableConcurrent
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,NoScmPipeline,RemoteTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,NoScmPipeline,TimerTrigger
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,Parameter,DefaultValue
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,PipelineSpec,MultiBranchPipeline
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,SingleSvnSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,SingleSvnSource,ScmId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,SvnSource,CredentialId
API rule violation: names_match,kubesphere.io/api/devops/v1alpha3,SvnSource,ScmId

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,16 +1,48 @@
# Copyright 2020 The KubeSphere Authors. All rights reserved.
# Use of this source code is governed by an Apache license
# that can be found in the LICENSE file.
FROM alpine:3.11
RUN apk add --no-cache ca-certificates
# Download dependencies
FROM alpine:3.11 as base_os_context
# To speed up building process, we copy binary directly from make
# result instead of building it again, so make sure you run the
# following command first before building docker image
# make ks-apiserver
#
COPY /bin/cmd/ks-apiserver /usr/local/bin/
ARG TARGETARCH
ARG TARGETOS
ARG HELM_VERSION=v3.5.2
ENV OUTDIR=/out
RUN mkdir -p ${OUTDIR}/usr/local/bin/
WORKDIR /tmp
RUN apk add --no-cache ca-certificates
# install helm
ADD https://get.helm.sh/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz /tmp
RUN tar xvzf /tmp/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /tmp
RUN mv /tmp/${TARGETOS}-${TARGETARCH}/helm ${OUTDIR}/usr/local/bin/
# Build
FROM golang:1.16.3 as build_context
ENV OUTDIR=/out
RUN mkdir -p ${OUTDIR}/usr/local/bin/
WORKDIR /workspace
ADD . /workspace/
RUN make ks-apiserver
RUN mv /workspace/bin/cmd/ks-apiserver ${OUTDIR}/usr/local/bin/
##############
# Final image
#############
FROM alpine:3.11
COPY --from=base_os_context /out/ /
COPY --from=build_context /out/ /
WORKDIR /
EXPOSE 9090
CMD ["sh"]

View File

@@ -1,12 +1,67 @@
# Copyright 2020 The KubeSphere Authors. All rights reserved.
# Use of this source code is governed by an Apache license
# that can be found in the LICENSE file.
FROM alpine:3.11
COPY /bin/cmd/controller-manager /usr/local/bin/
# Download dependencies
FROM alpine:3.11 as base_os_context
ARG TARGETARCH
ARG TARGETOS
ARG HELM_VERSION=v3.5.2
ARG KUSTOMIZE_VERSION=v4.2.0
ARG INGRESS_NGINX_VERSION=4.0.13
ENV OUTDIR=/out
RUN mkdir -p ${OUTDIR}/usr/local/bin
RUN mkdir -p ${OUTDIR}/var/helm-charts
WORKDIR /tmp
RUN apk add --no-cache ca-certificates
# Install helm
ADD https://get.helm.sh/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz /tmp
RUN tar xvzf /tmp/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /tmp
RUN mv /tmp/${TARGETOS}-${TARGETARCH}/helm ${OUTDIR}/usr/local/bin/
# install kustomize
ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz /tmp
RUN tar xvzf /tmp/kustomize_${KUSTOMIZE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz -C /tmp
RUN mv /tmp/kustomize ${OUTDIR}/usr/local/bin/
# Install Nginx Ingress Helm Chart
ADD https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-${INGRESS_NGINX_VERSION}/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz /tmp
RUN tar xvzf /tmp/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz -C /tmp
RUN mv /tmp/ingress-nginx ${OUTDIR}/var/helm-charts/
# Build
FROM golang:1.16.3 as build_context
ENV OUTDIR=/out
RUN mkdir -p ${OUTDIR}/usr/local/bin/
RUN mkdir -p ${OUTDIR}/var/helm-charts
WORKDIR /workspace
ADD . /workspace/
RUN make ks-controller-manager
RUN mv /workspace/bin/cmd/controller-manager ${OUTDIR}/usr/local/bin/
# Copy gateway config and helm chart
RUN mv /workspace/config/gateway ${OUTDIR}/var/helm-charts/
RUN mv /workspace/config/watches.yaml ${OUTDIR}/var/helm-charts/
# Final Image
FROM alpine:3.11
COPY --from=base_os_context /out/ /
COPY --from=build_context /out/ /
WORKDIR /
EXPOSE 8443 8080
CMD ["sh"]

View File

@@ -17,311 +17,561 @@ limitations under the License.
package app
import (
"k8s.io/apimachinery/pkg/runtime"
"fmt"
"time"
"github.com/kubesphere/pvc-autoresizer/runners"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/cache"
"k8s.io/klog"
iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
ctrl "sigs.k8s.io/controller-runtime"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/kubefed/pkg/controller/util"
"kubesphere.io/kubesphere/cmd/controller-manager/app/options"
"kubesphere.io/kubesphere/pkg/controller/application"
"kubesphere.io/kubesphere/pkg/controller/helm"
"kubesphere.io/kubesphere/pkg/controller/namespace"
"kubesphere.io/kubesphere/pkg/controller/openpitrix/helmapplication"
"kubesphere.io/kubesphere/pkg/controller/openpitrix/helmcategory"
"kubesphere.io/kubesphere/pkg/controller/openpitrix/helmrelease"
"kubesphere.io/kubesphere/pkg/controller/openpitrix/helmrepo"
"kubesphere.io/kubesphere/pkg/controller/quota"
"kubesphere.io/kubesphere/pkg/controller/serviceaccount"
"kubesphere.io/kubesphere/pkg/controller/user"
"kubesphere.io/kubesphere/pkg/controller/workspace"
"kubesphere.io/kubesphere/pkg/controller/workspacerole"
"kubesphere.io/kubesphere/pkg/controller/workspacerolebinding"
"kubesphere.io/kubesphere/pkg/controller/workspacetemplate"
"kubesphere.io/kubesphere/pkg/models/kubeconfig"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
"kubesphere.io/kubesphere/pkg/controller/storage/snapshotclass"
iamv1alpha2 "kubesphere.io/api/iam/v1alpha2"
"kubesphere.io/kubesphere/pkg/controller/certificatesigningrequest"
"kubesphere.io/kubesphere/pkg/controller/cluster"
"kubesphere.io/kubesphere/pkg/controller/clusterrolebinding"
"kubesphere.io/kubesphere/pkg/controller/destinationrule"
"kubesphere.io/kubesphere/pkg/controller/devopscredential"
"kubesphere.io/kubesphere/pkg/controller/devopsproject"
"kubesphere.io/kubesphere/pkg/controller/globalrole"
"kubesphere.io/kubesphere/pkg/controller/globalrolebinding"
"kubesphere.io/kubesphere/pkg/controller/group"
"kubesphere.io/kubesphere/pkg/controller/groupbinding"
"kubesphere.io/kubesphere/pkg/controller/job"
"kubesphere.io/kubesphere/pkg/controller/loginrecord"
"kubesphere.io/kubesphere/pkg/controller/network/ippool"
"kubesphere.io/kubesphere/pkg/controller/network/nsnetworkpolicy"
"kubesphere.io/kubesphere/pkg/controller/network/provider"
"kubesphere.io/kubesphere/pkg/controller/pipeline"
"kubesphere.io/kubesphere/pkg/controller/s2ibinary"
"kubesphere.io/kubesphere/pkg/controller/s2irun"
"kubesphere.io/kubesphere/pkg/controller/network/nsnetworkpolicy/provider"
"kubesphere.io/kubesphere/pkg/controller/notification"
"kubesphere.io/kubesphere/pkg/controller/storage/capability"
"kubesphere.io/kubesphere/pkg/controller/storage/expansion"
"kubesphere.io/kubesphere/pkg/controller/user"
"kubesphere.io/kubesphere/pkg/controller/virtualservice"
"kubesphere.io/kubesphere/pkg/controller/workspacerole"
"kubesphere.io/kubesphere/pkg/controller/workspacerolebinding"
"kubesphere.io/kubesphere/pkg/controller/workspacetemplate"
"kubesphere.io/kubesphere/pkg/informers"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap"
"kubesphere.io/kubesphere/pkg/simple/client/network"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/kubefed/pkg/controller/util"
ippoolclient "kubesphere.io/kubesphere/pkg/simple/client/network/ippool"
)
func addControllers(
mgr manager.Manager,
client k8s.Client,
informerFactory informers.InformerFactory,
devopsClient devops.Interface,
s3Client s3.Interface,
ldapClient ldapclient.Interface,
authenticationOptions *authoptions.AuthenticationOptions,
openpitrixClient openpitrix.Client,
multiClusterEnabled bool,
networkOptions *network.Options,
serviceMeshEnabled bool,
kubectlImage string,
stopCh <-chan struct{}) error {
var allControllers = []string{
"user",
"workspacetemplate",
"workspace",
"workspacerole",
"workspacerolebinding",
"namespace",
"helmrepo",
"helmcategory",
"helmapplication",
"helmapplicationversion",
"helmrelease",
"helm",
"application",
"serviceaccount",
"resourcequota",
"virtualservice",
"destinationrule",
"job",
"storagecapability",
"volumesnapshot",
"pvcautoresizer",
"workloadrestart",
"loginrecord",
"cluster",
"nsnp",
"ippool",
"csr",
"clusterrolebinding",
"fedglobalrolecache",
"globalrole",
"fedglobalrolebindingcache",
"globalrolebinding",
"groupbinding",
"group",
"notification",
}
// setup all available controllers one by one
func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory informers.InformerFactory,
cmOptions *options.KubeSphereControllerManagerOptions,
stopCh <-chan struct{}) error {
var err error
////////////////////////////////////
// begin init necessary informers
////////////////////////////////////
kubernetesInformer := informerFactory.KubernetesSharedInformerFactory()
istioInformer := informerFactory.IstioSharedInformerFactory()
kubesphereInformer := informerFactory.KubeSphereSharedInformerFactory()
applicationInformer := informerFactory.ApplicationSharedInformerFactory()
////////////////////////////////////
// end informers
////////////////////////////////////
var vsController, drController manager.Runnable
////////////////////////////////////
// begin init necessary clients
////////////////////////////////////
kubeconfigClient := kubeconfig.NewOperator(client.Kubernetes(),
informerFactory.KubernetesSharedInformerFactory().Core().V1().ConfigMaps().Lister(),
client.Config())
var devopsClient devops.Interface
if cmOptions.DevopsOptions != nil && len(cmOptions.DevopsOptions.Host) != 0 {
devopsClient, err = jenkins.NewDevopsClient(cmOptions.DevopsOptions)
if err != nil {
return fmt.Errorf("failed to connect jenkins, please check jenkins status, error: %v", err)
}
}
var ldapClient ldapclient.Interface
// when there is no ldapOption, we set ldapClient as nil, which means we don't need to sync user info into ldap.
if cmOptions.LdapOptions != nil && len(cmOptions.LdapOptions.Host) != 0 {
if cmOptions.LdapOptions.Host == ldapclient.FAKE_HOST { // for debug only
ldapClient = ldapclient.NewSimpleLdap()
} else {
ldapClient, err = ldapclient.NewLdapClient(cmOptions.LdapOptions, stopCh)
if err != nil {
return fmt.Errorf("failed to connect to ldap service, please check ldap status, error: %v", err)
}
}
} else {
klog.Warning("ks-controller-manager starts without ldap provided, it will not sync user into ldap")
}
////////////////////////////////////
// end init clients
////////////////////////////////////
////////////////////////////////////////////////////////
// begin init controller and add to manager one by one
////////////////////////////////////////////////////////
// "user" controller
if cmOptions.IsControllerEnabled("user") {
userController := &user.Reconciler{
MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable,
MaxConcurrentReconciles: 4,
LdapClient: ldapClient,
DevopsClient: devopsClient,
KubeconfigClient: kubeconfigClient,
AuthenticationOptions: cmOptions.AuthenticationOptions,
}
addControllerWithSetup(mgr, "user", userController)
}
// "workspacetemplate" controller
if cmOptions.IsControllerEnabled("workspacetemplate") {
workspaceTemplateReconciler := &workspacetemplate.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable}
addControllerWithSetup(mgr, "workspacetemplate", workspaceTemplateReconciler)
}
// "workspace" controller
if cmOptions.IsControllerEnabled("workspace") {
workspaceReconciler := &workspace.Reconciler{}
addControllerWithSetup(mgr, "workspace", workspaceReconciler)
}
// "workspacerole" controller
if cmOptions.IsControllerEnabled("workspacerole") {
workspaceRoleReconciler := &workspacerole.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable}
addControllerWithSetup(mgr, "workspacerole", workspaceRoleReconciler)
}
// "workspacerolebinding" controller
if cmOptions.IsControllerEnabled("workspacerolebinding") {
workspaceRoleBindingReconciler := &workspacerolebinding.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable}
addControllerWithSetup(mgr, "workspacerolebinding", workspaceRoleBindingReconciler)
}
// "namespace" controller
if cmOptions.IsControllerEnabled("namespace") {
namespaceReconciler := &namespace.Reconciler{GatewayOptions: cmOptions.GatewayOptions}
addControllerWithSetup(mgr, "namespace", namespaceReconciler)
}
// "helmrepo" controller
if cmOptions.IsControllerEnabled("helmrepo") {
helmRepoReconciler := &helmrepo.ReconcileHelmRepo{}
addControllerWithSetup(mgr, "helmrepo", helmRepoReconciler)
}
// "helmcategory" controller
if cmOptions.IsControllerEnabled("helmcategory") {
helmCategoryReconciler := &helmcategory.ReconcileHelmCategory{}
addControllerWithSetup(mgr, "helmcategory", helmCategoryReconciler)
}
var opS3Client s3.Interface
if !cmOptions.OpenPitrixOptions.AppStoreConfIsEmpty() {
opS3Client, err = s3.NewS3Client(cmOptions.OpenPitrixOptions.S3Options)
if err != nil {
klog.Fatalf("failed to connect to s3, please check openpitrix s3 service status, error: %v", err)
}
// "helmapplication" controller
if cmOptions.IsControllerEnabled("helmapplication") {
reconcileHelmApp := (&helmapplication.ReconcileHelmApplication{})
addControllerWithSetup(mgr, "helmapplication", reconcileHelmApp)
}
// "helmapplicationversion" controller
if cmOptions.IsControllerEnabled("helmapplicationversion") {
reconcileHelmAppVersion := (&helmapplication.ReconcileHelmApplicationVersion{})
addControllerWithSetup(mgr, "helmapplicationversion", reconcileHelmAppVersion)
}
}
// "helmrelease" controller
if cmOptions.IsControllerEnabled("helmrelease") {
reconcileHelmRelease := &helmrelease.ReconcileHelmRelease{
// nil interface is valid value.
StorageClient: opS3Client,
KsFactory: informerFactory.KubeSphereSharedInformerFactory(),
MultiClusterEnable: cmOptions.MultiClusterOptions.Enable,
WaitTime: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.WaitTime,
MaxConcurrent: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.MaxConcurrent,
StopChan: stopCh,
}
addControllerWithSetup(mgr, "helmrelease", reconcileHelmRelease)
}
// "helm" controller
if cmOptions.IsControllerEnabled("helm") {
if !cmOptions.GatewayOptions.IsEmpty() {
helmReconciler := &helm.Reconciler{GatewayOptions: cmOptions.GatewayOptions}
addControllerWithSetup(mgr, "helm", helmReconciler)
}
}
// "application" controller
if cmOptions.IsControllerEnabled("application") {
selector, _ := labels.Parse(cmOptions.ApplicationSelector)
applicationReconciler := &application.ApplicationReconciler{
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Mapper: mgr.GetRESTMapper(),
ApplicationSelector: selector,
}
addControllerWithSetup(mgr, "application", applicationReconciler)
}
// "serviceaccount" controller
if cmOptions.IsControllerEnabled("serviceaccount") {
saReconciler := &serviceaccount.Reconciler{}
addControllerWithSetup(mgr, "serviceaccount", saReconciler)
}
// "resourcequota" controller
if cmOptions.IsControllerEnabled("resourcequota") {
resourceQuotaReconciler := &quota.Reconciler{
MaxConcurrentReconciles: quota.DefaultMaxConcurrentReconciles,
ResyncPeriod: quota.DefaultResyncPeriod,
InformerFactory: informerFactory.KubernetesSharedInformerFactory(),
}
addControllerWithSetup(mgr, "resourcequota", resourceQuotaReconciler)
}
serviceMeshEnabled := cmOptions.ServiceMeshOptions != nil && len(cmOptions.ServiceMeshOptions.IstioPilotHost) != 0
if serviceMeshEnabled {
vsController = virtualservice.NewVirtualServiceController(kubernetesInformer.Core().V1().Services(),
istioInformer.Networking().V1alpha3().VirtualServices(),
istioInformer.Networking().V1alpha3().DestinationRules(),
kubesphereInformer.Servicemesh().V1alpha2().Strategies(),
client.Kubernetes(),
client.Istio(),
client.KubeSphere())
// "virtualservice" controller
if cmOptions.IsControllerEnabled("virtualservice") {
vsController := virtualservice.NewVirtualServiceController(kubernetesInformer.Core().V1().Services(),
istioInformer.Networking().V1alpha3().VirtualServices(),
istioInformer.Networking().V1alpha3().DestinationRules(),
kubesphereInformer.Servicemesh().V1alpha2().Strategies(),
client.Kubernetes(),
client.Istio(),
client.KubeSphere())
addController(mgr, "virtualservice", vsController)
}
drController = destinationrule.NewDestinationRuleController(kubernetesInformer.Apps().V1().Deployments(),
istioInformer.Networking().V1alpha3().DestinationRules(),
kubernetesInformer.Core().V1().Services(),
kubesphereInformer.Servicemesh().V1alpha2().ServicePolicies(),
client.Kubernetes(),
client.Istio(),
client.KubeSphere())
// "destinationrule" controller
if cmOptions.IsControllerEnabled("destinationrule") {
drController := destinationrule.NewDestinationRuleController(kubernetesInformer.Apps().V1().Deployments(),
istioInformer.Networking().V1alpha3().DestinationRules(),
kubernetesInformer.Core().V1().Services(),
kubesphereInformer.Servicemesh().V1alpha2().ServicePolicies(),
client.Kubernetes(),
client.Istio(),
client.KubeSphere())
addController(mgr, "destinationrule", drController)
}
}
apController := application.NewApplicationController(kubernetesInformer.Core().V1().Services(),
kubernetesInformer.Apps().V1().Deployments(),
kubernetesInformer.Apps().V1().StatefulSets(),
kubesphereInformer.Servicemesh().V1alpha2().Strategies(),
kubesphereInformer.Servicemesh().V1alpha2().ServicePolicies(),
applicationInformer.App().V1beta1().Applications(),
client.Kubernetes(),
client.Application())
// "job" controller
if cmOptions.IsControllerEnabled("job") {
jobController := job.NewJobController(kubernetesInformer.Batch().V1().Jobs(), client.Kubernetes())
addController(mgr, "job", jobController)
}
jobController := job.NewJobController(kubernetesInformer.Batch().V1().Jobs(), client.Kubernetes())
var s2iBinaryController, s2iRunController, devopsProjectController, devopsPipelineController, devopsCredentialController manager.Runnable
if devopsClient != nil {
s2iBinaryController = s2ibinary.NewController(client.Kubernetes(),
client.KubeSphere(),
kubesphereInformer.Devops().V1alpha1().S2iBinaries(),
s3Client,
// "storagecapability" controller
if cmOptions.IsControllerEnabled("storagecapability") {
storageCapabilityController := capability.NewController(
client.Kubernetes().StorageV1().StorageClasses(),
kubernetesInformer.Storage().V1().StorageClasses(),
kubernetesInformer.Storage().V1().CSIDrivers(),
)
s2iRunController = s2irun.NewS2iRunController(client.Kubernetes(),
client.KubeSphere(),
kubesphereInformer.Devops().V1alpha1().S2iBinaries(),
kubesphereInformer.Devops().V1alpha1().S2iRuns())
devopsProjectController = devopsproject.NewController(client.Kubernetes(),
client.KubeSphere(), devopsClient,
informerFactory.KubernetesSharedInformerFactory().Core().V1().Namespaces(),
informerFactory.KubeSphereSharedInformerFactory().Devops().V1alpha3().DevOpsProjects(),
informerFactory.KubeSphereSharedInformerFactory().Tenant().V1alpha1().Workspaces())
devopsPipelineController = pipeline.NewController(client.Kubernetes(),
client.KubeSphere(),
devopsClient,
informerFactory.KubernetesSharedInformerFactory().Core().V1().Namespaces(),
informerFactory.KubeSphereSharedInformerFactory().Devops().V1alpha3().Pipelines())
devopsCredentialController = devopscredential.NewController(client.Kubernetes(),
devopsClient,
informerFactory.KubernetesSharedInformerFactory().Core().V1().Namespaces(),
informerFactory.KubernetesSharedInformerFactory().Core().V1().Secrets())
addController(mgr, "storagecapability", storageCapabilityController)
}
storageCapabilityController := capability.NewController(
client.KubeSphere().StorageV1alpha1().StorageClassCapabilities(),
kubesphereInformer.Storage().V1alpha1(),
client.Kubernetes().StorageV1().StorageClasses(),
kubernetesInformer.Storage().V1().StorageClasses(),
capability.SnapshotSupported(client.Kubernetes().Discovery()),
client.Snapshot().SnapshotV1beta1().VolumeSnapshotClasses(),
informerFactory.SnapshotSharedInformerFactory().Snapshot().V1beta1().VolumeSnapshotClasses(),
kubernetesInformer.Storage().V1beta1().CSIDrivers(),
)
volumeExpansionController := expansion.NewVolumeExpansionController(
client.Kubernetes(),
kubernetesInformer.Core().V1().PersistentVolumeClaims(),
kubernetesInformer.Storage().V1().StorageClasses(),
kubernetesInformer.Core().V1().Pods(),
kubernetesInformer.Apps().V1().Deployments(),
kubernetesInformer.Apps().V1().ReplicaSets(),
kubernetesInformer.Apps().V1().StatefulSets())
var fedUserCache, fedGlobalRoleBindingCache, fedGlobalRoleCache,
fedWorkspaceRoleCache, fedWorkspaceRoleBindingCache cache.Store
var fedUserCacheController, fedGlobalRoleBindingCacheController, fedGlobalRoleCacheController,
fedWorkspaceRoleCacheController, fedWorkspaceRoleBindingCacheController cache.Controller
if multiClusterEnabled {
fedUserClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedUserResource)
if err != nil {
klog.Error(err)
return err
}
fedGlobalRoleClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedGlobalRoleResource)
if err != nil {
klog.Error(err)
return err
}
fedGlobalRoleBindingClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedGlobalRoleBindingResource)
if err != nil {
klog.Error(err)
return err
}
fedWorkspaceRoleClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedWorkspaceRoleResource)
if err != nil {
klog.Error(err)
return err
}
fedWorkspaceRoleBindingClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedWorkspaceRoleBindingResource)
if err != nil {
klog.Error(err)
return err
}
fedUserCache, fedUserCacheController = util.NewResourceInformer(fedUserClient, "", &iamv1alpha2.FedUserResource, func(object runtime.Object) {})
fedGlobalRoleCache, fedGlobalRoleCacheController = util.NewResourceInformer(fedGlobalRoleClient, "", &iamv1alpha2.FedGlobalRoleResource, func(object runtime.Object) {})
fedGlobalRoleBindingCache, fedGlobalRoleBindingCacheController = util.NewResourceInformer(fedGlobalRoleBindingClient, "", &iamv1alpha2.FedGlobalRoleBindingResource, func(object runtime.Object) {})
fedWorkspaceRoleCache, fedWorkspaceRoleCacheController = util.NewResourceInformer(fedWorkspaceRoleClient, "", &iamv1alpha2.FedWorkspaceRoleResource, func(object runtime.Object) {})
fedWorkspaceRoleBindingCache, fedWorkspaceRoleBindingCacheController = util.NewResourceInformer(fedWorkspaceRoleBindingClient, "", &iamv1alpha2.FedWorkspaceRoleBindingResource, func(object runtime.Object) {})
go fedUserCacheController.Run(stopCh)
go fedGlobalRoleCacheController.Run(stopCh)
go fedGlobalRoleBindingCacheController.Run(stopCh)
go fedWorkspaceRoleCacheController.Run(stopCh)
go fedWorkspaceRoleBindingCacheController.Run(stopCh)
// "volumesnapshot" controller
if cmOptions.IsControllerEnabled("volumesnapshot") {
volumeSnapshotController := snapshotclass.NewController(
kubernetesInformer.Storage().V1().StorageClasses(),
client.Snapshot().SnapshotV1().VolumeSnapshotClasses(),
informerFactory.SnapshotSharedInformerFactory().Snapshot().V1().VolumeSnapshotClasses(),
)
addController(mgr, "volumesnapshot", volumeSnapshotController)
}
userController := user.NewUserController(client.Kubernetes(), client.KubeSphere(),
client.Config(),
kubesphereInformer.Iam().V1alpha2().Users(),
fedUserCache, fedUserCacheController,
kubesphereInformer.Iam().V1alpha2().LoginRecords(),
kubernetesInformer.Core().V1().ConfigMaps(),
ldapClient, devopsClient,
authenticationOptions, multiClusterEnabled)
// "pvc-autoresizer"
monitoringOptionsEnable := cmOptions.MonitoringOptions != nil && len(cmOptions.MonitoringOptions.Endpoint) != 0
if monitoringOptionsEnable {
if cmOptions.IsControllerEnabled("pvc-autoresizer") {
if err := runners.SetupIndexer(mgr, false); err != nil {
return err
}
promClient, err := runners.NewPrometheusClient(cmOptions.MonitoringOptions.Endpoint)
if err != nil {
return err
}
pvcAutoResizerController := runners.NewPVCAutoresizer(
promClient,
mgr.GetClient(),
ctrl.Log.WithName("pvc-autoresizer"),
1*time.Minute,
mgr.GetEventRecorderFor("pvc-autoresizer"),
)
addController(mgr, "pvcautoresizer", pvcAutoResizerController)
}
}
loginRecordController := user.NewLoginRecordController(
client.Kubernetes(),
client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().LoginRecords(),
authenticationOptions.LoginHistoryRetentionPeriod)
if cmOptions.IsControllerEnabled("pvc-workload-restarter") {
restarter := runners.NewRestarter(
mgr.GetClient(),
ctrl.Log.WithName("pvc-workload-restarter"),
1*time.Minute,
mgr.GetEventRecorderFor("pvc-workload-restarter"),
)
addController(mgr, "pvcworkloadrestarter", restarter)
}
csrController := certificatesigningrequest.NewController(client.Kubernetes(),
kubernetesInformer.Certificates().V1beta1().CertificateSigningRequests(),
kubernetesInformer.Core().V1().ConfigMaps(), client.Config())
clusterRoleBindingController := clusterrolebinding.NewController(client.Kubernetes(),
kubernetesInformer.Rbac().V1().ClusterRoleBindings(),
kubernetesInformer.Apps().V1().Deployments(),
kubernetesInformer.Core().V1().Pods(),
kubesphereInformer.Iam().V1alpha2().Users(),
kubectlImage)
globalRoleController := globalrole.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().GlobalRoles(), fedGlobalRoleCache, fedGlobalRoleCacheController)
workspaceRoleController := workspacerole.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().WorkspaceRoles(),
fedWorkspaceRoleCache, fedWorkspaceRoleCacheController,
kubesphereInformer.Tenant().V1alpha2().WorkspaceTemplates(), multiClusterEnabled)
globalRoleBindingController := globalrolebinding.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().GlobalRoleBindings(),
fedGlobalRoleBindingCache, fedGlobalRoleBindingCacheController,
multiClusterEnabled)
workspaceRoleBindingController := workspacerolebinding.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().WorkspaceRoleBindings(),
fedWorkspaceRoleBindingCache, fedWorkspaceRoleBindingCacheController,
kubesphereInformer.Tenant().V1alpha2().WorkspaceTemplates(), multiClusterEnabled)
workspaceTemplateController := workspacetemplate.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Tenant().V1alpha2().WorkspaceTemplates(),
kubesphereInformer.Tenant().V1alpha1().Workspaces(),
kubesphereInformer.Iam().V1alpha2().RoleBases(),
kubesphereInformer.Iam().V1alpha2().WorkspaceRoles(),
kubesphereInformer.Types().V1beta1().FederatedWorkspaces(),
multiClusterEnabled)
var clusterController manager.Runnable
if multiClusterEnabled {
clusterController = cluster.NewClusterController(
// "loginrecord" controller
if cmOptions.IsControllerEnabled("loginrecord") {
loginRecordController := loginrecord.NewLoginRecordController(
client.Kubernetes(),
client.Config(),
kubesphereInformer.Cluster().V1alpha1().Clusters(),
client.KubeSphere().ClusterV1alpha1().Clusters(),
openpitrixClient)
client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().LoginRecords(),
kubesphereInformer.Iam().V1alpha2().Users(),
cmOptions.AuthenticationOptions.LoginHistoryRetentionPeriod,
cmOptions.AuthenticationOptions.LoginHistoryMaximumEntries)
addController(mgr, "loginrecord", loginRecordController)
}
var nsnpController manager.Runnable
if networkOptions.EnableNetworkPolicy {
nsnpProvider, err := provider.NewNsNetworkPolicyProvider(client.Kubernetes(), kubernetesInformer.Networking().V1().NetworkPolicies())
if err != nil {
return err
// "csr" controller
if cmOptions.IsControllerEnabled("csr") {
csrController := certificatesigningrequest.NewController(client.Kubernetes(),
kubernetesInformer.Certificates().V1().CertificateSigningRequests(),
kubernetesInformer.Core().V1().ConfigMaps(), client.Config())
addController(mgr, "csr", csrController)
}
// "clusterrolebinding" controller
if cmOptions.IsControllerEnabled("clusterrolebinding") {
clusterRoleBindingController := clusterrolebinding.NewController(client.Kubernetes(),
kubernetesInformer.Rbac().V1().ClusterRoleBindings(),
kubernetesInformer.Apps().V1().Deployments(),
kubernetesInformer.Core().V1().Pods(),
kubesphereInformer.Iam().V1alpha2().Users(),
cmOptions.AuthenticationOptions.KubectlImage)
addController(mgr, "clusterrolebinding", clusterRoleBindingController)
}
// "fedglobalrolecache" controller
var fedGlobalRoleCache cache.Store
var fedGlobalRoleCacheController cache.Controller
if cmOptions.IsControllerEnabled("fedglobalrolecache") {
if cmOptions.MultiClusterOptions.Enable {
fedGlobalRoleClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedGlobalRoleResource)
if err != nil {
klog.Fatalf("Unable to create FedGlobalRole controller: %v", err)
}
fedGlobalRoleCache, fedGlobalRoleCacheController = util.NewResourceInformer(fedGlobalRoleClient, "",
&iamv1alpha2.FedGlobalRoleResource, func(object runtimeclient.Object) {})
go fedGlobalRoleCacheController.Run(stopCh)
addSuccessfullyControllers.Insert("fedglobalrolecache")
}
nsnpController = nsnetworkpolicy.NewNSNetworkPolicyController(client.Kubernetes(),
client.KubeSphere().NetworkV1alpha1(),
kubesphereInformer.Network().V1alpha1().NamespaceNetworkPolicies(),
kubernetesInformer.Core().V1().Services(),
kubernetesInformer.Core().V1().Nodes(),
kubesphereInformer.Tenant().V1alpha1().Workspaces(),
kubernetesInformer.Core().V1().Namespaces(), nsnpProvider, networkOptions.NSNPOptions)
}
controllers := map[string]manager.Runnable{
"virtualservice-controller": vsController,
"destinationrule-controller": drController,
"application-controller": apController,
"job-controller": jobController,
"s2ibinary-controller": s2iBinaryController,
"s2irun-controller": s2iRunController,
"storagecapability-controller": storageCapabilityController,
"volumeexpansion-controller": volumeExpansionController,
"user-controller": userController,
"loginrecord-controller": loginRecordController,
"cluster-controller": clusterController,
"nsnp-controller": nsnpController,
"csr-controller": csrController,
"clusterrolebinding-controller": clusterRoleBindingController,
"globalrolebinding-controller": globalRoleBindingController,
"workspacetemplate-controller": workspaceTemplateController,
"workspacerole-controller": workspaceRoleController,
"workspacerolebinding-controller": workspaceRoleBindingController,
}
if devopsClient != nil {
controllers["pipeline-controller"] = devopsPipelineController
controllers["devopsprojects-controller"] = devopsProjectController
controllers["devopscredential-controller"] = devopsCredentialController
}
if multiClusterEnabled {
controllers["globalrole-controller"] = globalRoleController
}
for name, ctrl := range controllers {
if ctrl == nil {
klog.V(4).Infof("%s is not going to run due to dependent component disabled.", name)
continue
// "globalrole" controller
if cmOptions.IsControllerEnabled("globalrole") {
if cmOptions.MultiClusterOptions.Enable {
globalRoleController := globalrole.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().GlobalRoles(), fedGlobalRoleCache, fedGlobalRoleCacheController)
addController(mgr, "globalrole", globalRoleController)
}
}
if err := mgr.Add(ctrl); err != nil {
klog.Error(err, "add controller to manager failed", "name", name)
return err
// "fedglobalrolebindingcache" controller
var fedGlobalRoleBindingCache cache.Store
var fedGlobalRoleBindingCacheController cache.Controller
if cmOptions.IsControllerEnabled("fedglobalrolebindingcache") {
if cmOptions.MultiClusterOptions.Enable {
fedGlobalRoleBindingClient, err := util.NewResourceClient(client.Config(), &iamv1alpha2.FedGlobalRoleBindingResource)
if err != nil {
klog.Fatalf("Unable to create FedGlobalRoleBinding controller: %v", err)
}
fedGlobalRoleBindingCache, fedGlobalRoleBindingCacheController = util.NewResourceInformer(fedGlobalRoleBindingClient, "",
&iamv1alpha2.FedGlobalRoleBindingResource, func(object runtimeclient.Object) {})
go fedGlobalRoleBindingCacheController.Run(stopCh)
addSuccessfullyControllers.Insert("fedglobalrolebindingcache")
}
}
// "globalrolebinding" controller
if cmOptions.IsControllerEnabled("globalrolebinding") {
globalRoleBindingController := globalrolebinding.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().GlobalRoleBindings(),
fedGlobalRoleBindingCache, fedGlobalRoleBindingCacheController,
cmOptions.MultiClusterOptions.Enable)
addController(mgr, "globalrolebinding", globalRoleBindingController)
}
// "groupbinding" controller
if cmOptions.IsControllerEnabled("groupbinding") {
groupBindingController := groupbinding.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().GroupBindings(),
kubesphereInformer.Types().V1beta1().FederatedGroupBindings(),
cmOptions.MultiClusterOptions.Enable)
addController(mgr, "groupbinding", groupBindingController)
}
// "group" controller
if cmOptions.IsControllerEnabled("group") {
groupController := group.NewController(client.Kubernetes(), client.KubeSphere(),
kubesphereInformer.Iam().V1alpha2().Groups(),
kubesphereInformer.Types().V1beta1().FederatedGroups(),
cmOptions.MultiClusterOptions.Enable)
addController(mgr, "group", groupController)
}
// "cluster" controller
if cmOptions.IsControllerEnabled("cluster") {
if cmOptions.MultiClusterOptions.Enable {
clusterController := cluster.NewClusterController(
client.Kubernetes(),
client.KubeSphere(),
client.Config(),
kubesphereInformer.Cluster().V1alpha1().Clusters(),
kubesphereInformer.Iam().V1alpha2().Users().Lister(),
cmOptions.MultiClusterOptions.ClusterControllerResyncPeriod,
cmOptions.MultiClusterOptions.HostClusterName,
)
addController(mgr, "cluster", clusterController)
}
}
// "nsnp" controller
if cmOptions.IsControllerEnabled("nsnp") {
if cmOptions.NetworkOptions.EnableNetworkPolicy {
nsnpProvider, err := provider.NewNsNetworkPolicyProvider(client.Kubernetes(), kubernetesInformer.Networking().V1().NetworkPolicies())
if err != nil {
klog.Fatalf("Unable to create NSNetworkPolicy controller: %v", err)
}
nsnpController := nsnetworkpolicy.NewNSNetworkPolicyController(client.Kubernetes(),
client.KubeSphere().NetworkV1alpha1(),
kubesphereInformer.Network().V1alpha1().NamespaceNetworkPolicies(),
kubernetesInformer.Core().V1().Services(),
kubernetesInformer.Core().V1().Nodes(),
kubesphereInformer.Tenant().V1alpha1().Workspaces(),
kubernetesInformer.Core().V1().Namespaces(), nsnpProvider, cmOptions.NetworkOptions.NSNPOptions)
addController(mgr, "nsnp", nsnpController)
}
}
// "ippool" controller
if cmOptions.IsControllerEnabled("ippool") {
ippoolProvider := ippoolclient.NewProvider(kubernetesInformer, client.KubeSphere(), client.Kubernetes(),
cmOptions.NetworkOptions.IPPoolType, cmOptions.KubernetesOptions)
if ippoolProvider != nil {
ippoolController := ippool.NewIPPoolController(kubesphereInformer, kubernetesInformer, client.Kubernetes(),
client.KubeSphere(), ippoolProvider)
addController(mgr, "ippool", ippoolController)
}
}
// "notification" controller
if cmOptions.IsControllerEnabled("notification") {
if cmOptions.MultiClusterOptions.Enable {
notificationController, err := notification.NewController(client.Kubernetes(), mgr.GetClient(), mgr.GetCache())
if err != nil {
klog.Fatalf("Unable to create Notification controller: %v", err)
}
addController(mgr, "notification", notificationController)
}
}
// log all controllers process result
for _, name := range allControllers {
if cmOptions.IsControllerEnabled(name) {
if addSuccessfullyControllers.Has(name) {
klog.Infof("%s controller is enabled and added successfully.", name)
} else {
klog.Infof("%s controller is enabled but is not going to run due to its dependent component being disabled.", name)
}
} else {
klog.Infof("%s controller is disabled by controller selectors.", name)
}
}
return nil
}
var addSuccessfullyControllers = sets.NewString()
type setupableController interface {
SetupWithManager(mgr ctrl.Manager) error
}
func addControllerWithSetup(mgr manager.Manager, name string, controller setupableController) {
if err := controller.SetupWithManager(mgr); err != nil {
klog.Fatalf("Unable to create %v controller: %v", name, err)
}
addSuccessfullyControllers.Insert(name)
}
func addController(mgr manager.Manager, name string, controller manager.Runnable) {
if err := mgr.Add(controller); err != nil {
klog.Fatalf("Unable to create %v controller: %v", name, err)
}
addSuccessfullyControllers.Insert(name)
}

View File

@@ -17,12 +17,14 @@ limitations under the License.
package app
import (
"context"
"fmt"
"net/http"
"time"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
"net/http"
"time"
)
// WaitForAPIServer waits for the API Server's /healthz endpoint to report "ok" before timeout.
@@ -31,7 +33,7 @@ func WaitForAPIServer(client clientset.Interface, timeout time.Duration) error {
err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
healthStatus := 0
result := client.Discovery().RESTClient().Get().AbsPath("/healthz").Do().StatusCode(&healthStatus)
result := client.Discovery().RESTClient().Get().AbsPath("/healthz").Do(context.Background()).StatusCode(&healthStatus)
if result.Error() != nil {
lastErr = fmt.Errorf("failed to get apiserver /healthz status: %v", result.Error())
return false, nil

View File

@@ -18,12 +18,27 @@ package options
import (
"flag"
"fmt"
"strings"
"time"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus"
controllerconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
"k8s.io/apimachinery/pkg/util/sets"
"kubesphere.io/kubesphere/pkg/apiserver/authentication"
"k8s.io/apimachinery/pkg/labels"
"github.com/spf13/pflag"
"k8s.io/client-go/tools/leaderelection"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog"
authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
"kubesphere.io/kubesphere/pkg/simple/client/gateway"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap"
"kubesphere.io/kubesphere/pkg/simple/client/multicluster"
@@ -31,23 +46,45 @@ import (
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
"kubesphere.io/kubesphere/pkg/simple/client/servicemesh"
"strings"
"time"
)
type KubeSphereControllerManagerOptions struct {
KubernetesOptions *k8s.KubernetesOptions
DevopsOptions *jenkins.Options
S3Options *s3.Options
AuthenticationOptions *authoptions.AuthenticationOptions
AuthenticationOptions *authentication.Options
LdapOptions *ldapclient.Options
OpenPitrixOptions *openpitrix.Options
NetworkOptions *network.Options
MultiClusterOptions *multicluster.Options
ServiceMeshOptions *servicemesh.Options
GatewayOptions *gateway.Options
MonitoringOptions *prometheus.Options
LeaderElect bool
LeaderElection *leaderelection.LeaderElectionConfig
WebhookCertDir string
// KubeSphere is using sigs.k8s.io/application as fundamental object to implement Application Management.
// There are other projects also built on sigs.k8s.io/application, when KubeSphere installed along side
// them, conflicts happen. So we leave an option to only reconcile applications matched with the given
// selector. Default will reconcile all applications.
// For example
// "kubesphere.io/creator=" means reconcile applications with this label key
// "!kubesphere.io/creator" means exclude applications with this key
ApplicationSelector string
// ControllerGates is the list of controller gates to enable or disable controller.
// '*' means "all enabled by default controllers"
// 'foo' means "enable 'foo'"
// '-foo' means "disable 'foo'"
// first item for a particular name wins.
// e.g. '-foo,foo' means "disable foo", 'foo,-foo' means "enable foo"
// * has the lowest priority.
// e.g. *,-foo, means "disable 'foo'"
ControllerGates []string
// Enable gops or not.
GOPSEnabled bool
}
func NewKubeSphereControllerManagerOptions() *KubeSphereControllerManagerOptions {
@@ -60,20 +97,23 @@ func NewKubeSphereControllerManagerOptions() *KubeSphereControllerManagerOptions
NetworkOptions: network.NewNetworkOptions(),
MultiClusterOptions: multicluster.NewOptions(),
ServiceMeshOptions: servicemesh.NewServiceMeshOptions(),
AuthenticationOptions: authoptions.NewAuthenticateOptions(),
AuthenticationOptions: authentication.NewOptions(),
GatewayOptions: gateway.NewGatewayOptions(),
LeaderElection: &leaderelection.LeaderElectionConfig{
LeaseDuration: 30 * time.Second,
RenewDeadline: 15 * time.Second,
RetryPeriod: 5 * time.Second,
},
LeaderElect: false,
WebhookCertDir: "",
LeaderElect: false,
WebhookCertDir: "",
ApplicationSelector: "",
ControllerGates: []string{"*"},
}
return s
}
func (s *KubeSphereControllerManagerOptions) Flags() cliflag.NamedFlagSets {
func (s *KubeSphereControllerManagerOptions) Flags(allControllerNameSelectors []string) cliflag.NamedFlagSets {
fss := cliflag.NamedFlagSets{}
s.KubernetesOptions.AddFlags(fss.FlagSet("kubernetes"), s.KubernetesOptions)
@@ -85,7 +125,7 @@ func (s *KubeSphereControllerManagerOptions) Flags() cliflag.NamedFlagSets {
s.NetworkOptions.AddFlags(fss.FlagSet("network"), s.NetworkOptions)
s.MultiClusterOptions.AddFlags(fss.FlagSet("multicluster"), s.MultiClusterOptions)
s.ServiceMeshOptions.AddFlags(fss.FlagSet("servicemesh"), s.ServiceMeshOptions)
s.GatewayOptions.AddFlags(fss.FlagSet("gateway"), s.GatewayOptions)
fs := fss.FlagSet("leaderelection")
s.bindLeaderElectionFlags(s.LeaderElection, fs)
@@ -98,6 +138,18 @@ func (s *KubeSphereControllerManagerOptions) Flags() cliflag.NamedFlagSets {
"if not set, webhook server would look up the server key and certificate in"+
"{TempDir}/k8s-webhook-server/serving-certs")
gfs := fss.FlagSet("generic")
gfs.StringVar(&s.ApplicationSelector, "application-selector", s.ApplicationSelector, ""+
"Only reconcile application(sigs.k8s.io/application) objects match given selector, this could avoid conflicts with "+
"other projects built on top of sig-application. Default behavior is to reconcile all of application objects.")
gfs.StringSliceVar(&s.ControllerGates, "controllers", []string{"*"}, fmt.Sprintf(""+
"A list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller "+
"named 'foo', '-foo' disables the controller named 'foo'.\nAll controllers: %s",
strings.Join(allControllerNameSelectors, ", ")))
gfs.BoolVar(&s.GOPSEnabled, "gops", s.GOPSEnabled, "Whether to enable gops or not. When enabled this option, "+
"controller-manager will listen on a random port on 127.0.0.1, then you can use the gops tool to list and diagnose the controller-manager currently running.")
kfs := fss.FlagSet("klog")
local := flag.NewFlagSet("klog", flag.ExitOnError)
klog.InitFlags(local)
@@ -109,17 +161,58 @@ func (s *KubeSphereControllerManagerOptions) Flags() cliflag.NamedFlagSets {
return fss
}
func (s *KubeSphereControllerManagerOptions) Validate() []error {
// Validate Options and Genetic Options
func (o *KubeSphereControllerManagerOptions) Validate(allControllerNameSelectors []string) []error {
var errs []error
errs = append(errs, s.DevopsOptions.Validate()...)
errs = append(errs, s.KubernetesOptions.Validate()...)
errs = append(errs, s.S3Options.Validate()...)
errs = append(errs, s.OpenPitrixOptions.Validate()...)
errs = append(errs, s.NetworkOptions.Validate()...)
errs = append(errs, s.LdapOptions.Validate()...)
errs = append(errs, o.DevopsOptions.Validate()...)
errs = append(errs, o.KubernetesOptions.Validate()...)
errs = append(errs, o.S3Options.Validate()...)
errs = append(errs, o.OpenPitrixOptions.Validate()...)
errs = append(errs, o.NetworkOptions.Validate()...)
errs = append(errs, o.LdapOptions.Validate()...)
errs = append(errs, o.MultiClusterOptions.Validate()...)
// genetic option: application-selector
if len(o.ApplicationSelector) != 0 {
_, err := labels.Parse(o.ApplicationSelector)
if err != nil {
errs = append(errs, err)
}
}
// genetic option: controllers, check all selectors are valid
allControllersNameSet := sets.NewString(allControllerNameSelectors...)
for _, selector := range o.ControllerGates {
if selector == "*" {
continue
}
selector = strings.TrimPrefix(selector, "-")
if !allControllersNameSet.Has(selector) {
errs = append(errs, fmt.Errorf("%q is not in the list of known controllers", selector))
}
}
return errs
}
// IsControllerEnabled check if a specified controller enabled or not.
func (o *KubeSphereControllerManagerOptions) IsControllerEnabled(name string) bool {
hasStar := false
for _, ctrl := range o.ControllerGates {
if ctrl == name {
return true
}
if ctrl == "-"+name {
return false
}
if ctrl == "*" {
hasStar = true
}
}
return hasStar
}
func (s *KubeSphereControllerManagerOptions) bindLeaderElectionFlags(l *leaderelection.LeaderElectionConfig, fs *pflag.FlagSet) {
fs.DurationVar(&l.LeaseDuration, "leader-elect-lease-duration", l.LeaseDuration, ""+
"The duration that non-leader candidates will wait after observing a leadership "+
@@ -135,3 +228,18 @@ func (s *KubeSphereControllerManagerOptions) bindLeaderElectionFlags(l *leaderel
"The duration the clients should wait between attempting acquisition and renewal "+
"of a leadership. This is only applicable if leader election is enabled.")
}
// MergeConfig merge new config without validation
// When misconfigured, the app should just crash directly
func (s *KubeSphereControllerManagerOptions) MergeConfig(cfg *controllerconfig.Config) {
s.KubernetesOptions = cfg.KubernetesOptions
s.DevopsOptions = cfg.DevopsOptions
s.S3Options = cfg.S3Options
s.AuthenticationOptions = cfg.AuthenticationOptions
s.LdapOptions = cfg.LdapOptions
s.OpenPitrixOptions = cfg.OpenPitrixOptions
s.NetworkOptions = cfg.NetworkOptions
s.MultiClusterOptions = cfg.MultiClusterOptions
s.ServiceMeshOptions = cfg.ServiceMeshOptions
s.GatewayOptions = cfg.GatewayOptions
}

View File

@@ -0,0 +1,81 @@
// Copyright 2022 The KubeSphere Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package options
import (
"testing"
"github.com/stretchr/testify/assert"
)
// ref: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/controller-manager/app/helper_test.go
func TestIsControllerEnabled(t *testing.T) {
testcases := []struct {
name string
controllerName string
controllerFlags []string
expected bool
}{
{
name: "on by name",
controllerName: "bravo",
controllerFlags: []string{"alpha", "bravo", "-charlie"},
expected: true,
},
{
name: "off by name",
controllerName: "charlie",
controllerFlags: []string{"alpha", "bravo", "-charlie"},
expected: false,
},
{
name: "on by default",
controllerName: "alpha",
controllerFlags: []string{"*"},
expected: true,
},
{
name: "on by star, not off by name",
controllerName: "alpha",
controllerFlags: []string{"*", "-charlie"},
expected: true,
},
{
name: "off by name with star",
controllerName: "charlie",
controllerFlags: []string{"*", "-charlie"},
expected: false,
},
{
name: "off then on",
controllerName: "alpha",
controllerFlags: []string{"-alpha", "alpha"},
expected: false,
},
{
name: "on then off",
controllerName: "alpha",
controllerFlags: []string{"alpha", "-alpha"},
expected: true,
},
}
for _, tc := range testcases {
option := NewKubeSphereControllerManagerOptions()
option.ControllerGates = tc.controllerFlags
actual := option.IsControllerEnabled(tc.controllerName)
assert.Equal(t, tc.expected, actual, "%v: expected %v, got %v", tc.name, tc.expected, actual)
}
}

View File

@@ -17,32 +17,34 @@ limitations under the License.
package app
import (
"context"
"fmt"
"os"
"github.com/google/gops/agent"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog"
"k8s.io/klog/klogr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"kubesphere.io/kubesphere/cmd/controller-manager/app/options"
"kubesphere.io/kubesphere/pkg/apis"
controllerconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
"kubesphere.io/kubesphere/pkg/controller/namespace"
"kubesphere.io/kubesphere/pkg/controller/network/nsnetworkpolicy"
"kubesphere.io/kubesphere/pkg/controller/network/webhooks"
"kubesphere.io/kubesphere/pkg/controller/quota"
"kubesphere.io/kubesphere/pkg/controller/user"
"kubesphere.io/kubesphere/pkg/controller/workspace"
"kubesphere.io/kubesphere/pkg/informers"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
"kubesphere.io/kubesphere/pkg/utils/metrics"
"kubesphere.io/kubesphere/pkg/utils/term"
"os"
application "sigs.k8s.io/application/controllers"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"kubesphere.io/kubesphere/pkg/version"
)
func NewControllerManagerCommand() *cobra.Command {
@@ -60,6 +62,8 @@ func NewControllerManagerCommand() *cobra.Command {
NetworkOptions: conf.NetworkOptions,
MultiClusterOptions: conf.MultiClusterOptions,
ServiceMeshOptions: conf.ServiceMeshOptions,
GatewayOptions: conf.GatewayOptions,
MonitoringOptions: conf.MonitoringOptions,
LeaderElection: s.LeaderElection,
LeaderElect: s.LeaderElect,
WebhookCertDir: s.WebhookCertDir,
@@ -70,14 +74,22 @@ func NewControllerManagerCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "controller-manager",
Long: `KubeSphere controller manager is a daemon that`,
Long: `KubeSphere controller manager is a daemon that embeds the control loops shipped with KubeSphere.`,
Run: func(cmd *cobra.Command, args []string) {
if errs := s.Validate(); len(errs) != 0 {
if errs := s.Validate(allControllers); len(errs) != 0 {
klog.Error(utilerrors.NewAggregate(errs))
os.Exit(1)
}
if err = run(s, signals.SetupSignalHandler()); err != nil {
if s.GOPSEnabled {
// Add agent to report additional information such as the current stack trace, Go version, memory stats, etc.
// Bind to a random port on address 127.0.0.1
if err := agent.Listen(agent.Options{}); err != nil {
klog.Fatal(err)
}
}
if err = Run(s, controllerconfig.WatchConfigChange(), signals.SetupSignalHandler()); err != nil {
klog.Error(err)
os.Exit(1)
}
@@ -86,7 +98,7 @@ func NewControllerManagerCommand() *cobra.Command {
}
fs := cmd.Flags()
namedFlagSets := s.Flags()
namedFlagSets := s.Flags(allControllers)
for _, f := range namedFlagSets.FlagSets {
fs.AddFlagSet(f)
@@ -98,49 +110,64 @@ func NewControllerManagerCommand() *cobra.Command {
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s\n\n"+usageFmt, cmd.Long, cmd.UseLine())
cliflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
})
versionCmd := &cobra.Command{
Use: "version",
Short: "Print the version of KubeSphere controller-manager",
Run: func(cmd *cobra.Command, args []string) {
cmd.Println(version.Get())
},
}
cmd.AddCommand(versionCmd)
return cmd
}
func run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{}) error {
func Run(s *options.KubeSphereControllerManagerOptions, configCh <-chan controllerconfig.Config, ctx context.Context) error {
ictx, cancelFunc := context.WithCancel(context.TODO())
errCh := make(chan error)
defer close(errCh)
go func() {
if err := run(s, ictx); err != nil {
errCh <- err
}
}()
// The ctx (signals.SetupSignalHandler()) is to control the entire program life cycle,
// The ictx(internal context) is created here to control the life cycle of the controller-manager(all controllers, sharedInformer, webhook etc.)
// when config changed, stop server and renew context, start new server
for {
select {
case <-ctx.Done():
cancelFunc()
return nil
case cfg := <-configCh:
cancelFunc()
s.MergeConfig(&cfg)
ictx, cancelFunc = context.WithCancel(context.TODO())
go func() {
if err := run(s, ictx); err != nil {
errCh <- err
}
}()
case err := <-errCh:
cancelFunc()
return err
}
}
}
func run(s *options.KubeSphereControllerManagerOptions, ctx context.Context) error {
kubernetesClient, err := k8s.NewKubernetesClient(s.KubernetesOptions)
if err != nil {
klog.Errorf("Failed to create kubernetes clientset %v", err)
return err
}
var devopsClient devops.Interface
if s.DevopsOptions != nil && len(s.DevopsOptions.Host) != 0 {
devopsClient, err = jenkins.NewDevopsClient(s.DevopsOptions)
if err != nil {
return fmt.Errorf("failed to connect jenkins, please check jenkins status, error: %v", err)
}
}
var ldapClient ldapclient.Interface
if s.LdapOptions == nil || len(s.LdapOptions.Host) == 0 {
return fmt.Errorf("ldap service address MUST not be empty")
} else {
if s.LdapOptions.Host == ldapclient.FAKE_HOST { // for debug only
ldapClient = ldapclient.NewSimpleLdap()
} else {
ldapClient, err = ldapclient.NewLdapClient(s.LdapOptions, stopCh)
if err != nil {
return fmt.Errorf("failed to connect to ldap service, please check ldap status, error: %v", err)
}
}
}
var openpitrixClient openpitrix.Client
if s.OpenPitrixOptions != nil && !s.OpenPitrixOptions.IsEmpty() {
openpitrixClient, err = openpitrix.NewClient(s.OpenPitrixOptions)
if err != nil {
return fmt.Errorf("failed to connect to openpitrix, please check openpitrix status, error: %v", err)
}
}
var s3Client s3.Interface
if s.S3Options != nil && len(s.S3Options.Endpoint) != 0 {
s3Client, err = s3.NewS3Client(s.S3Options)
_, err = s3.NewS3Client(s.S3Options)
if err != nil {
return fmt.Errorf("failed to connect to s3, please check s3 service status, error: %v", err)
}
@@ -150,9 +177,9 @@ func run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
kubernetesClient.Kubernetes(),
kubernetesClient.KubeSphere(),
kubernetesClient.Istio(),
kubernetesClient.Application(),
kubernetesClient.Snapshot(),
kubernetesClient.ApiExtensions())
kubernetesClient.ApiExtensions(),
kubernetesClient.Prometheus())
mgrOptions := manager.Options{
CertDir: s.WebhookCertDir,
@@ -173,7 +200,7 @@ func run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
}
klog.V(0).Info("setting up manager")
ctrl.SetLogger(klogr.New())
// Use 8443 instead of 443 cause we need root permission to bind port 443
mgr, err := manager.New(kubernetesClient.Config(), mgrOptions)
if err != nil {
@@ -184,57 +211,46 @@ func run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
klog.Fatalf("unable add APIs to scheme: %v", err)
}
err = workspace.Add(mgr)
if err != nil {
klog.Fatal("Unable to create workspace controller")
}
err = namespace.Add(mgr)
if err != nil {
klog.Fatal("Unable to create namespace controller")
}
err = (&application.ApplicationReconciler{
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Mapper: mgr.GetRESTMapper(),
Log: klogr.New(),
}).SetupWithManager(mgr)
if err != nil {
klog.Fatal("Unable to create application controller")
}
// register common meta types into schemas.
metav1.AddToGroupVersion(mgr.GetScheme(), metav1.SchemeGroupVersion)
// TODO(jeff): refactor config with CRD
servicemeshEnabled := s.ServiceMeshOptions != nil && len(s.ServiceMeshOptions.IstioPilotHost) != 0
if err = addControllers(mgr,
// install all controllers
if err = addAllControllers(mgr,
kubernetesClient,
informerFactory,
devopsClient,
s3Client,
ldapClient,
s.AuthenticationOptions,
openpitrixClient,
s.MultiClusterOptions.Enable,
s.NetworkOptions,
servicemeshEnabled,
s.AuthenticationOptions.KubectlImage, stopCh); err != nil {
s,
ctx.Done()); err != nil {
klog.Fatalf("unable to register controllers to the manager: %v", err)
}
// Start cache data after all informer is registered
klog.V(0).Info("Starting cache resource from apiserver...")
informerFactory.Start(stopCh)
informerFactory.Start(ctx.Done())
// Setup webhooks
klog.V(2).Info("setting up webhook server")
hookServer := mgr.GetWebhookServer()
klog.V(2).Info("registering webhooks to the webhook server")
hookServer.Register("/validate-email-iam-kubesphere-io-v1alpha2-user", &webhook.Admission{Handler: &user.EmailValidator{Client: mgr.GetClient()}})
hookServer.Register("/validate-nsnp-kubesphere-io-v1alpha1-network", &webhook.Admission{Handler: &nsnetworkpolicy.NSNPValidator{Client: mgr.GetClient()}})
hookServer.Register("/validate-email-iam-kubesphere-io-v1alpha2", &webhook.Admission{Handler: &user.EmailValidator{Client: mgr.GetClient()}})
hookServer.Register("/validate-network-kubesphere-io-v1alpha1", &webhook.Admission{Handler: &webhooks.ValidatingHandler{C: mgr.GetClient()}})
hookServer.Register("/mutate-network-kubesphere-io-v1alpha1", &webhook.Admission{Handler: &webhooks.MutatingHandler{C: mgr.GetClient()}})
hookServer.Register("/persistentvolumeclaims", &webhook.Admission{Handler: &webhooks.AccessorHandler{C: mgr.GetClient()}})
resourceQuotaAdmission, err := quota.NewResourceQuotaAdmission(mgr.GetClient(), mgr.GetScheme())
if err != nil {
klog.Fatalf("unable to create resource quota admission: %v", err)
}
hookServer.Register("/validate-quota-kubesphere-io-v1alpha2", &webhook.Admission{Handler: resourceQuotaAdmission})
klog.V(2).Info("registering metrics to the webhook server")
// Add an extra metric endpoint, so we can use the the same metric definition with ks-apiserver
// /kapis/metrics is independent of controller-manager's built-in /metrics
mgr.AddMetricsExtraHandler("/kapis/metrics", metrics.Handler())
klog.V(0).Info("Starting the controllers.")
if err = mgr.Start(stopCh); err != nil {
if err = mgr.Start(ctx); err != nil {
klog.Fatalf("unable to run the manager: %v", err)
}

View File

@@ -17,8 +17,9 @@ limitations under the License.
package main
import (
"kubesphere.io/kubesphere/cmd/controller-manager/app"
"os"
"kubesphere.io/kubesphere/cmd/controller-manager/app"
)
func main() {

View File

@@ -17,8 +17,9 @@ limitations under the License.
package main
import (
"kubesphere.io/kubesphere/cmd/ks-apiserver/app"
"log"
"kubesphere.io/kubesphere/cmd/ks-apiserver/app"
)
func main() {

View File

@@ -20,25 +20,39 @@ import (
"crypto/tls"
"flag"
"fmt"
openpitrixv1 "kubesphere.io/kubesphere/pkg/kapis/openpitrix/v1"
"kubesphere.io/kubesphere/pkg/utils/clusterclient"
"kubesphere.io/kubesphere/pkg/apiserver/authentication/token"
"k8s.io/client-go/kubernetes/scheme"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog"
runtimecache "sigs.k8s.io/controller-runtime/pkg/cache"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
"kubesphere.io/kubesphere/pkg/apis"
"kubesphere.io/kubesphere/pkg/apiserver"
apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
"kubesphere.io/kubesphere/pkg/informers"
genericoptions "kubesphere.io/kubesphere/pkg/server/options"
"kubesphere.io/kubesphere/pkg/simple/client/alerting"
auditingclient "kubesphere.io/kubesphere/pkg/simple/client/auditing/elasticsearch"
"kubesphere.io/kubesphere/pkg/simple/client/cache"
"net/http"
"strings"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
eventsclient "kubesphere.io/kubesphere/pkg/simple/client/events/elasticsearch"
"kubesphere.io/kubesphere/pkg/simple/client/k8s"
esclient "kubesphere.io/kubesphere/pkg/simple/client/logging/elasticsearch"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring/metricsserver"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
fakes3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake"
"kubesphere.io/kubesphere/pkg/simple/client/sonarqube"
"net/http"
"strings"
)
type ServerRunOptions struct {
@@ -48,6 +62,9 @@ type ServerRunOptions struct {
//
DebugMode bool
// Enable gops or not.
GOPSEnabled bool
}
func NewServerRunOptions() *ServerRunOptions {
@@ -62,6 +79,8 @@ func NewServerRunOptions() *ServerRunOptions {
func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
fs := fss.FlagSet("generic")
fs.BoolVar(&s.DebugMode, "debug", false, "Don't enable this if you don't know what it means.")
fs.BoolVar(&s.GOPSEnabled, "gops", false, "Whether to enable gops or not. When enabled this option, "+
"ks-apiserver will listen on a random port on 127.0.0.1, then you can use the gops tool to list and diagnose the ks-apiserver currently running.")
s.GenericServerRunOptions.AddFlags(fs, s.GenericServerRunOptions)
s.KubernetesOptions.AddFlags(fss.FlagSet("kubernetes"), s.KubernetesOptions)
s.AuthenticationOptions.AddFlags(fss.FlagSet("authentication"), s.AuthenticationOptions)
@@ -78,6 +97,7 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
s.MultiClusterOptions.AddFlags(fss.FlagSet("multicluster"), s.MultiClusterOptions)
s.EventsOptions.AddFlags(fss.FlagSet("events"), s.EventsOptions)
s.AuditingOptions.AddFlags(fss.FlagSet("auditing"), s.AuditingOptions)
s.AlertingOptions.AddFlags(fss.FlagSet("alerting"), s.AlertingOptions)
fs = fss.FlagSet("klog")
local := flag.NewFlagSet("klog", flag.ExitOnError)
@@ -105,7 +125,7 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
apiServer.KubernetesClient = kubernetesClient
informerFactory := informers.NewInformerFactories(kubernetesClient.Kubernetes(), kubernetesClient.KubeSphere(),
kubernetesClient.Istio(), kubernetesClient.Application(), kubernetesClient.Snapshot(), kubernetesClient.ApiExtensions())
kubernetesClient.Istio(), kubernetesClient.Snapshot(), kubernetesClient.ApiExtensions(), kubernetesClient.Prometheus())
apiServer.InformerFactory = informerFactory
if s.MonitoringOptions == nil || len(s.MonitoringOptions.Endpoint) == 0 {
@@ -118,8 +138,10 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
apiServer.MonitoringClient = monitoringClient
}
apiServer.MetricsClient = metricsserver.NewMetricsClient(kubernetesClient.Kubernetes(), s.KubernetesOptions)
if s.LoggingOptions.Host != "" {
loggingClient, err := esclient.NewElasticsearch(s.LoggingOptions)
loggingClient, err := esclient.NewClient(s.LoggingOptions)
if err != nil {
return nil, fmt.Errorf("failed to connect to elasticsearch, please check elasticsearch status, error: %v", err)
}
@@ -155,9 +177,7 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
}
var cacheClient cache.Interface
if s.RedisOptions == nil || len(s.RedisOptions.Host) == 0 {
return nil, fmt.Errorf("redis service address MUST not be empty, please check configmap/kubesphere-config in kubesphere-system namespace")
} else {
if s.RedisOptions != nil && len(s.RedisOptions.Host) != 0 {
if s.RedisOptions.Host == fakeInterface && s.DebugMode {
apiServer.CacheClient = cache.NewSimpleCache()
} else {
@@ -167,6 +187,10 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
}
apiServer.CacheClient = cacheClient
}
} else {
klog.Warning("ks-apiserver starts without redis provided, it will use in memory cache. " +
"This may cause inconsistencies when running ks-apiserver with multiple replicas.")
apiServer.CacheClient = cache.NewSimpleCache()
}
if s.EventsOptions.Host != "" {
@@ -185,14 +209,21 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
apiServer.AuditingClient = auditingClient
}
if s.OpenPitrixOptions != nil && !s.OpenPitrixOptions.IsEmpty() {
opClient, err := openpitrix.NewClient(s.OpenPitrixOptions)
if s.AlertingOptions != nil && (s.AlertingOptions.PrometheusEndpoint != "" || s.AlertingOptions.ThanosRulerEndpoint != "") {
alertingClient, err := alerting.NewRuleClient(s.AlertingOptions)
if err != nil {
return nil, fmt.Errorf("failed to connect to openpitrix, please check openpitrix status, error: %v", err)
return nil, fmt.Errorf("failed to init alerting client: %v", err)
}
apiServer.OpenpitrixClient = opClient
apiServer.AlertingClient = alertingClient
}
if s.Config.MultiClusterOptions.Enable {
cc := clusterclient.NewClusterClient(informerFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Clusters())
apiServer.ClusterClient = cc
}
apiServer.OpenpitrixClient = openpitrixv1.NewOpenpitrixClient(informerFactory, apiServer.KubernetesClient.KubeSphere(), s.OpenPitrixOptions, apiServer.ClusterClient, stopCh)
server := &http.Server{
Addr: fmt.Sprintf(":%d", s.GenericServerRunOptions.InsecurePort),
}
@@ -202,7 +233,31 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
if err != nil {
return nil, err
}
server.TLSConfig.Certificates = []tls.Certificate{certificate}
server.TLSConfig = &tls.Config{
Certificates: []tls.Certificate{certificate},
}
server.Addr = fmt.Sprintf(":%d", s.GenericServerRunOptions.SecurePort)
}
sch := scheme.Scheme
if err := apis.AddToScheme(sch); err != nil {
klog.Fatalf("unable add APIs to scheme: %v", err)
}
apiServer.RuntimeCache, err = runtimecache.New(apiServer.KubernetesClient.Config(), runtimecache.Options{Scheme: sch})
if err != nil {
klog.Fatalf("unable to create controller runtime cache: %v", err)
}
apiServer.RuntimeClient, err = runtimeclient.New(apiServer.KubernetesClient.Config(), runtimeclient.Options{Scheme: sch})
if err != nil {
klog.Fatalf("unable to create controller runtime client: %v", err)
}
apiServer.Issuer, err = token.NewIssuer(s.AuthenticationOptions)
if err != nil {
klog.Fatalf("unable to create issuer: %v", err)
}
apiServer.Server = server

View File

@@ -31,9 +31,11 @@ func (s *ServerRunOptions) Validate() []error {
errors = append(errors, s.OpenPitrixOptions.Validate()...)
errors = append(errors, s.NetworkOptions.Validate()...)
errors = append(errors, s.LoggingOptions.Validate()...)
errors = append(errors, s.AuthenticationOptions.Validate()...)
errors = append(errors, s.AuthorizationOptions.Validate()...)
errors = append(errors, s.EventsOptions.Validate()...)
errors = append(errors, s.AuditingOptions.Validate()...)
errors = append(errors, s.AlertingOptions.Validate()...)
return errors
}

View File

@@ -17,17 +17,22 @@ limitations under the License.
package app
import (
"context"
"fmt"
kconfig "github.com/kiali/kiali/config"
"net/http"
"github.com/google/gops/agent"
"github.com/spf13/cobra"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"kubesphere.io/kubesphere/cmd/ks-apiserver/app/options"
apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
"kubesphere.io/kubesphere/pkg/utils/signals"
"kubesphere.io/kubesphere/pkg/utils/term"
tracing "kubesphere.io/kubesphere/pkg/kapis/servicemesh/metrics/v1alpha2"
"kubesphere.io/kubesphere/pkg/version"
)
func NewAPIServerCommand() *cobra.Command {
@@ -40,6 +45,8 @@ func NewAPIServerCommand() *cobra.Command {
GenericServerRunOptions: s.GenericServerRunOptions,
Config: conf,
}
} else {
klog.Fatal("Failed to load configuration from disk", err)
}
cmd := &cobra.Command{
@@ -52,7 +59,15 @@ cluster's shared state through which all other components interact.`,
return utilerrors.NewAggregate(errs)
}
return Run(s, signals.SetupSignalHandler())
if s.GOPSEnabled {
// Add agent to report additional information such as the current stack trace, Go version, memory stats, etc.
// Bind to a random port on address 127.0.0.1.
if err := agent.Listen(agent.Options{}); err != nil {
klog.Fatal(err)
}
}
return Run(s, apiserverconfig.WatchConfigChange(), signals.SetupSignalHandler())
},
SilenceUsage: true,
}
@@ -69,45 +84,68 @@ cluster's shared state through which all other components interact.`,
fmt.Fprintf(cmd.OutOrStdout(), "%s\n\n"+usageFmt, cmd.Long, cmd.UseLine())
cliflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
})
versionCmd := &cobra.Command{
Use: "version",
Short: "Print the version of KubeSphere ks-apiserver",
Run: func(cmd *cobra.Command, args []string) {
cmd.Println(version.Get())
},
}
cmd.AddCommand(versionCmd)
return cmd
}
func Run(s *options.ServerRunOptions, stopCh <-chan struct{}) error {
func Run(s *options.ServerRunOptions, configCh <-chan apiserverconfig.Config, ctx context.Context) error {
ictx, cancelFunc := context.WithCancel(context.TODO())
errCh := make(chan error)
defer close(errCh)
go func() {
if err := run(s, ictx); err != nil {
errCh <- err
}
}()
initializeServicemeshConfig(s)
// The ctx (signals.SetupSignalHandler()) is to control the entire program life cycle,
// The ictx(internal context) is created here to control the life cycle of the ks-apiserver(http server, sharedInformer etc.)
// when config change, stop server and renew context, start new server
for {
select {
case <-ctx.Done():
cancelFunc()
return nil
case cfg := <-configCh:
cancelFunc()
s.Config = &cfg
ictx, cancelFunc = context.WithCancel(context.TODO())
go func() {
if err := run(s, ictx); err != nil {
errCh <- err
}
}()
case err := <-errCh:
cancelFunc()
return err
}
}
}
apiserver, err := s.NewAPIServer(stopCh)
func run(s *options.ServerRunOptions, ctx context.Context) error {
apiserver, err := s.NewAPIServer(ctx.Done())
if err != nil {
return err
}
err = apiserver.PrepareRun(stopCh)
err = apiserver.PrepareRun(ctx.Done())
if err != nil {
return err
}
err = apiserver.Run(ctx)
if err == http.ErrServerClosed {
return nil
}
return apiserver.Run(stopCh)
}
func initializeServicemeshConfig(s *options.ServerRunOptions) {
// Initialize kiali config
config := kconfig.NewConfig()
// Config jaeger query endpoint address
if s.ServiceMeshOptions != nil && len(s.ServiceMeshOptions.JaegerQueryHost) != 0 {
tracing.JaegerQueryUrl = s.ServiceMeshOptions.JaegerQueryHost
}
// Exclude system namespaces
config.API.Namespaces.Exclude = []string{"istio-system", "kubesphere*", "kube*"}
config.InCluster = true
// Set default prometheus service url
config.ExternalServices.PrometheusServiceURL = s.ServiceMeshOptions.ServicemeshPrometheusHost
config.ExternalServices.PrometheusCustomMetricsURL = config.ExternalServices.PrometheusServiceURL
// Set istio pilot discovery service url
config.ExternalServices.Istio.UrlServiceVersion = s.ServiceMeshOptions.IstioPilotHost
kconfig.Set(config)
return err
}

View File

@@ -1,114 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: agents.cluster.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.Paused
name: Paused
type: bool
group: cluster.kubesphere.io
names:
kind: Agent
listKind: AgentList
plural: agents
singular: agent
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: Agent is the Schema for the agents API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: AgentSpec defines the desired state of Agent
properties:
kubernetesAPIServerPort:
description: KubeAPIServerPort is the port which listens for forwarding
kube-apiserver traffic
type: integer
kubesphereAPIServerPort:
description: KubeSphereAPIServerPort is the port which listens for forwarding
kubesphere apigateway traffic
type: integer
paused:
description: Indicates that the agent is paused.
type: boolean
proxy:
description: Proxy address
type: string
token:
description: Token used by agents to connect to proxy.
type: string
type: object
status:
description: AgentStatus defines the observed state of Agent
properties:
conditions:
description: Represents the latest available observations of a agent's
current state.
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
lastUpdateTime:
description: The last time this condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of AgentCondition
type: string
required:
- status
type: object
type: array
kubeconfig:
description: Issued new kubeconfig by proxy server
format: byte
type: string
ping:
description: Represents the connection quality, in ms
format: int64
type: integer
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,168 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: clusters.cluster.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.joinFederation
name: Federated
type: boolean
- JSONPath: .spec.provider
name: Provider
type: string
- JSONPath: .spec.enable
name: Active
type: boolean
- JSONPath: .status.kubernetesVersion
name: Version
type: string
group: cluster.kubesphere.io
names:
kind: Cluster
listKind: ClusterList
plural: clusters
singular: cluster
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: Cluster is the schema for the clusters API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
connection:
description: Connection holds info to connect to the member cluster
properties:
kubeconfig:
description: KubeConfig content used to connect to cluster api server
Should provide this field explicitly if connection type is direct.
Will be populated by ks-proxy if connection type is proxy.
format: byte
type: string
kubernetesAPIEndpoint:
description: Kubernetes API Server endpoint. This can be a hostname,
hostname:port, IP or IP:port. Should provide this field explicitly
if connection type is direct. Will be populated by ks-apiserver
if connection type is proxy.
type: string
kubernetesAPIServerPort:
description: KubeAPIServerPort is the port which listens for forwarding
kube-apiserver traffic Only applicable when connection type is
proxy.
type: integer
kubesphereAPIEndpoint:
description: KubeSphere API Server endpoint. This can be a hostname,
hostname:port, IP or IP:port. Should provide this field explicitly
if connection type is direct. Will be populated by ks-apiserver
if connection type is proxy.
type: string
kubesphereAPIServerPort:
description: KubeSphereAPIServerPort is the port which listens for
forwarding kubesphere apigateway traffic Only applicable when
connection type is proxy.
type: integer
token:
description: Token used by agents of member cluster to connect to
host cluster proxy. This field is populated by apiserver only
if connection type is proxy.
type: string
type:
description: type defines how host cluster will connect to host
cluster ConnectionTypeDirect means direct connection, this requires kubeconfig
and kubesphere apiserver endpoint provided ConnectionTypeProxy
means using kubesphere proxy, no kubeconfig or kubesphere apiserver
endpoint required
type: string
type: object
enable:
description: Desired state of the cluster
type: boolean
joinFederation:
description: Join cluster as a kubefed cluster
type: boolean
provider:
description: Provider of the cluster, this field is just for description
type: string
type: object
status:
properties:
conditions:
description: Represents the latest available observations of a cluster's
current state.
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
lastUpdateTime:
description: The last time this condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of the condition
type: string
required:
- status
- type
type: object
type: array
kubernetesVersion:
description: GitVersion of the kubernetes cluster, this field is populated
by cluster controller
type: string
nodeCount:
description: Count of the kubernetes cluster nodes This field may not
reflect the instant status of the cluster.
type: integer
region:
description: Region is the name of the region in which all of the nodes
in the cluster exist. e.g. 'us-east1'.
type: string
zones:
description: Zones are the names of availability zones in which the
nodes of the cluster exist, e.g. 'us-east1-a'.
items:
type: string
type: array
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,59 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: devopsprojects.devops.kubesphere.io
spec:
group: devops.kubesphere.io
names:
categories:
- devops
kind: DevOpsProject
listKind: DevOpsProjectList
plural: devopsprojects
singular: devopsproject
scope: Cluster
validation:
openAPIV3Schema:
description: DevOpsProject is the Schema for the devopsprojects API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DevOpsProjectSpec defines the desired state of DevOpsProject
type: object
status:
description: DevOpsProjectStatus defines the observed state of DevOpsProject
properties:
adminNamespace:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file'
type: string
type: object
type: object
version: v1alpha3
versions:
- name: v1alpha3
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,260 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: pipelines.devops.kubesphere.io
spec:
group: devops.kubesphere.io
names:
kind: Pipeline
listKind: PipelineList
plural: pipelines
singular: pipeline
scope: Namespaced
validation:
openAPIV3Schema:
description: Pipeline is the Schema for the pipelines API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: PipelineSpec defines the desired state of Pipeline
properties:
multi_branch_pipeline:
properties:
bitbucket_server_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
descriptio:
type: string
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
git_source:
properties:
credential_id:
type: string
discover_branches:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
regex_filter:
type: string
scm_id:
type: string
url:
type: string
type: object
github_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
multibranch_job_trigger:
properties:
create_action_job_to_trigger:
type: string
delete_action_job_to_trigger:
type: string
type: object
name:
type: string
script_path:
type: string
single_svn_source:
properties:
credential_id:
type: string
remote:
type: string
scm_id:
type: string
type: object
source_type:
type: string
svn_source:
properties:
credential_id:
type: string
excludes:
type: string
includes:
type: string
remote:
type: string
scm_id:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
- script_path
- source_type
type: object
pipeline:
properties:
descriptio:
type: string
disable_concurrent:
type: boolean
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
jenkinsfile:
type: string
name:
type: string
parameters:
items:
properties:
default_value:
type: string
description:
type: string
name:
type: string
type:
type: string
required:
- name
- type
type: object
type: array
remote_trigger:
properties:
token:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
type: object
type:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file'
type: string
required:
- type
type: object
status:
description: PipelineStatus defines the observed state of Pipeline
type: object
type: object
version: v1alpha3
versions:
- name: v1alpha3
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,86 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: s2ibinaries.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.fileName
name: FileName
type: string
- JSONPath: .spec.md5
name: MD5
type: string
- JSONPath: .spec.size
name: Size
type: string
- JSONPath: .status.phase
name: Phase
type: string
group: devops.kubesphere.io
names:
kind: S2iBinary
listKind: S2iBinaryList
plural: s2ibinaries
singular: s2ibinary
scope: Namespaced
subresources: {}
validation:
openAPIV3Schema:
description: S2iBinary is the Schema for the s2ibinaries API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBinarySpec defines the desired state of S2iBinary
properties:
downloadURL:
description: DownloadURL in KubeSphere
type: string
fileName:
description: FileName is filename of binary
type: string
md5:
description: MD5 is Binary's MD5 Hash
type: string
size:
description: Size is the file size of file
type: string
uploadTimeStamp:
description: UploadTime is last upload time
format: date-time
type: string
type: object
status:
description: S2iBinaryStatus defines the observed state of S2iBinary
properties:
phase:
description: Phase is status of S2iBinary . Possible value is "Ready","UnableToDownload"
type: string
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,578 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: s2ibuilders.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .status.runCount
name: RunCount
type: integer
- JSONPath: .status.lastRunState
name: LastRunState
type: string
- JSONPath: .status.lastRunName
name: LastRunName
type: string
- JSONPath: .status.lastRunStartTime
name: LastRunStartTime
type: date
group: devops.kubesphere.io
names:
kind: S2iBuilder
listKind: S2iBuilderList
plural: s2ibuilders
shortNames:
- s2ib
singular: s2ibuilder
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: S2iBuilder is the Schema for the s2ibuilders API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBuilderSpec defines the desired state of S2iBuilder
properties:
config:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file'
properties:
addHost:
description: AddHost Add a line to /etc/hosts for test purpose or
private use in LAN. Its format is host:IP,muliple hosts can be
added by using multiple --add-host
items:
type: string
type: array
asDockerfile:
description: AsDockerfile indicates the path where the Dockerfile
should be written instead of building a new image.
type: string
assembleUser:
description: AssembleUser specifies the user to run the assemble
script in container
type: string
blockOnBuild:
description: BlockOnBuild prevents s2i from performing a docker
build operation if one is necessary to execute ONBUILD commands,
or to layer source code into the container for images that don't
have a tar binary available, if the image contains ONBUILD commands
that would be executed.
type: boolean
branchExpression:
description: Regular expressions, ignoring names that do not match
the provided regular expression
type: string
buildVolumes:
description: BuildVolumes specifies a list of volumes to mount to
container running the build.
items:
type: string
type: array
builderBaseImageVersion:
description: BuilderBaseImageVersion provides optional version information
about the builder base image.
type: string
builderImage:
description: BuilderImage describes which image is used for building
the result images.
type: string
builderImageVersion:
description: BuilderImageVersion provides optional version information
about the builder image.
type: string
builderPullPolicy:
description: BuilderPullPolicy specifies when to pull the builder
image
type: string
callbackUrl:
description: CallbackURL is a URL which is called upon successful
build to inform about that fact.
type: string
cgroupLimits:
description: CGroupLimits describes the cgroups limits that will
be applied to any containers run by s2i.
properties:
cpuPeriod:
format: int64
type: integer
cpuQuota:
format: int64
type: integer
cpuShares:
format: int64
type: integer
memoryLimitBytes:
format: int64
type: integer
memorySwap:
format: int64
type: integer
parent:
type: string
required:
- cpuPeriod
- cpuQuota
- cpuShares
- memoryLimitBytes
- memorySwap
- parent
type: object
contextDir:
description: Specify a relative directory inside the application
repository that should be used as a root directory for the application.
type: string
description:
description: Description is a result image description label. The
default is no description.
type: string
destination:
description: Destination specifies a location where the untar operation
will place its artifacts.
type: string
displayName:
description: DisplayName is a result image display-name label. This
defaults to the output image name.
type: string
dockerConfig:
description: DockerConfig describes how to access host docker daemon.
properties:
caFile:
description: CAFile is the certificate authority file path for
a TLS connection
type: string
certFile:
description: CertFile is the certificate file path for a TLS
connection
type: string
endPoint:
description: Endpoint is the docker network endpoint or socket
type: string
keyFile:
description: KeyFile is the key file path for a TLS connection
type: string
tlsVerify:
description: TLSVerify indicates if TLS peer must be verified
type: boolean
useTLS:
description: UseTLS indicates if TLS must be used
type: boolean
required:
- caFile
- certFile
- endPoint
- keyFile
- tlsVerify
- useTLS
type: object
dockerNetworkMode:
description: DockerNetworkMode is used to set the docker network
setting to --net=container:<id> when the builder is invoked from
a container.
type: string
dropCapabilities:
description: DropCapabilities contains a list of capabilities to
drop when executing containers
items:
type: string
type: array
environment:
description: Environment is a map of environment variables to be
passed to the image.
items:
description: EnvironmentSpec specifies a single environment variable.
properties:
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
excludeRegExp:
description: ExcludeRegExp contains a string representation of the
regular expression desired for deciding which files to exclude
from the tar stream
type: string
export:
description: Export Push the result image to specify image registry
in tag
type: boolean
gitSecretRef:
description: GitSecretRef is the BasicAuth Secret of Git Clone
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
hasOnBuild:
description: HasOnBuild will be set to true if the builder image
contains ONBUILD instructions
type: boolean
imageName:
description: ImageName Contains the registry address and reponame,
tag should set by field tag alone
type: string
imageScriptsUrl:
description: ImageScriptsURL is the default location to find the
assemble/run scripts for a builder image. This url can be a reference
within the builder image if the scheme is specified as image://
type: string
imageWorkDir:
description: ImageWorkDir is the default working directory for the
builder image.
type: string
incremental:
description: Incremental describes whether to try to perform incremental
build.
type: boolean
incrementalAuthentication:
description: IncrementalAuthentication holds the authentication
information for pulling the previous image from private repositories
properties:
email:
type: string
password:
type: string
secretRef:
description: LocalObjectReference contains enough information
to let you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
serverAddress:
type: string
username:
type: string
type: object
incrementalFromTag:
description: IncrementalFromTag sets an alternative image tag to
look for existing artifacts. Tag is used by default if this is
not set.
type: string
injections:
description: Injections specifies a list source/destination folders
that are injected to the container that runs assemble. All files
we inject will be truncated after the assemble script finishes.
items:
description: VolumeSpec represents a single volume mount point.
properties:
destination:
description: Destination is the path to mount the volume to
- absolute or relative.
type: string
keep:
description: Keep indicates if the mounted data should be
kept in the final image.
type: boolean
source:
description: Source is a reference to the volume source.
type: string
type: object
type: array
isBinaryURL:
description: IsBinaryURL explain the type of SourceURL. If it is
IsBinaryURL, it will download the file directly without using
git.
type: boolean
keepSymlinks:
description: KeepSymlinks indicates to copy symlinks as symlinks.
Default behavior is to follow symlinks and copy files by content.
type: boolean
labelNamespace:
description: LabelNamespace provides the namespace under which the
labels will be generated.
type: string
labels:
additionalProperties:
type: string
description: Labels specify labels and their values to be applied
to the resulting image. Label keys must have non-zero length.
The labels defined here override generated labels in case they
have the same name.
type: object
layeredBuild:
description: LayeredBuild describes if this is build which layered
scripts and sources on top of BuilderImage.
type: boolean
nodeAffinityKey:
description: The key of Node Affinity.
type: string
nodeAffinityValues:
description: The values of Node Affinity.
items:
type: string
type: array
outputBuildResult:
description: Whether output build result to status.
type: boolean
outputImageName:
description: OutputImageName is a result image name without tag,
default is latest. tag will append to ImageName in the end
type: string
preserveWorkingDir:
description: PreserveWorkingDir describes if working directory should
be left after processing.
type: boolean
previousImagePullPolicy:
description: PreviousImagePullPolicy specifies when to pull the
previously build image when doing incremental build
type: string
pullAuthentication:
description: PullAuthentication holds the authentication information
for pulling the Docker images from private repositories
properties:
email:
type: string
password:
type: string
secretRef:
description: LocalObjectReference contains enough information
to let you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
serverAddress:
type: string
username:
type: string
type: object
pushAuthentication:
description: PullAuthentication holds the authentication information
for pulling the Docker images from private repositories
properties:
email:
type: string
password:
type: string
secretRef:
description: LocalObjectReference contains enough information
to let you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
serverAddress:
type: string
username:
type: string
type: object
removePreviousImage:
description: RemovePreviousImage describes if previous image should
be removed after successful build. This applies only to incremental
builds.
type: boolean
revisionId:
description: The RevisionId is a branch name or a SHA-1 hash of
every important thing about the commit
type: string
runImage:
description: RunImage will trigger a "docker run ..." invocation
of the produced image so the user can see if it operates as he
would expect
type: boolean
runtimeArtifacts:
description: RuntimeArtifacts specifies a list of source/destination
pairs that will be copied from builder to a runtime image. Source
can be a file or directory. Destination must be a directory. Regardless
whether it is an absolute or relative path, it will be placed
into image's WORKDIR. Destination also can be empty or equals
to ".", in this case it just refers to a root of WORKDIR. In case
it's empty, S2I will try to get this list from io.openshift.s2i.assemble-input-files
label on a RuntimeImage.
items:
description: VolumeSpec represents a single volume mount point.
properties:
destination:
description: Destination is the path to mount the volume to
- absolute or relative.
type: string
keep:
description: Keep indicates if the mounted data should be
kept in the final image.
type: boolean
source:
description: Source is a reference to the volume source.
type: string
type: object
type: array
runtimeAuthentication:
description: RuntimeAuthentication holds the authentication information
for pulling the runtime Docker images from private repositories.
properties:
email:
type: string
password:
type: string
secretRef:
description: LocalObjectReference contains enough information
to let you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
serverAddress:
type: string
username:
type: string
type: object
runtimeImage:
description: RuntimeImage specifies the image that will be a base
for resulting image and will be used for running an application.
By default, BuilderImage is used for building and running, but
the latter may be overridden.
type: string
runtimeImagePullPolicy:
description: RuntimeImagePullPolicy specifies when to pull a runtime
image.
type: string
scriptDownloadProxyConfig:
description: ScriptDownloadProxyConfig optionally specifies the
http and https proxy to use when downloading scripts
properties:
httpProxy:
type: string
httpsProxy:
type: string
type: object
scriptsUrl:
description: ScriptsURL is a URL describing where to fetch the S2I
scripts from during build process. This url can be a reference
within the builder image if the scheme is specified as image://
type: string
secretCode:
description: SecretCode
type: string
securityOpt:
description: SecurityOpt are passed as options to the docker containers
launched by s2i.
items:
type: string
type: array
sourceUrl:
description: SourceURL is url of the codes such as https://github.com/a/b.git
type: string
tag:
description: Tag is a result image tag name.
type: string
taintKey:
description: The name of taint.
type: string
usage:
description: Usage allows for properly shortcircuiting s2i logic
when `s2i usage` is invoked
type: boolean
workingDir:
description: WorkingDir describes temporary directory used for downloading
sources, scripts and tar operations.
type: string
workingSourceDir:
description: WorkingSourceDir describes the subdirectory off of
WorkingDir set up during the repo download that is later used
as the root for ignore processing
type: string
required:
- imageName
- sourceUrl
type: object
fromTemplate:
description: FromTemplate define some inputs from user
properties:
builderImage:
description: BaseImage specify which version of this template to
use
type: string
name:
description: Name specify a template to use, so many fields in Config
can left empty
type: string
parameters:
description: Parameters must use with `template`, fill some parameters
which template will use
items:
properties:
defaultValue:
type: string
description:
type: string
key:
type: string
optValues:
items:
type: string
type: array
required:
type: boolean
type:
type: string
value:
type: string
type: object
type: array
type: object
type: object
status:
description: S2iBuilderStatus defines the observed state of S2iBuilder
properties:
lastRunName:
description: LastRunState return the name of the newest run of this
builder
type: string
lastRunStartTime:
description: LastRunStartTime return the startTime of the newest run
of this builder
format: date-time
type: string
lastRunState:
description: LastRunState return the state of the newest run of this
builder
type: string
runCount:
description: RunCount represent the sum of s2irun of this builder
type: integer
required:
- runCount
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,141 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: s2ibuildertemplates.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.codeFramework
name: Framework
type: string
- JSONPath: .spec.defaultBaseImage
name: DefaultBaseImage
type: string
- JSONPath: .spec.version
name: Version
type: string
group: devops.kubesphere.io
names:
categories:
- devops
kind: S2iBuilderTemplate
listKind: S2iBuilderTemplateList
plural: s2ibuildertemplates
shortNames:
- s2ibt
singular: s2ibuildertemplate
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: S2iBuilderTemplate is the Schema for the s2ibuildertemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBuilderTemplateSpec defines the desired state of S2iBuilderTemplate
properties:
codeFramework:
description: CodeFramework means which language this template is designed
for and which framework is using if has framework. Like Java, NodeJS
etc
type: string
containerInfo:
description: Images are the images this template will use.
items:
properties:
buildVolumes:
description: BuildVolumes specifies a list of volumes to mount
to container running the build.
items:
type: string
type: array
builderImage:
description: BaseImage are the images this template will use.
type: string
runtimeArtifacts:
items:
description: VolumeSpec represents a single volume mount point.
properties:
destination:
description: Destination is the path to mount the volume
to - absolute or relative.
type: string
keep:
description: Keep indicates if the mounted data should be
kept in the final image.
type: boolean
source:
description: Source is a reference to the volume source.
type: string
type: object
type: array
runtimeImage:
type: string
type: object
type: array
defaultBaseImage:
description: DefaultBaseImage is the image that will be used by default
type: string
description:
description: Description illustrate the purpose of this template
type: string
environment:
description: Parameters is a set of environment variables to be passed
to the image.
items:
properties:
defaultValue:
type: string
description:
type: string
key:
type: string
optValues:
items:
type: string
type: array
required:
type: boolean
type:
type: string
value:
type: string
type: object
type: array
iconPath:
description: IconPath is used for frontend display
type: string
version:
description: Version of template
type: string
type: object
status:
description: S2iBuilderTemplateStatus defines the observed state of S2iBuilderTemplate
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,181 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: s2iruns.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .status.runState
name: State
type: string
- JSONPath: .status.kubernetesJobName
name: K8sJobName
type: string
- JSONPath: .status.startTime
name: StartTime
type: date
- JSONPath: .status.completionTime
name: CompletionTime
type: date
- JSONPath: .status.s2iBuildResult.imageName
name: ImageName
type: string
group: devops.kubesphere.io
names:
kind: S2iRun
listKind: S2iRunList
plural: s2iruns
shortNames:
- s2ir
singular: s2irun
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: S2iRun is the Schema for the s2iruns API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iRunSpec defines the desired state of S2iRun
properties:
backoffLimit:
description: BackoffLimit limits the restart count of each s2irun. Default
is 0
format: int32
type: integer
builderName:
description: BuilderName specify the name of s2ibuilder, required
type: string
newRevisionId:
description: NewRevisionId override the default NewRevisionId in its
s2ibuilder.
type: string
newSourceURL:
description: NewSourceURL is used to download new binary artifacts
type: string
newTag:
description: NewTag override the default tag in its s2ibuilder, image
name cannot be changed.
type: string
secondsAfterFinished:
description: SecondsAfterFinished if is set and greater than zero, and
the job created by s2irun become successful or failed , the job will
be auto deleted after SecondsAfterFinished
format: int32
type: integer
required:
- builderName
type: object
status:
description: S2iRunStatus defines the observed state of S2iRun
properties:
completionTime:
description: Represents time when the job was completed. It is not guaranteed
to be set in happens-before order across separate operations. It is
represented in RFC3339 form and is in UTC.
format: date-time
type: string
kubernetesJobName:
description: KubernetesJobName is the job name in k8s
type: string
logURL:
description: LogURL is uesd for external log handler to let user know
where is log located in
type: string
runState:
description: RunState indicates whether this job is done or failed
type: string
s2iBuildResult:
description: S2i build result info.
properties:
commandPull:
description: Command for pull image.
type: string
imageCreated:
description: Image created time.
type: string
imageID:
description: Image ID.
type: string
imageName:
description: ImageName is the name of artifact
type: string
imageRepoTags:
description: image tags.
items:
type: string
type: array
imageSize:
description: The size in bytes of the image
format: int64
type: integer
type: object
s2iBuildSource:
description: S2i build source info.
properties:
binaryName:
description: Binary file Name
type: string
binarySize:
description: Binary file Size
format: int64
type: integer
builderImage:
description: // BuilderImage describes which image is used for building
the result images.
type: string
commitID:
description: CommitID represents an arbitrary extended object reference
in Git as SHA-1
type: string
committerEmail:
description: CommitterEmail contains the e-mail of the committer
type: string
committerName:
description: CommitterName contains the name of the committer
type: string
description:
description: Description is a result image description label. The
default is no description.
type: string
revisionId:
description: The RevisionId is a branch name or a SHA-1 hash of
every important thing about the commit
type: string
sourceUrl:
description: SourceURL is url of the codes such as https://github.com/a/b.git
type: string
type: object
startTime:
description: StartTime represent when this run began
format: date-time
type: string
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,236 +1,529 @@
apiVersion: apiextensions.k8s.io/v1beta1
# Copyright 2020 The Kubernetes Authors.
# SPDX-License-Identifier: Apache-2.0
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/application/pull/2
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: applications.app.k8s.io
spec:
group: app.k8s.io
names:
categories:
- all
kind: Application
listKind: ApplicationList
plural: applications
shortNames:
- app
singular: application
scope: Namespaced
validation:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
assemblyPhase:
type: string
componentKinds:
items:
type: object
type: array
descriptor:
properties:
description:
type: string
icons:
items:
properties:
size:
type: string
src:
type: string
type:
type: string
required:
- src
type: object
type: array
keywords:
items:
type: string
type: array
links:
items:
properties:
description:
type: string
url:
type: string
type: object
type: array
maintainers:
items:
properties:
email:
type: string
name:
type: string
url:
type: string
type: object
type: array
notes:
type: string
owners:
items:
properties:
email:
type: string
name:
type: string
url:
type: string
type: object
type: array
type:
type: string
version:
type: string
type: object
info:
items:
versions:
- additionalPrinterColumns:
- description: The type of the application
jsonPath: .spec.descriptor.type
name: Type
type: string
- description: The creation date
jsonPath: .spec.descriptor.version
name: Version
type: string
- description: The application object owns the matched resources
jsonPath: .spec.addOwnerRef
name: Owner
type: boolean
- description: Numbers of components ready
jsonPath: .status.componentsReady
name: Ready
type: string
- description: The creation date
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1beta1
schema:
openAPIV3Schema:
description: Application is the Schema for the applications API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ApplicationSpec defines the specification for an Application.
properties:
addOwnerRef:
description: AddOwnerRef objects - flag to indicate if we need to
add OwnerRefs to matching objects Matching is done by using Selector
to query all ComponentGroupKinds
type: boolean
assemblyPhase:
description: AssemblyPhase represents the current phase of the application's
assembly. An empty value is equivalent to "Succeeded".
type: string
componentKinds:
description: ComponentGroupKinds is a list of Kinds for Application's
components (e.g. Deployments, Pods, Services, CRDs). It can be used
in conjunction with the Application's Selector to list or watch
the Applications components.
items:
description: GroupKind specifies a Group and a Kind, but does not
force a version. This is useful for identifying concepts during
lookup stages without having partially valid types
properties:
group:
type: string
kind:
type: string
required:
- group
- kind
type: object
type: array
descriptor:
description: Descriptor regroups information and metadata about an
application.
properties:
name:
description:
description: Description is a brief string description of the
Application.
type: string
icons:
description: Icons is an optional list of icons for an application.
Icon information includes the source, size, and mime type.
items:
description: ImageSpec contains information about an image used
as an icon.
properties:
size:
description: (optional) The size of the image in pixels
(e.g., 25x25).
type: string
src:
description: The source for image represented as either
an absolute URL to the image or a Data URL containing
the image. Data URLs are defined in RFC 2397.
type: string
type:
description: (optional) The mine type of the image (e.g.,
"image/png").
type: string
required:
- src
type: object
type: array
keywords:
description: Keywords is an optional list of key words associated
with the application (e.g. MySQL, RDBMS, database).
items:
type: string
type: array
links:
description: Links are a list of descriptive URLs intended to
be used to surface additional documentation, dashboards, etc.
items:
description: Link contains information about an URL to surface
documentation, dashboards, etc.
properties:
description:
description: Description is human readable content explaining
the purpose of the link.
type: string
url:
description: Url typically points at a website address.
type: string
type: object
type: array
maintainers:
description: Maintainers is an optional list of maintainers of
the application. The maintainers in this list maintain the the
source code, images, and package for the application.
items:
description: ContactData contains information about an individual
or organization.
properties:
email:
description: Email is the email address.
type: string
name:
description: Name is the descriptive name.
type: string
url:
description: Url could typically be a website address.
type: string
type: object
type: array
notes:
description: Notes contain a human readable snippets intended
as a quick start for the users of the Application. CommonMark
markdown syntax may be used for rich text representation.
type: string
owners:
description: Owners is an optional list of the owners of the installed
application. The owners of the application should be contacted
in the event of a planned or unplanned disruption affecting
the application.
items:
description: ContactData contains information about an individual
or organization.
properties:
email:
description: Email is the email address.
type: string
name:
description: Name is the descriptive name.
type: string
url:
description: Url could typically be a website address.
type: string
type: object
type: array
type:
description: Type is the type of the application (e.g. WordPress,
MySQL, Cassandra).
type: string
value:
version:
description: Version is an optional version indicator for the
Application.
type: string
valueFrom:
properties:
configMapKeyRef:
properties:
apiVersion:
type: object
info:
description: Info contains human readable key,value pairs for the
Application.
items:
description: InfoItem is a human readable key,value pair containing
important information about how to access the Application.
properties:
name:
description: Name is a human readable title for this piece of
information.
type: string
type:
description: Type of the value for this InfoItem.
type: string
value:
description: Value is human readable content.
type: string
valueFrom:
description: ValueFrom defines a reference to derive the value
from another source.
properties:
configMapKeyRef:
description: Selects a key of a ConfigMap.
properties:
apiVersion:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead
of an entire object, this string should contain a
valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container
within a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container
that triggered the event) or if no container name
is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to
have some well-defined way of referencing a part of
an object. TODO: this design is not final and this
field is subject to change in the future.'
type: string
key:
description: The key to select.
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
namespace:
description: 'Namespace of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
type: string
resourceVersion:
description: 'Specific resourceVersion to which this
reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
ingressRef:
description: Select an Ingress.
properties:
apiVersion:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead
of an entire object, this string should contain a
valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container
within a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container
that triggered the event) or if no container name
is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to
have some well-defined way of referencing a part of
an object. TODO: this design is not final and this
field is subject to change in the future.'
type: string
host:
description: The optional host to select.
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
namespace:
description: 'Namespace of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
type: string
path:
description: The optional HTTP path.
type: string
protocol:
description: Protocol for the ingress
type: string
resourceVersion:
description: 'Specific resourceVersion to which this
reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
secretKeyRef:
description: Selects a key of a Secret.
properties:
apiVersion:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead
of an entire object, this string should contain a
valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container
within a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container
that triggered the event) or if no container name
is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to
have some well-defined way of referencing a part of
an object. TODO: this design is not final and this
field is subject to change in the future.'
type: string
key:
description: The key to select.
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
namespace:
description: 'Namespace of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
type: string
resourceVersion:
description: 'Specific resourceVersion to which this
reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
serviceRef:
description: Select a Service.
properties:
apiVersion:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead
of an entire object, this string should contain a
valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container
within a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container
that triggered the event) or if no container name
is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to
have some well-defined way of referencing a part of
an object. TODO: this design is not final and this
field is subject to change in the future.'
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
namespace:
description: 'Namespace of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
type: string
path:
description: The optional HTTP path.
type: string
port:
description: The optional port to select.
format: int32
type: integer
protocol:
description: Protocol for the service
type: string
resourceVersion:
description: 'Specific resourceVersion to which this
reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
type:
description: Type of source.
type: string
type: object
type: object
type: array
selector:
description: 'Selector is a label query over kinds that created by
the application. It must match the component objects'' labels. More
info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors'
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the key
and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship to
a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
fieldPath:
type: string
key:
type: string
kind:
type: string
name:
type: string
namespace:
type: string
resourceVersion:
type: string
uid:
type: string
type: object
ingressRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
host:
type: string
kind:
type: string
name:
type: string
namespace:
type: string
path:
type: string
resourceVersion:
type: string
uid:
type: string
type: object
secretKeyRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
key:
type: string
kind:
type: string
name:
type: string
namespace:
type: string
resourceVersion:
type: string
uid:
type: string
type: object
serviceRef:
properties:
apiVersion:
type: string
fieldPath:
type: string
kind:
type: string
name:
type: string
namespace:
type: string
path:
type: string
port:
format: int32
type: integer
resourceVersion:
type: string
uid:
type: string
type: object
type:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
type: array
selector:
type: object
type: object
status:
properties:
components:
items:
properties:
group:
type: string
kind:
type: string
link:
type: string
name:
type: string
status:
type: string
type: object
type: array
conditions:
items:
properties:
lastTransitionTime:
format: date-time
type: string
lastUpdateTime:
format: date-time
type: string
message:
type: string
reason:
type: string
status:
type: string
type:
type: string
required:
- type
- status
type: object
type: array
observedGeneration:
format: int64
type: integer
type: object
version: v1beta1
type: object
status:
description: ApplicationStatus defines controller's the observed state
of Application
properties:
components:
description: Object status array for all matching objects
items:
description: ObjectStatus is a generic status holder for objects
properties:
group:
description: Object group
type: string
kind:
description: Kind of object
type: string
link:
description: Link to object
type: string
name:
description: Name of object
type: string
status:
description: 'Status. Values: InProgress, Ready, Unknown'
type: string
type: object
type: array
componentsReady:
description: 'ComponentsReady: status of the components in the format
ready/total'
type: string
conditions:
description: Conditions represents the latest state of the object
items:
description: Condition describes the state of an object at a certain
point.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
lastUpdateTime:
description: Last time the condition was probed
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of condition.
type: string
required:
- status
- type
type: object
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed.
It corresponds to the Object's generation, which is updated on mutation
by the API Server.
format: int64
type: integer
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""

View File

@@ -0,0 +1,108 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: helmapplications.application.kubesphere.io
spec:
group: application.kubesphere.io
names:
kind: HelmApplication
listKind: HelmApplicationList
plural: helmapplications
shortNames:
- happ
singular: helmapplication
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.name
name: application name
type: string
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: workspace
type: string
- jsonPath: .status.state
name: State
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: HelmApplication is the Schema for the helmapplications API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: HelmApplicationSpec defines the desired state of HelmApplication
properties:
abstraction:
description: info from frontend
type: string
appHome:
type: string
attachments:
description: attachments id
items:
type: string
type: array
description:
description: description from chart's description or frontend
type: string
icon:
description: The attachment id of the icon
type: string
name:
description: the name of the helm application
type: string
required:
- name
type: object
status:
description: HelmApplicationStatus defines the observed state of HelmApplication
properties:
latestVersion:
description: If this application belong to appStore, latestVersion
is the the latest version of the active application version. otherwise
latestVersion is the latest version of all application version
type: string
state:
description: 'the state of the helm application: draft, submitted,
passed, rejected, suspended, active'
type: string
statusTime:
format: date-time
type: string
updateTime:
format: date-time
type: string
required:
- statusTime
- updateTime
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,228 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: helmapplicationversions.application.kubesphere.io
spec:
group: application.kubesphere.io
names:
kind: HelmApplicationVersion
listKind: HelmApplicationVersionList
plural: helmapplicationversions
shortNames:
- happver
singular: helmapplicationversion
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.name
name: application name
type: string
- jsonPath: .status.state
name: State
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: HelmApplicationVersion is the Schema for the helmapplicationversions
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: HelmApplicationVersionSpec defines the desired state of HelmApplicationVersion
properties:
annotations:
additionalProperties:
type: string
description: Annotations are additional mappings uninterpreted by
Helm, made available for inspection by other applications.
type: object
apiVersion:
description: The API Version of this chart.
type: string
appVersion:
description: The version of the application enclosed inside of this
chart.
type: string
condition:
description: The condition to check to enable chart
type: string
created:
description: chart create time
format: date-time
type: string
data:
description: raw data of chart, it will !!!NOT!!! be save to etcd
format: byte
type: string
dataKey:
description: dataKey in the storage
type: string
dependencies:
description: Dependencies are a list of dependencies for a chart.
items:
description: Dependency describes a chart upon which another chart
depends. Dependencies can be used to express developer intent,
or to capture the state of a chart.
properties:
alias:
description: Alias usable alias to be used for the chart
type: string
condition:
description: A yaml path that resolves to a boolean, used for
enabling/disabling charts (e.g. subchart1.enabled )
type: string
enabled:
description: Enabled bool determines if chart should be loaded
type: boolean
name:
description: Name is the name of the dependency. This must mach
the name in the dependency's Chart.yaml.
type: string
repository:
description: The URL to the repository. Appending `index.yaml`
to this string should result in a URL that can be used to
fetch the repository index.
type: string
tags:
description: Tags can be used to group charts for enabling/disabling
together
items:
type: string
type: array
version:
description: Version is the version (range) of this chart. A
lock file will always produce a single version, while a dependency
may contain a semantic version range.
type: string
required:
- name
- repository
type: object
type: array
deprecated:
description: Whether or not this chart is deprecated
type: boolean
description:
description: A one-sentence description of the chart
type: string
digest:
description: chart digest
type: string
home:
description: The URL to a relevant project page, git repo, or contact
person
type: string
icon:
description: The URL to an icon file.
type: string
keywords:
description: A list of string keywords
items:
type: string
type: array
kubeVersion:
description: KubeVersion is a SemVer constraint specifying the version
of Kubernetes required.
type: string
maintainers:
description: A list of name and URL/email address combinations for
the maintainer(s)
items:
description: Maintainer describes a Chart maintainer.
properties:
email:
description: Email is an optional email address to contact the
named maintainer
type: string
name:
description: Name is a user name or organization name
type: string
url:
description: URL is an optional URL to an address for the named
maintainer
type: string
type: object
type: array
name:
description: The name of the chart
type: string
sources:
description: Source is the URL to the source code of this chart
items:
type: string
type: array
tags:
description: The tags to check to enable chart
type: string
type:
description: 'Specifies the chart type: application or library'
type: string
urls:
description: chart url
items:
type: string
type: array
version:
description: A SemVer 2 conformant version string of the chart
type: string
type: object
status:
description: HelmApplicationVersionStatus defines the observed state of
HelmApplicationVersion
properties:
audit:
items:
properties:
message:
description: audit message
type: string
operator:
description: audit operator
type: string
operatorType:
type: string
state:
description: 'audit state: submitted, passed, draft, active,
rejected, suspended'
type: string
time:
description: audit time
format: date-time
type: string
required:
- time
type: object
type: array
state:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,80 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: helmcategories.application.kubesphere.io
spec:
group: application.kubesphere.io
names:
kind: HelmCategory
listKind: HelmCategoryList
plural: helmcategories
shortNames:
- hctg
singular: helmcategory
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.name
name: name
type: string
- jsonPath: .status.total
name: total
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: HelmCategory is the Schema for the helmcategories API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: HelmCategorySpec defines the desired state of HelmRepo
properties:
description:
description: info from frontend
type: string
locale:
type: string
name:
description: name of the category
type: string
required:
- name
type: object
status:
properties:
total:
description: total helmapplications belong to this category
type: integer
required:
- total
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,155 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: helmreleases.application.kubesphere.io
spec:
group: application.kubesphere.io
names:
kind: HelmRelease
listKind: HelmReleaseList
plural: helmreleases
shortNames:
- hrls
singular: helmrelease
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.name
name: Release Name
type: string
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
- jsonPath: .metadata.labels.kubesphere\.io/cluster
name: Cluster
type: string
- jsonPath: .metadata.labels.kubesphere\.io/namespace
name: Namespace
type: string
- jsonPath: .status.state
name: State
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: HelmRelease is the Schema for the helmreleases API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: HelmReleaseSpec defines the desired state of HelmRelease
properties:
appId:
description: id of the helmapplication
type: string
appVerId:
description: application version id
type: string
chartAppVer:
description: appVersion from Chart.yaml
type: string
chartName:
description: The name of the chart which will be installed.
type: string
chartVersion:
description: Specify the exact chart version to install. If this is
not specified, the latest version is installed
type: string
description:
description: Message got from frontend
type: string
name:
description: Name of the release
type: string
repoId:
description: id of the repo
type: string
values:
description: helm release values.yaml
format: byte
type: string
version:
description: expected release version, when this version is not equal
status.version, the release need upgrade this filed should be modified
when any filed of the spec modified.
type: integer
required:
- chartName
- chartVersion
- name
- version
type: object
status:
description: HelmReleaseStatus defines the observed state of HelmRelease
properties:
deployStatus:
description: deploy status list of history, which will store at most
10 state
items:
properties:
deployTime:
description: deploy time, upgrade time or check status time
format: date-time
type: string
message:
description: A human readable message indicating details about
why the release is in this state.
type: string
state:
description: current state of the release
type: string
required:
- deployTime
- state
type: object
type: array
lastDeployed:
description: last deploy time or upgrade time
format: date-time
type: string
lastUpdate:
description: last update time
format: date-time
type: string
message:
description: A human readable message indicating details about why
the release is in this state.
type: string
state:
description: current state
type: string
version:
description: current release version
type: integer
required:
- state
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,156 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: helmrepos.application.kubesphere.io
spec:
group: application.kubesphere.io
names:
kind: HelmRepo
listKind: HelmRepoList
plural: helmrepos
shortNames:
- hrepo
singular: helmrepo
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.name
name: name
type: string
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
- jsonPath: .spec.url
name: url
type: string
- jsonPath: .status.state
name: State
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: HelmRepo is the Schema for the helmrepoes API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: HelmRepoSpec defines the desired state of HelmRepo
properties:
credential:
description: helm repo credential
properties:
accessKeyID:
type: string
caFile:
description: verify certificates of HTTPS-enabled servers using
this CA bundle
type: string
certFile:
description: identify HTTPS client using this SSL certificate
file
type: string
insecureSkipTLSVerify:
description: skip tls certificate checks for the repository, default
is ture
type: boolean
keyFile:
description: identify HTTPS client using this SSL key file
type: string
password:
description: chart repository password
type: string
secretAccessKey:
type: string
username:
description: chart repository username
type: string
type: object
description:
description: chart repo description from frontend
type: string
name:
description: name of the repo
type: string
syncPeriod:
description: sync period in seconds, no sync when SyncPeriod=0, the
minimum SyncPeriod is 180s
type: integer
url:
description: helm repo url
type: string
version:
description: expected repo version, when this version is not equal
status.version, the repo need upgrade this filed should be modified
when any filed of the spec modified.
type: integer
required:
- name
- url
type: object
status:
description: HelmRepoStatus defines the observed state of HelmRepo
properties:
data:
description: repo index
type: string
lastUpdateTime:
description: status last update time
format: date-time
type: string
state:
description: current state of the repo, successful, failed or syncing
type: string
syncState:
description: sync state list of history, which will store at most
10 state
items:
properties:
message:
description: A human readable message indicating details about
why the repo is in this state.
type: string
state:
description: 'last sync state, valid state are: "failed", "success",
and ""'
type: string
syncTime:
format: date-time
type: string
required:
- syncTime
type: object
type: array
version:
description: if status.version!=spec.Version, we need sync the repo
now
type: integer
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,92 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: rules.auditing.kubesphere.io
spec:
group: auditing.kubesphere.io
names:
kind: Rule
listKind: RuleList
plural: rules
singular: rule
scope: Namespaced
validation:
openAPIV3Schema:
description: Rule is the Schema for the rules API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: AuditRuleSpec defines the desired state of Rule
properties:
rules:
items:
properties:
alias:
description: This effective When the rule type is alias
type: string
condition:
description: Rule condition This effective When the rule type
is rule
type: string
desc:
description: Rule describe
type: string
enable:
description: Is the rule enable
type: boolean
list:
description: This effective When the rule type is list
items:
type: string
type: array
macro:
description: This effective When the rule type is macro
type: string
name:
description: Rule name
type: string
output:
description: The output formater of message which send to user
type: string
priority:
description: Rule priority, DEBUG, INFO, WARNING
type: string
type:
description: Rule type, rule, macro,list,alias
type: string
required:
- enable
type: object
type: array
type: object
status:
description: AuditRuleStatus defines the observed state of Rule
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,915 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: webhooks.auditing.kubesphere.io
spec:
group: auditing.kubesphere.io
names:
kind: Webhook
listKind: WebhookList
plural: webhooks
singular: webhook
scope: Namespaced
validation:
openAPIV3Schema:
description: Webhook is the Schema for the webhooks API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: WebhookSpec defines the desired state of Webhook
properties:
affinity:
description: If specified, the pod's scheduling constraints
properties:
nodeAffinity:
description: Describes node affinity scheduling rules for the pod.
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the affinity expressions specified by this field,
but it may choose a node that violates one or more of the
expressions. The node that is most preferred is the one with
the greatest sum of weights, i.e. for each node that meets
all of the scheduling requirements (resource request, requiredDuringScheduling
affinity expressions, etc.), compute a sum by iterating through
the elements of this field and adding "weight" to the sum
if the node matches the corresponding matchExpressions; the
node(s) with the highest sum are the most preferred.
items:
description: An empty preferred scheduling term matches all
objects with implicit weight 0 (i.e. it's a no-op). A null
preferred scheduling term matches no objects (i.e. is also
a no-op).
properties:
preference:
description: A node selector term, associated with the
corresponding weight.
properties:
matchExpressions:
description: A list of node selector requirements
by node's labels.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
by node's fields.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
type: object
weight:
description: Weight associated with matching the corresponding
nodeSelectorTerm, in the range 1-100.
format: int32
type: integer
required:
- preference
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the affinity requirements specified by this
field are not met at scheduling time, the pod will not be
scheduled onto the node. If the affinity requirements specified
by this field cease to be met at some point during pod execution
(e.g. due to an update), the system may or may not try to
eventually evict the pod from its node.
properties:
nodeSelectorTerms:
description: Required. A list of node selector terms. The
terms are ORed.
items:
description: A null or empty node selector term matches
no objects. The requirements of them are ANDed. The
TopologySelectorTerm type implements a subset of the
NodeSelectorTerm.
properties:
matchExpressions:
description: A list of node selector requirements
by node's labels.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchFields:
description: A list of node selector requirements
by node's fields.
items:
description: A node selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: The label key that the selector
applies to.
type: string
operator:
description: Represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists, DoesNotExist. Gt, and Lt.
type: string
values:
description: An array of string values. If the
operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be
empty. If the operator is Gt or Lt, the values
array must have a single element, which will
be interpreted as an integer. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
type: object
type: array
required:
- nodeSelectorTerms
type: object
type: object
podAffinity:
description: Describes pod affinity scheduling rules (e.g. co-locate
this pod in the same node, zone, etc. as some other pod(s)).
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the affinity expressions specified by this field,
but it may choose a node that violates one or more of the
expressions. The node that is most preferred is the one with
the greatest sum of weights, i.e. for each node that meets
all of the scheduling requirements (resource request, requiredDuringScheduling
affinity expressions, etc.), compute a sum by iterating through
the elements of this field and adding "weight" to the sum
if the node has pods which matches the corresponding podAffinityTerm;
the node(s) with the highest sum are the most preferred.
items:
description: The weights of all of the matched WeightedPodAffinityTerm
fields are added per-node to find the most preferred node(s)
properties:
podAffinityTerm:
description: Required. A pod affinity term, associated
with the corresponding weight.
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement is
a selector that contains values, a key, and
an operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If
the operator is Exists or DoesNotExist,
the values array must be empty. This array
is replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is "In",
and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces
the labelSelector applies to (matches against);
null or empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods
matching the labelSelector in the specified namespaces,
where co-located is defined as running on a node
whose value of the label with key topologyKey matches
that of any node on which any of the selected pods
is running. Empty topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
format: int32
type: integer
required:
- podAffinityTerm
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the affinity requirements specified by this
field are not met at scheduling time, the pod will not be
scheduled onto the node. If the affinity requirements specified
by this field cease to be met at some point during pod execution
(e.g. due to a pod label update), the system may or may not
try to eventually evict the pod from its node. When there
are multiple elements, the lists of nodes corresponding to
each podAffinityTerm are intersected, i.e. all terms must
be satisfied.
items:
description: Defines a set of pods (namely those matching
the labelSelector relative to the given namespace(s)) that
this pod should be co-located (affinity) or not co-located
(anti-affinity) with, where co-located is defined as running
on a node whose value of the label with key <topologyKey>
matches that of any node on which a pod of the set of pods
is running
properties:
labelSelector:
description: A label query over a set of resources, in
this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string values.
If the operator is In or NotIn, the values
array must be non-empty. If the operator is
Exists or DoesNotExist, the values array must
be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs.
A single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces the
labelSelector applies to (matches against); null or
empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
the labelSelector in the specified namespaces, where
co-located is defined as running on a node whose value
of the label with key topologyKey matches that of any
node on which any of the selected pods is running. Empty
topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
type: array
type: object
podAntiAffinity:
description: Describes pod anti-affinity scheduling rules (e.g.
avoid putting this pod in the same node, zone, etc. as some other
pod(s)).
properties:
preferredDuringSchedulingIgnoredDuringExecution:
description: The scheduler will prefer to schedule pods to nodes
that satisfy the anti-affinity expressions specified by this
field, but it may choose a node that violates one or more
of the expressions. The node that is most preferred is the
one with the greatest sum of weights, i.e. for each node that
meets all of the scheduling requirements (resource request,
requiredDuringScheduling anti-affinity expressions, etc.),
compute a sum by iterating through the elements of this field
and adding "weight" to the sum if the node has pods which
matches the corresponding podAffinityTerm; the node(s) with
the highest sum are the most preferred.
items:
description: The weights of all of the matched WeightedPodAffinityTerm
fields are added per-node to find the most preferred node(s)
properties:
podAffinityTerm:
description: Required. A pod affinity term, associated
with the corresponding weight.
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are
ANDed.
items:
description: A label selector requirement is
a selector that contains values, a key, and
an operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's
relationship to a set of values. Valid
operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If
the operator is Exists or DoesNotExist,
the values array must be empty. This array
is replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is "In",
and the values array contains only "value".
The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces
the labelSelector applies to (matches against);
null or empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods
matching the labelSelector in the specified namespaces,
where co-located is defined as running on a node
whose value of the label with key topologyKey matches
that of any node on which any of the selected pods
is running. Empty topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
weight:
description: weight associated with matching the corresponding
podAffinityTerm, in the range 1-100.
format: int32
type: integer
required:
- podAffinityTerm
- weight
type: object
type: array
requiredDuringSchedulingIgnoredDuringExecution:
description: If the anti-affinity requirements specified by
this field are not met at scheduling time, the pod will not
be scheduled onto the node. If the anti-affinity requirements
specified by this field cease to be met at some point during
pod execution (e.g. due to a pod label update), the system
may or may not try to eventually evict the pod from its node.
When there are multiple elements, the lists of nodes corresponding
to each podAffinityTerm are intersected, i.e. all terms must
be satisfied.
items:
description: Defines a set of pods (namely those matching
the labelSelector relative to the given namespace(s)) that
this pod should be co-located (affinity) or not co-located
(anti-affinity) with, where co-located is defined as running
on a node whose value of the label with key <topologyKey>
matches that of any node on which a pod of the set of pods
is running
properties:
labelSelector:
description: A label query over a set of resources, in
this case pods.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string values.
If the operator is In or NotIn, the values
array must be non-empty. If the operator is
Exists or DoesNotExist, the values array must
be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs.
A single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
namespaces:
description: namespaces specifies which namespaces the
labelSelector applies to (matches against); null or
empty list means "this pod's namespace"
items:
type: string
type: array
topologyKey:
description: This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
the labelSelector in the specified namespaces, where
co-located is defined as running on a node whose value
of the label with key topologyKey matches that of any
node on which any of the selected pods is running. Empty
topologyKey is not allowed.
type: string
required:
- topologyKey
type: object
type: array
type: object
type: object
args:
description: Arguments to the entrypoint.. It will be appended to the
args and replace the default value.
items:
type: string
type: array
auditLevel:
description: 'The Level that all requests are recorded at. available
options: None, Metadata, Request, RequestResponse default: Metadata'
type: string
auditSinkPolicy:
description: AuditSinkPolicy is a rule selector, only the rule matched
this selector will be taked effect.
properties:
alertingRuleSelector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An empty
label selector matches all objects. A null label selector matches
no objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the
key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
archivingRuleSelector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An empty
label selector matches all objects. A null label selector matches
no objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the
key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a
strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
type: object
auditType:
description: Audit type, static or dynamic.
type: string
image:
description: The webhook docker image name.
type: string
imagePullPolicy:
description: 'Image pull policy. One of Always, Never, IfNotPresent.
Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
type: string
imagePullSecrets:
description: 'ImagePullSecrets is an optional list of references to
secrets in the same namespace to use for pulling any of the images
used by this PodSpec. If specified, these secrets will be passed to
individual puller implementations for them to use. For example, in
the case of docker, only DockerConfig type secrets are honored. More
info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod'
items:
description: LocalObjectReference contains enough information to let
you locate the referenced object inside the same namespace.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
type: array
k8sAuditingEnabled:
description: K8s auditing is enabled or not.
type: boolean
nodeSelector:
additionalProperties:
type: string
description: 'NodeSelector is a selector which must be true for the
pod to fit on a node. Selector which must match a node''s labels for
the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
type: object
priority:
description: Rule priority, DEBUG < INFO < WARNING Audit events will
be stored only when the priority of the audit rule matching the audit
event is greater than this.
type: string
receivers:
description: ' Receiver contains the information to make a connection
with the alertmanager'
items:
description: Receiver config which received the audit alert
properties:
config:
description: ClientConfig holds the connection parameters for
the webhook
properties:
caBundle:
description: '`caBundle` is a PEM encoded CA bundle which
will be used to validate the webhook''s server certificate.
If unspecified, system trust roots on the apiserver are
used.'
format: byte
type: string
service:
description: "`service` is a reference to the service for
this webhook. Either `service` or `url` must be specified.
\n If the webhook is running within the cluster, then you
should use `service`."
properties:
name:
description: '`name` is the name of the service. Required'
type: string
namespace:
description: '`namespace` is the namespace of the service.
Required'
type: string
path:
description: '`path` is an optional URL path which will
be sent in any request to this service.'
type: string
port:
description: If specified, the port on the service that
hosting webhook. Default to 443 for backward compatibility.
`port` should be a valid port number (1-65535, inclusive).
format: int32
type: integer
required:
- name
- namespace
type: object
url:
description: "`url` gives the location of the webhook, in
standard URL form (`scheme://host:port/path`). Exactly one
of `url` or `service` must be specified. \n The `host` should
not refer to a service running in the cluster; use the `service`
field instead. The host might be resolved via external DNS
in some apiservers (e.g., `kube-apiserver` cannot resolve
in-cluster DNS as that would be a layering violation). `host`
may also be an IP address. \n Please note that using `localhost`
or `127.0.0.1` as a `host` is risky unless you take great
care to run this webhook on all hosts which run an apiserver
which might need to make calls to this webhook. Such installs
are likely to be non-portable, i.e., not easy to turn up
in a new cluster. \n The scheme must be \"https\"; the URL
must begin with \"https://\". \n A path is optional, and
if present may be any string permissible in a URL. You may
use the path to pass an arbitrary string to the webhook,
for example, a cluster identifier. \n Attempting to use
a user or basic auth e.g. \"user:password@\" is not allowed.
Fragments (\"#...\") and query parameters (\"?...\") are
not allowed, either."
type: string
type: object
name:
description: Receiver name
type: string
type:
description: Receiver type, alertmanager or webhook
type: string
type: object
type: array
replicas:
description: Number of desired pods. This is a pointer to distinguish
between explicit zero and not specified. Defaults to 1.
format: int32
type: integer
resources:
description: 'Compute Resources required by this container. Cannot be
updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
properties:
limits:
additionalProperties:
type: string
description: 'Limits describes the maximum amount of compute resources
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
additionalProperties:
type: string
description: 'Requests describes the minimum amount of compute resources
required. If Requests is omitted for a container, it defaults
to Limits if that is explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
tolerations:
description: If specified, the pod's tolerations.
items:
description: The pod this Toleration is attached to tolerates any
taint that matches the triple <key,value,effect> using the matching
operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match. Empty
means match all taint effects. When specified, allowed values
are NoSchedule, PreferNoSchedule and NoExecute.
type: string
key:
description: Key is the taint key that the toleration applies
to. Empty means match all taint keys. If the key is empty, operator
must be Exists; this combination means to match all values and
all keys.
type: string
operator:
description: Operator represents a key's relationship to the value.
Valid operators are Exists and Equal. Defaults to Equal. Exists
is equivalent to wildcard for value, so that a pod can tolerate
all taints of a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of time the
toleration (which must be of effect NoExecute, otherwise this
field is ignored) tolerates the taint. By default, it is not
set, which means tolerate the taint forever (do not evict).
Zero and negative values will be treated as 0 (evict immediately)
by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches to.
If the operator is Exists, the value should be empty, otherwise
just a regular string.
type: string
type: object
type: array
type: object
status:
description: WebhookStatus defines the observed state of Webhook
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,19 +8,6 @@ metadata:
creationTimestamp: null
name: clusters.cluster.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.joinFederation
name: Federated
type: boolean
- JSONPath: .spec.provider
name: Provider
type: string
- JSONPath: .spec.enable
name: Active
type: boolean
- JSONPath: .status.kubernetesVersion
name: Version
type: string
group: cluster.kubesphere.io
names:
kind: Cluster
@@ -28,143 +15,173 @@ spec:
plural: clusters
singular: cluster
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: Cluster is the schema for the clusters API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
connection:
description: Connection holds info to connect to the member cluster
properties:
kubeconfig:
description: KubeConfig content used to connect to cluster api server
Should provide this field explicitly if connection type is direct.
Will be populated by ks-proxy if connection type is proxy.
format: byte
type: string
kubernetesAPIEndpoint:
description: 'Kubernetes API Server endpoint. Example: https://10.10.0.1:6443
Should provide this field explicitly if connection type is direct.
Will be populated by ks-apiserver if connection type is proxy.'
type: string
kubernetesAPIServerPort:
description: KubeAPIServerPort is the port which listens for forwarding
kube-apiserver traffic Only applicable when connection type is
proxy.
type: integer
kubesphereAPIEndpoint:
description: 'KubeSphere API Server endpoint. Example: http://10.10.0.11:8080
Should provide this field explicitly if connection type is direct.
Will be populated by ks-apiserver if connection type is proxy.'
type: string
kubesphereAPIServerPort:
description: KubeSphereAPIServerPort is the port which listens for
forwarding kubesphere apigateway traffic Only applicable when
connection type is proxy.
type: integer
token:
description: Token used by agents of member cluster to connect to
host cluster proxy. This field is populated by apiserver only
if connection type is proxy.
type: string
type:
description: type defines how host cluster will connect to host
cluster ConnectionTypeDirect means direct connection, this requires kubeconfig
and kubesphere apiserver endpoint provided ConnectionTypeProxy
means using kubesphere proxy, no kubeconfig or kubesphere apiserver
endpoint required
type: string
type: object
enable:
description: Desired state of the cluster
type: boolean
joinFederation:
description: Join cluster as a kubefed cluster
type: boolean
provider:
description: Provider of the cluster, this field is just for description
type: string
type: object
status:
properties:
conditions:
description: Represents the latest available observations of a cluster's
current state.
items:
versions:
- additionalPrinterColumns:
- jsonPath: .spec.joinFederation
name: Federated
type: boolean
- jsonPath: .spec.provider
name: Provider
type: string
- jsonPath: .spec.enable
name: Active
type: boolean
- jsonPath: .status.kubernetesVersion
name: Version
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Cluster is the schema for the clusters API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
connection:
description: Connection holds info to connect to the member cluster
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
externalKubernetesAPIEndpoint:
description: External Kubernetes API Server endpoint Will be populated
by ks-apiserver if connection type is proxy and ExternalKubeAPIEnabled
is true.
type: string
lastUpdateTime:
description: The last time this condition was updated.
format: date-time
kubeconfig:
description: KubeConfig content used to connect to cluster api
server Should provide this field explicitly if connection type
is direct. Will be populated by ks-proxy if connection type
is proxy.
format: byte
type: string
message:
description: A human readable message indicating details about
the transition.
kubernetesAPIEndpoint:
description: 'Kubernetes API Server endpoint. Example: https://10.10.0.1:6443
Should provide this field explicitly if connection type is direct.
Will be populated by ks-apiserver if connection type is proxy.'
type: string
reason:
description: The reason for the condition's last transition.
kubernetesAPIServerPort:
description: KubeAPIServerPort is the port which listens for forwarding
kube-apiserver traffic Only applicable when connection type
is proxy.
type: integer
kubesphereAPIEndpoint:
description: 'KubeSphere API Server endpoint. Example: http://10.10.0.11:8080
Should provide this field explicitly if connection type is direct.
Will be populated by ks-apiserver if connection type is proxy.'
type: string
status:
description: Status of the condition, one of True, False, Unknown.
kubesphereAPIServerPort:
description: KubeSphereAPIServerPort is the port which listens
for forwarding kubesphere apigateway traffic Only applicable
when connection type is proxy.
type: integer
token:
description: Token used by agents of member cluster to connect
to host cluster proxy. This field is populated by apiserver
only if connection type is proxy.
type: string
type:
description: Type of the condition
description: type defines how host cluster will connect to host
cluster ConnectionTypeDirect means direct connection, this requires kubeconfig
and kubesphere apiserver endpoint provided ConnectionTypeProxy
means using kubesphere proxy, no kubeconfig or kubesphere
apiserver endpoint required
type: string
required:
- status
- type
type: object
type: array
configz:
additionalProperties:
enable:
description: Desired state of the cluster
type: boolean
description: Configz is status of components enabled in the member cluster.
This is synchronized with member cluster every amount of time, like
5 minutes.
type: object
kubernetesVersion:
description: GitVersion of the kubernetes cluster, this field is populated
by cluster controller
type: string
nodeCount:
description: Count of the kubernetes cluster nodes This field may not
reflect the instant status of the cluster.
type: integer
region:
description: Region is the name of the region in which all of the nodes
in the cluster exist. e.g. 'us-east1'.
type: string
zones:
description: Zones are the names of availability zones in which the
nodes of the cluster exist, e.g. 'us-east1-a'.
items:
externalKubeAPIEnabled:
description: ExternalKubeAPIEnabled export kubeapiserver to public
use a lb type service if connection type is proxy
type: boolean
joinFederation:
description: Join cluster as a kubefed cluster
type: boolean
provider:
description: Provider of the cluster, this field is just for description
type: string
type: array
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
type: object
status:
properties:
conditions:
description: Represents the latest available observations of a cluster's
current state.
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
lastUpdateTime:
description: The last time this condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of the condition
type: string
required:
- status
- type
type: object
type: array
configz:
additionalProperties:
type: boolean
description: Configz is status of components enabled in the member
cluster. This is synchronized with member cluster every amount of
time, like 5 minutes.
type: object
kubeSphereVersion:
description: GitVersion of the /kapis/version api response, this field
is populated by cluster controller
type: string
kubernetesVersion:
description: GitVersion of the kubernetes cluster, this field is populated
by cluster controller
type: string
nodeCount:
description: Count of the kubernetes cluster nodes This field may
not reflect the instant status of the cluster.
type: integer
region:
description: Region is the name of the region in which all of the
nodes in the cluster exist. e.g. 'us-east1'.
type: string
uid:
description: UID is the kube-system namespace UID of the cluster,
which represents the unique ID of the cluster.
type: string
zones:
description: Zones are the names of availability zones in which the
nodes of the cluster exist, e.g. 'us-east1-a'.
items:
type: string
type: array
type: object
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,38 +17,31 @@ spec:
plural: devopsprojects
singular: devopsproject
scope: Cluster
validation:
openAPIV3Schema:
description: DevOpsProject is the Schema for the devopsprojects API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DevOpsProjectSpec defines the desired state of DevOpsProject
type: object
status:
description: DevOpsProjectStatus defines the observed state of DevOpsProject
properties:
adminNamespace:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file'
type: string
type: object
type: object
version: v1alpha3
versions:
- name: v1alpha3
schema:
openAPIV3Schema:
description: DevOpsProject is the Schema for the devopsprojects API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DevOpsProjectSpec defines the desired state of DevOpsProject
type: object
status:
description: DevOpsProjectStatus defines the observed state of DevOpsProject
properties:
adminNamespace:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run "make" to regenerate code after modifying this file'
type: string
type: object
type: object
served: true
storage: true
status:

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -15,241 +15,281 @@ spec:
plural: pipelines
singular: pipeline
scope: Namespaced
validation:
openAPIV3Schema:
description: Pipeline is the Schema for the pipelines API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: PipelineSpec defines the desired state of Pipeline
properties:
multi_branch_pipeline:
properties:
bitbucket_server_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
description:
type: string
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
git_source:
properties:
credential_id:
type: string
discover_branches:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
regex_filter:
type: string
scm_id:
type: string
url:
type: string
type: object
github_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
multibranch_job_trigger:
properties:
create_action_job_to_trigger:
type: string
delete_action_job_to_trigger:
type: string
type: object
name:
type: string
script_path:
type: string
single_svn_source:
properties:
credential_id:
type: string
remote:
type: string
scm_id:
type: string
type: object
source_type:
type: string
svn_source:
properties:
credential_id:
type: string
excludes:
type: string
includes:
type: string
remote:
type: string
scm_id:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
- script_path
- source_type
type: object
pipeline:
properties:
description:
type: string
disable_concurrent:
type: boolean
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
jenkinsfile:
type: string
name:
type: string
parameters:
items:
properties:
default_value:
type: string
description:
type: string
name:
type: string
type:
type: string
required:
- name
- type
type: object
type: array
remote_trigger:
properties:
token:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
type: object
type:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file'
type: string
required:
- type
type: object
status:
description: PipelineStatus defines the observed state of Pipeline
type: object
type: object
version: v1alpha3
versions:
- name: v1alpha3
schema:
openAPIV3Schema:
description: Pipeline is the Schema for the pipelines API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: PipelineSpec defines the desired state of Pipeline
properties:
multi_branch_pipeline:
properties:
bitbucket_server_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
discover_tags:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
description:
type: string
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
git_source:
properties:
credential_id:
type: string
discover_branches:
type: boolean
discover_tags:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
regex_filter:
type: string
scm_id:
type: string
url:
type: string
type: object
github_source:
description: GithubSource and BitbucketServerSource have the same structure, but we don't use one due to crd errors
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
discover_tags:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
type: object
gitlab_source:
properties:
api_uri:
type: string
credential_id:
type: string
discover_branches:
type: integer
discover_pr_from_forks:
properties:
strategy:
type: integer
trust:
type: integer
type: object
discover_pr_from_origin:
type: integer
discover_tags:
type: boolean
git_clone_option:
properties:
depth:
type: integer
shallow:
type: boolean
timeout:
type: integer
type: object
owner:
type: string
regex_filter:
type: string
repo:
type: string
scm_id:
type: string
server_name:
type: string
type: object
multibranch_job_trigger:
properties:
create_action_job_to_trigger:
type: string
delete_action_job_to_trigger:
type: string
type: object
name:
type: string
script_path:
type: string
single_svn_source:
properties:
credential_id:
type: string
remote:
type: string
scm_id:
type: string
type: object
source_type:
type: string
svn_source:
properties:
credential_id:
type: string
excludes:
type: string
includes:
type: string
remote:
type: string
scm_id:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
- script_path
- source_type
type: object
pipeline:
properties:
description:
type: string
disable_concurrent:
type: boolean
discarder:
properties:
days_to_keep:
type: string
num_to_keep:
type: string
type: object
jenkinsfile:
type: string
name:
type: string
parameters:
items:
properties:
default_value:
type: string
description:
type: string
name:
type: string
type:
type: string
required:
- name
- type
type: object
type: array
remote_trigger:
properties:
token:
type: string
type: object
timer_trigger:
properties:
cron:
description: user in no scm job
type: string
interval:
description: use in multi-branch job
type: string
type: object
required:
- name
type: object
type:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file'
type: string
required:
- type
type: object
status:
description: PipelineStatus defines the observed state of Pipeline
type: object
type: object
served: true
storage: true
status:

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,19 +8,6 @@ metadata:
creationTimestamp: null
name: s2ibinaries.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.fileName
name: FileName
type: string
- JSONPath: .spec.md5
name: MD5
type: string
- JSONPath: .spec.size
name: Size
type: string
- JSONPath: .status.phase
name: Phase
type: string
group: devops.kubesphere.io
names:
kind: S2iBinary
@@ -28,56 +15,64 @@ spec:
plural: s2ibinaries
singular: s2ibinary
scope: Namespaced
subresources: {}
validation:
openAPIV3Schema:
description: S2iBinary is the Schema for the s2ibinaries API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBinarySpec defines the desired state of S2iBinary
properties:
downloadURL:
description: DownloadURL in KubeSphere
type: string
fileName:
description: FileName is filename of binary
type: string
md5:
description: MD5 is Binary's MD5 Hash
type: string
size:
description: Size is the file size of file
type: string
uploadTimeStamp:
description: UploadTime is last upload time
format: date-time
type: string
type: object
status:
description: S2iBinaryStatus defines the observed state of S2iBinary
properties:
phase:
description: Phase is status of S2iBinary . Possible value is "Ready","UnableToDownload"
type: string
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .spec.fileName
name: FileName
type: string
- jsonPath: .spec.md5
name: MD5
type: string
- jsonPath: .spec.size
name: Size
type: string
- jsonPath: .status.phase
name: Phase
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: S2iBinary is the Schema for the s2ibinaries API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBinarySpec defines the desired state of S2iBinary
properties:
downloadURL:
description: DownloadURL in KubeSphere
type: string
fileName:
description: FileName is filename of binary
type: string
md5:
description: MD5 is Binary's MD5 Hash
type: string
size:
description: Size is the file size of file
type: string
uploadTimeStamp:
description: UploadTime is last upload time
format: date-time
type: string
type: object
status:
description: S2iBinaryStatus defines the observed state of S2iBinary
properties:
phase:
description: Phase is status of S2iBinary . Possible value is "Ready","UnableToDownload"
type: string
type: object
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,16 +8,6 @@ metadata:
creationTimestamp: null
name: s2ibuildertemplates.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.codeFramework
name: Framework
type: string
- JSONPath: .spec.defaultBaseImage
name: DefaultBaseImage
type: string
- JSONPath: .spec.version
name: Version
type: string
group: devops.kubesphere.io
names:
categories:
@@ -29,110 +19,109 @@ spec:
- s2ibt
singular: s2ibuildertemplate
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: S2iBuilderTemplate is the Schema for the s2ibuildertemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBuilderTemplateSpec defines the desired state of S2iBuilderTemplate
properties:
codeFramework:
description: CodeFramework means which language this template is designed
for and which framework is using if has framework. Like Java, NodeJS
etc
type: string
containerInfo:
description: Images are the images this template will use.
items:
properties:
buildVolumes:
description: BuildVolumes specifies a list of volumes to mount
to container running the build.
items:
type: string
type: array
builderImage:
description: BaseImage are the images this template will use.
type: string
runtimeArtifacts:
items:
description: VolumeSpec represents a single volume mount point.
properties:
destination:
description: Destination is the path to mount the volume
to - absolute or relative.
type: string
keep:
description: Keep indicates if the mounted data should be
kept in the final image.
type: boolean
source:
description: Source is a reference to the volume source.
type: string
type: object
type: array
runtimeImage:
type: string
type: object
type: array
defaultBaseImage:
description: DefaultBaseImage is the image that will be used by default
type: string
description:
description: Description illustrate the purpose of this template
type: string
environment:
description: Parameters is a set of environment variables to be passed
to the image.
items:
properties:
defaultValue:
type: string
description:
type: string
key:
type: string
optValues:
items:
type: string
type: array
required:
type: boolean
type:
type: string
value:
type: string
type: object
type: array
iconPath:
description: IconPath is used for frontend display
type: string
version:
description: Version of template
type: string
type: object
status:
description: S2iBuilderTemplateStatus defines the observed state of S2iBuilderTemplate
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .spec.codeFramework
name: Framework
type: string
- jsonPath: .spec.defaultBaseImage
name: DefaultBaseImage
type: string
- jsonPath: .spec.version
name: Version
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: S2iBuilderTemplate is the Schema for the s2ibuildertemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iBuilderTemplateSpec defines the desired state of S2iBuilderTemplate
properties:
codeFramework:
description: CodeFramework means which language this template is designed for and which framework is using if has framework. Like Java, NodeJS etc
type: string
containerInfo:
description: Images are the images this template will use.
items:
properties:
buildVolumes:
description: BuildVolumes specifies a list of volumes to mount to container running the build.
items:
type: string
type: array
builderImage:
description: BaseImage are the images this template will use.
type: string
runtimeArtifacts:
items:
description: VolumeSpec represents a single volume mount point.
properties:
destination:
description: Destination is the path to mount the volume to - absolute or relative.
type: string
keep:
description: Keep indicates if the mounted data should be kept in the final image.
type: boolean
source:
description: Source is a reference to the volume source.
type: string
type: object
type: array
runtimeImage:
type: string
type: object
type: array
defaultBaseImage:
description: DefaultBaseImage is the image that will be used by default
type: string
description:
description: Description illustrate the purpose of this template
type: string
environment:
description: Parameters is a set of environment variables to be passed to the image.
items:
properties:
defaultValue:
type: string
description:
type: string
key:
type: string
optValues:
items:
type: string
type: array
required:
type: boolean
type:
type: string
value:
type: string
type: object
type: array
iconPath:
description: IconPath is used for frontend display
type: string
version:
description: Version of template
type: string
type: object
status:
description: S2iBuilderTemplateStatus defines the observed state of S2iBuilderTemplate
type: object
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,22 +8,6 @@ metadata:
creationTimestamp: null
name: s2iruns.devops.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .status.runState
name: State
type: string
- JSONPath: .status.kubernetesJobName
name: K8sJobName
type: string
- JSONPath: .status.startTime
name: StartTime
type: date
- JSONPath: .status.completionTime
name: CompletionTime
type: date
- JSONPath: .status.s2iBuildResult.imageName
name: ImageName
type: string
group: devops.kubesphere.io
names:
kind: S2iRun
@@ -33,146 +17,145 @@ spec:
- s2ir
singular: s2irun
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: S2iRun is the Schema for the s2iruns API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iRunSpec defines the desired state of S2iRun
properties:
backoffLimit:
description: BackoffLimit limits the restart count of each s2irun. Default
is 0
format: int32
type: integer
builderName:
description: BuilderName specify the name of s2ibuilder, required
type: string
newRevisionId:
description: NewRevisionId override the default NewRevisionId in its
s2ibuilder.
type: string
newSourceURL:
description: NewSourceURL is used to download new binary artifacts
type: string
newTag:
description: NewTag override the default tag in its s2ibuilder, image
name cannot be changed.
type: string
secondsAfterFinished:
description: SecondsAfterFinished if is set and greater than zero, and
the job created by s2irun become successful or failed , the job will
be auto deleted after SecondsAfterFinished
format: int32
type: integer
required:
- builderName
type: object
status:
description: S2iRunStatus defines the observed state of S2iRun
properties:
completionTime:
description: Represents time when the job was completed. It is not guaranteed
to be set in happens-before order across separate operations. It is
represented in RFC3339 form and is in UTC.
format: date-time
type: string
kubernetesJobName:
description: KubernetesJobName is the job name in k8s
type: string
logURL:
description: LogURL is uesd for external log handler to let user know
where is log located in
type: string
runState:
description: RunState indicates whether this job is done or failed
type: string
s2iBuildResult:
description: S2i build result info.
properties:
commandPull:
description: Command for pull image.
type: string
imageCreated:
description: Image created time.
type: string
imageID:
description: Image ID.
type: string
imageName:
description: ImageName is the name of artifact
type: string
imageRepoTags:
description: image tags.
items:
type: string
type: array
imageSize:
description: The size in bytes of the image
format: int64
type: integer
type: object
s2iBuildSource:
description: S2i build source info.
properties:
binaryName:
description: Binary file Name
type: string
binarySize:
description: Binary file Size
format: int64
type: integer
builderImage:
description: // BuilderImage describes which image is used for building
the result images.
type: string
commitID:
description: CommitID represents an arbitrary extended object reference
in Git as SHA-1
type: string
committerEmail:
description: CommitterEmail contains the e-mail of the committer
type: string
committerName:
description: CommitterName contains the name of the committer
type: string
description:
description: Description is a result image description label. The
default is no description.
type: string
revisionId:
description: The RevisionId is a branch name or a SHA-1 hash of
every important thing about the commit
type: string
sourceUrl:
description: SourceURL is url of the codes such as https://github.com/a/b.git
type: string
type: object
startTime:
description: StartTime represent when this run began
format: date-time
type: string
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .status.runState
name: State
type: string
- jsonPath: .status.kubernetesJobName
name: K8sJobName
type: string
- jsonPath: .status.startTime
name: StartTime
type: date
- jsonPath: .status.completionTime
name: CompletionTime
type: date
- jsonPath: .status.s2iBuildResult.imageName
name: ImageName
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: S2iRun is the Schema for the s2iruns API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: S2iRunSpec defines the desired state of S2iRun
properties:
backoffLimit:
description: BackoffLimit limits the restart count of each s2irun. Default is 0
format: int32
type: integer
builderName:
description: BuilderName specify the name of s2ibuilder, required
type: string
newRevisionId:
description: NewRevisionId override the default NewRevisionId in its s2ibuilder.
type: string
newSourceURL:
description: NewSourceURL is used to download new binary artifacts
type: string
newTag:
description: NewTag override the default tag in its s2ibuilder, image name cannot be changed.
type: string
secondsAfterFinished:
description: SecondsAfterFinished if is set and greater than zero, and the job created by s2irun become successful or failed , the job will be auto deleted after SecondsAfterFinished
format: int32
type: integer
required:
- builderName
type: object
status:
description: S2iRunStatus defines the observed state of S2iRun
properties:
completionTime:
description: Represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.
format: date-time
type: string
kubernetesJobName:
description: KubernetesJobName is the job name in k8s
type: string
logURL:
description: LogURL is uesd for external log handler to let user know where is log located in
type: string
runState:
description: RunState indicates whether this job is done or failed
type: string
s2iBuildResult:
description: S2i build result info.
properties:
commandPull:
description: Command for pull image.
type: string
imageCreated:
description: Image created time.
type: string
imageID:
description: Image ID.
type: string
imageName:
description: ImageName is the name of artifact
type: string
imageRepoTags:
description: image tags.
items:
type: string
type: array
imageSize:
description: The size in bytes of the image
format: int64
type: integer
type: object
s2iBuildSource:
description: S2i build source info.
properties:
binaryName:
description: Binary file Name
type: string
binarySize:
description: Binary file Size
format: int64
type: integer
builderImage:
description: // BuilderImage describes which image is used for building the result images.
type: string
commitID:
description: CommitID represents an arbitrary extended object reference in Git as SHA-1
type: string
committerEmail:
description: CommitterEmail contains the e-mail of the committer
type: string
committerName:
description: CommitterName contains the name of the committer
type: string
description:
description: Description is a result image description label. The default is no description.
type: string
revisionId:
description: The RevisionId is a branch name or a SHA-1 hash of every important thing about the commit
type: string
sourceUrl:
description: SourceURL is url of the codes such as https://github.com/a/b.git
type: string
type: object
startTime:
description: StartTime represent when this run began
format: date-time
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""

View File

@@ -0,0 +1,122 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: gateways.gateway.kubesphere.io
spec:
group: gateway.kubesphere.io
names:
kind: Gateway
listKind: GatewayList
plural: gateways
singular: gateway
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Gateway is the Schema for the gateways API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: GatewaySpec defines the desired state of Gateway
properties:
controller:
properties:
annotations:
additionalProperties:
type: string
type: object
config:
additionalProperties:
type: string
type: object
replicas:
format: int32
type: integer
scope:
properties:
enabled:
type: boolean
namespace:
type: string
type: object
type: object
deployment:
properties:
annotations:
additionalProperties:
type: string
type: object
replicas:
format: int32
type: integer
resources:
description: ResourceRequirements describes the compute resource
requirements.
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
type: object
service:
properties:
annotations:
additionalProperties:
type: string
type: object
type:
description: Service Type string describes ingress methods for
a service
type: string
type: object
type: object
status:
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,44 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: nginxes.gateway.kubesphere.io
spec:
group: gateway.kubesphere.io
names:
kind: Nginx
listKind: NginxList
plural: nginxes
singular: nginx
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Nginx is the Schema for the nginxes API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec defines the desired state of Nginx
type: object
x-kubernetes-preserve-unknown-fields: true
status:
description: Status defines the observed state of Nginx
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
served: true
storage: true
subresources:
status: {}

View File

@@ -0,0 +1,128 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: federatedrolebindings.iam.kubesphere.io
spec:
group: iam.kubesphere.io
names:
kind: FederatedRoleBinding
listKind: FederatedRoleBindingList
plural: federatedrolebindings
singular: federatedrolebinding
scope: Namespaced
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
placement:
properties:
clusterSelector:
properties:
matchLabels:
additionalProperties:
type: string
type: object
type: object
clusters:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
type: object
template:
properties:
metadata:
type: object
roleRef:
description: RoleRef contains information that points to the role
being used
properties:
apiGroup:
description: APIGroup is the group for the resource being
referenced
type: string
kind:
description: Kind is the type of resource being referenced
type: string
name:
description: Name is the name of resource being referenced
type: string
required:
- apiGroup
- kind
- name
type: object
subjects:
items:
description: Subject contains a reference to the object or user
identities a role binding applies to. This can either hold
a direct API object reference, or a value for non-objects
such as user and group names.
properties:
apiGroup:
description: APIGroup holds the API group of the referenced
subject. Defaults to "" for ServiceAccount subjects. Defaults
to "rbac.authorization.k8s.io" for User and Group subjects.
type: string
kind:
description: Kind of object being referenced. Values defined
by this API group are "User", "Group", and "ServiceAccount".
If the Authorizer does not recognized the kind value,
the Authorizer should report an error.
type: string
name:
description: Name of the object being referenced.
type: string
namespace:
description: Namespace of the referenced object. If the
object kind is non-namespace, such as "User" or "Group",
and this value is not empty the Authorizer should report
an error.
type: string
required:
- kind
- name
type: object
type: array
required:
- roleRef
type: object
required:
- placement
- template
type: object
required:
- spec
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,125 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: federatedroles.iam.kubesphere.io
spec:
group: iam.kubesphere.io
names:
kind: FederatedRole
listKind: FederatedRoleList
plural: federatedroles
singular: federatedrole
scope: Namespaced
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
placement:
properties:
clusterSelector:
properties:
matchLabels:
additionalProperties:
type: string
type: object
type: object
clusters:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
type: object
template:
properties:
metadata:
type: object
rules:
items:
description: PolicyRule holds information that describes a policy
rule, but does not contain information about who the rule
applies to or which namespace the rule applies to.
properties:
apiGroups:
description: APIGroups is the name of the APIGroup that
contains the resources. If multiple API groups are specified,
any action requested against one of the enumerated resources
in any API group will be allowed.
items:
type: string
type: array
nonResourceURLs:
description: NonResourceURLs is a set of partial urls that
a user should have access to. *s are allowed, but only
as the full, final step in the path Since non-resource
URLs are not namespaced, this field is only applicable
for ClusterRoles referenced from a ClusterRoleBinding.
Rules can either apply to API resources (such as "pods"
or "secrets") or non-resource URL paths (such as "/api"), but
not both.
items:
type: string
type: array
resourceNames:
description: ResourceNames is an optional white list of
names that the rule applies to. An empty set means that
everything is allowed.
items:
type: string
type: array
resources:
description: Resources is a list of resources this rule
applies to. ResourceAll represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL
the ResourceKinds and AttributeRestrictions contained
in this rule. VerbAll represents all kinds.
items:
type: string
type: array
required:
- verbs
type: object
type: array
type: object
required:
- placement
- template
type: object
required:
- spec
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,139 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: federatedusers.iam.kubesphere.io
spec:
group: iam.kubesphere.io
names:
kind: FederatedUser
listKind: FederatedUserList
plural: federatedusers
singular: federateduser
scope: Namespaced
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
placement:
properties:
clusterSelector:
properties:
matchLabels:
additionalProperties:
type: string
type: object
type: object
clusters:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
type: object
template:
properties:
metadata:
type: object
spec:
description: UserSpec defines the desired state of User
properties:
description:
description: Description of the user.
type: string
displayName:
type: string
email:
description: Unique email address(https://www.ietf.org/rfc/rfc5322.txt).
type: string
groups:
items:
type: string
type: array
lang:
description: The preferred written or spoken language for
the user.
type: string
password:
description: 'password will be encrypted by mutating admission
webhook Password pattern is tricky here. The rule is simple:
length between [6,64], at least one uppercase letter, one
lowercase letter, one digit. The regexp in console(javascript)
is quite straightforward: ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{6,64}$
But in Go, we don''t have ?= (back tracking) capability
in regexp (also in CRD validation pattern) So we adopted
an alternative scheme to achieve. Use 6 different regexp
to combine to achieve the same effect. These six schemes
enumerate the arrangement of numbers, uppercase letters,
and lowercase letters that appear for the first time. -
^(.*[a-z].*[A-Z].*[0-9].*)$ stands for lowercase letter
comes first, then followed by an uppercase letter, then
a digit. - ^(.*[a-z].*[0-9].*[A-Z].*)$ stands for lowercase
letter comes first, then followed by a digit, then an uppercase
leeter. - ^(.*[A-Z].*[a-z].*[0-9].*)$ ... - ^(.*[A-Z].*[0-9].*[a-z].*)$
... - ^(.*[0-9].*[a-z].*[A-Z].*)$ ... - ^(.*[0-9].*[A-Z].*[a-z].*)$
... Last but not least, the bcrypt string is also included
to match the encrypted password. ^(\$2[ayb]\$.{56})$'
maxLength: 64
minLength: 6
pattern: ^(.*[a-z].*[A-Z].*[0-9].*)$|^(.*[a-z].*[0-9].*[A-Z].*)$|^(.*[A-Z].*[a-z].*[0-9].*)$|^(.*[A-Z].*[0-9].*[a-z].*)$|^(.*[0-9].*[a-z].*[A-Z].*)$|^(.*[0-9].*[A-Z].*[a-z].*)$|^(\$2[ayb]\$.{56})$
type: string
required:
- email
type: object
status:
description: UserStatus defines the observed state of User
properties:
lastLoginTime:
description: Last login attempt timestamp
format: date-time
type: string
lastTransitionTime:
format: date-time
type: string
reason:
type: string
state:
description: The user status
type: string
type: object
required:
- spec
type: object
required:
- placement
- template
type: object
required:
- spec
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,78 +17,77 @@ spec:
plural: globalrolebindings
singular: globalrolebinding
scope: Cluster
validation:
openAPIV3Schema:
description: GlobalRoleBinding is the Schema for the globalrolebindings API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: Standard object's metadata.
type: object
roleRef:
description: RoleRef can only reference a GlobalRole. If the RoleRef cannot
be resolved, the Authorizer must return an error.
properties:
apiGroup:
description: APIGroup is the group for the resource being referenced
type: string
kind:
description: Kind is the type of resource being referenced
type: string
name:
description: Name is the name of resource being referenced
type: string
required:
- apiGroup
- kind
- name
type: object
subjects:
description: Subjects holds references to the objects the role applies to.
items:
description: Subject contains a reference to the object or user identities
a role binding applies to. This can either hold a direct API object
reference, or a value for non-objects such as user and group names.
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: GlobalRoleBinding is the Schema for the globalrolebindings API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
roleRef:
description: RoleRef can only reference a GlobalRole. If the RoleRef cannot
be resolved, the Authorizer must return an error.
properties:
apiGroup:
description: APIGroup holds the API group of the referenced subject.
Defaults to "" for ServiceAccount subjects. Defaults to "rbac.authorization.k8s.io"
for User and Group subjects.
description: APIGroup is the group for the resource being referenced
type: string
kind:
description: Kind of object being referenced. Values defined by this
API group are "User", "Group", and "ServiceAccount". If the Authorizer
does not recognized the kind value, the Authorizer should report
an error.
description: Kind is the type of resource being referenced
type: string
name:
description: Name of the object being referenced.
type: string
namespace:
description: Namespace of the referenced object. If the object kind
is non-namespace, such as "User" or "Group", and this value is not
empty the Authorizer should report an error.
description: Name is the name of resource being referenced
type: string
required:
- apiGroup
- kind
- name
type: object
type: array
required:
- roleRef
type: object
version: v1alpha2
versions:
- name: v1alpha2
subjects:
description: Subjects holds references to the objects the role applies
to.
items:
description: Subject contains a reference to the object or user identities
a role binding applies to. This can either hold a direct API object
reference, or a value for non-objects such as user and group names.
properties:
apiGroup:
description: APIGroup holds the API group of the referenced subject.
Defaults to "" for ServiceAccount subjects. Defaults to "rbac.authorization.k8s.io"
for User and Group subjects.
type: string
kind:
description: Kind of object being referenced. Values defined by
this API group are "User", "Group", and "ServiceAccount". If the
Authorizer does not recognized the kind value, the Authorizer
should report an error.
type: string
name:
description: Name of the object being referenced.
type: string
namespace:
description: Namespace of the referenced object. If the object
kind is non-namespace, such as "User" or "Group", and this value
is not empty the Authorizer should report an error.
type: string
required:
- kind
- name
type: object
type: array
required:
- roleRef
type: object
served: true
storage: true
status:

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,74 +17,73 @@ spec:
plural: globalroles
singular: globalrole
scope: Cluster
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: Standard object's metadata.
type: object
rules:
description: Rules holds all the PolicyRules for this GlobalRole
items:
description: PolicyRule holds information that describes a policy rule,
but does not contain information about who the rule applies to or which
namespace the rule applies to.
properties:
apiGroups:
description: APIGroups is the name of the APIGroup that contains the
resources. If multiple API groups are specified, any action requested
against one of the enumerated resources in any API group will be
allowed.
items:
type: string
type: array
nonResourceURLs:
description: NonResourceURLs is a set of partial urls that a user
should have access to. *s are allowed, but only as the full, final
step in the path Since non-resource URLs are not namespaced, this
field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
Rules can either apply to API resources (such as "pods" or "secrets")
or non-resource URL paths (such as "/api"), but not both.
items:
type: string
type: array
resourceNames:
description: ResourceNames is an optional white list of names that
the rule applies to. An empty set means that everything is allowed.
items:
type: string
type: array
resources:
description: Resources is a list of resources this rule applies to. ResourceAll
represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
and AttributeRestrictions contained in this rule. VerbAll represents
all kinds.
items:
type: string
type: array
required:
- verbs
type: object
type: array
type: object
version: v1alpha2
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
rules:
description: Rules holds all the PolicyRules for this GlobalRole
items:
description: PolicyRule holds information that describes a policy rule,
but does not contain information about who the rule applies to or
which namespace the rule applies to.
properties:
apiGroups:
description: APIGroups is the name of the APIGroup that contains
the resources. If multiple API groups are specified, any action
requested against one of the enumerated resources in any API group
will be allowed.
items:
type: string
type: array
nonResourceURLs:
description: NonResourceURLs is a set of partial urls that a user
should have access to. *s are allowed, but only as the full,
final step in the path Since non-resource URLs are not namespaced,
this field is only applicable for ClusterRoles referenced from
a ClusterRoleBinding. Rules can either apply to API resources
(such as "pods" or "secrets") or non-resource URL paths (such
as "/api"), but not both.
items:
type: string
type: array
resourceNames:
description: ResourceNames is an optional white list of names that
the rule applies to. An empty set means that everything is allowed.
items:
type: string
type: array
resources:
description: Resources is a list of resources this rule applies
to. ResourceAll represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
and AttributeRestrictions contained in this rule. VerbAll represents
all kinds.
items:
type: string
type: array
required:
- verbs
type: object
type: array
type: object
served: true
storage: true
status:

View File

@@ -0,0 +1,68 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: groupbindings.iam.kubesphere.io
spec:
group: iam.kubesphere.io
names:
categories:
- group
kind: GroupBinding
listKind: GroupBindingList
plural: groupbindings
singular: groupbinding
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .groupRef.name
name: Group
type: string
- jsonPath: .users
name: Users
type: string
name: v1alpha2
schema:
openAPIV3Schema:
description: GroupBinding is the Schema for the groupbindings API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
groupRef:
description: GroupRef defines the desired relation of GroupBinding
properties:
apiGroup:
type: string
kind:
type: string
name:
type: string
type: object
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
users:
items:
type: string
type: array
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,57 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: groups.iam.kubesphere.io
spec:
group: iam.kubesphere.io
names:
categories:
- group
kind: Group
listKind: GroupList
plural: groups
singular: group
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
name: v1alpha2
schema:
openAPIV3Schema:
description: Group is the Schema for the groups API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: GroupSpec defines the desired state of Group
type: object
status:
description: GroupStatus defines the observed state of Group
type: object
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,25 +8,6 @@ metadata:
creationTimestamp: null
name: loginrecords.iam.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.type
name: Type
type: string
- JSONPath: .spec.provider
name: Provider
type: string
- JSONPath: .spec.sourceIP
name: From
type: string
- JSONPath: .spec.success
name: Success
type: string
- JSONPath: .spec.reason
name: Reason
type: string
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: iam.kubesphere.io
names:
categories:
@@ -36,57 +17,75 @@ spec:
plural: loginrecords
singular: loginrecord
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
provider:
description: Provider of authentication, Ldap/Github etc.
type: string
reason:
description: States failed login attempt reason
type: string
sourceIP:
description: Source IP of client
type: string
success:
description: Successful login attempt or not
type: boolean
type:
description: Which authentication method used, BasicAuth/OAuth
type: string
userAgent:
description: User agent of login attempt
type: string
required:
- provider
- reason
- sourceIP
- success
- type
type: object
required:
- spec
type: object
version: v1alpha2
versions:
- name: v1alpha2
- additionalPrinterColumns:
- jsonPath: .spec.type
name: Type
type: string
- jsonPath: .spec.provider
name: Provider
type: string
- jsonPath: .spec.sourceIP
name: From
type: string
- jsonPath: .spec.success
name: Success
type: string
- jsonPath: .spec.reason
name: Reason
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
provider:
description: Provider of authentication, Ldap/Github etc.
type: string
reason:
description: States failed login attempt reason
type: string
sourceIP:
description: Source IP of client
type: string
success:
description: Successful login attempt or not
type: boolean
type:
description: Which authentication method used, BasicAuth/OAuth
type: string
userAgent:
description: User agent of login attempt
type: string
required:
- provider
- reason
- sourceIP
- success
- type
type: object
required:
- spec
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,29 +17,30 @@ spec:
plural: rolebases
singular: rolebase
scope: Cluster
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
role:
type: object
required:
- role
type: object
version: v1alpha2
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
role:
type: object
x-kubernetes-embedded-resource: true
x-kubernetes-preserve-unknown-fields: true
required:
- role
type: object
served: true
storage: true
status:

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,13 +8,6 @@ metadata:
creationTimestamp: null
name: users.iam.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.email
name: Email
type: string
- JSONPath: .status.state
name: Status
type: string
group: iam.kubesphere.io
names:
categories:
@@ -24,72 +17,96 @@ spec:
plural: users
singular: user
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: User is the Schema for the users API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: Standard object's metadata.
type: object
spec:
description: UserSpec defines the desired state of User
properties:
description:
description: Description of the user.
type: string
displayName:
type: string
email:
description: Unique email address(https://www.ietf.org/rfc/rfc5322.txt).
type: string
groups:
items:
type: string
type: array
lang:
description: The preferred written or spoken language for the user.
type: string
password:
description: password will be encrypted by mutating admission webhook
type: string
required:
- email
type: object
status:
description: UserStatus defines the observed state of User
properties:
lastLoginTime:
description: Last login attempt timestamp
format: date-time
type: string
lastTransitionTime:
format: date-time
type: string
reason:
type: string
state:
description: The user status
type: string
type: object
required:
- spec
type: object
version: v1alpha2
versions:
- name: v1alpha2
- additionalPrinterColumns:
- jsonPath: .spec.email
name: Email
type: string
- jsonPath: .status.state
name: Status
type: string
name: v1alpha2
schema:
openAPIV3Schema:
description: User is the Schema for the users API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: UserSpec defines the desired state of User
properties:
description:
description: Description of the user.
type: string
displayName:
type: string
email:
description: Unique email address(https://www.ietf.org/rfc/rfc5322.txt).
type: string
groups:
items:
type: string
type: array
lang:
description: The preferred written or spoken language for the user.
type: string
password:
description: 'password will be encrypted by mutating admission webhook
Password pattern is tricky here. The rule is simple: length between
[6,64], at least one uppercase letter, one lowercase letter, one
digit. The regexp in console(javascript) is quite straightforward:
^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{6,64}$ But in Go, we don''t have
?= (back tracking) capability in regexp (also in CRD validation
pattern) So we adopted an alternative scheme to achieve. Use 6 different
regexp to combine to achieve the same effect. These six schemes
enumerate the arrangement of numbers, uppercase letters, and lowercase
letters that appear for the first time. - ^(.*[a-z].*[A-Z].*[0-9].*)$
stands for lowercase letter comes first, then followed by an uppercase
letter, then a digit. - ^(.*[a-z].*[0-9].*[A-Z].*)$ stands for lowercase
letter comes first, then followed by a digit, then an uppercase
leeter. - ^(.*[A-Z].*[a-z].*[0-9].*)$ ... - ^(.*[A-Z].*[0-9].*[a-z].*)$
... - ^(.*[0-9].*[a-z].*[A-Z].*)$ ... - ^(.*[0-9].*[A-Z].*[a-z].*)$
... Last but not least, the bcrypt string is also included to match
the encrypted password. ^(\$2[ayb]\$.{56})$'
maxLength: 64
minLength: 6
pattern: ^(.*[a-z].*[A-Z].*[0-9].*)$|^(.*[a-z].*[0-9].*[A-Z].*)$|^(.*[A-Z].*[a-z].*[0-9].*)$|^(.*[A-Z].*[0-9].*[a-z].*)$|^(.*[0-9].*[a-z].*[A-Z].*)$|^(.*[0-9].*[A-Z].*[a-z].*)$|^(\$2[ayb]\$.{56})$
type: string
required:
- email
type: object
status:
description: UserStatus defines the observed state of User
properties:
lastLoginTime:
description: Last login attempt timestamp
format: date-time
type: string
lastTransitionTime:
format: date-time
type: string
reason:
type: string
state:
description: The user status
type: string
type: object
required:
- spec
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,10 +8,6 @@ metadata:
creationTimestamp: null
name: workspacerolebindings.iam.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
group: iam.kubesphere.io
names:
categories:
@@ -21,81 +17,85 @@ spec:
plural: workspacerolebindings
singular: workspacerolebinding
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: WorkspaceRoleBinding is the Schema for the workspacerolebindings
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
roleRef:
description: RoleRef can only reference a WorkspaceRole. If the RoleRef
cannot be resolved, the Authorizer must return an error.
properties:
apiGroup:
description: APIGroup is the group for the resource being referenced
type: string
kind:
description: Kind is the type of resource being referenced
type: string
name:
description: Name is the name of resource being referenced
type: string
required:
- apiGroup
- kind
- name
type: object
subjects:
description: Subjects holds references to the objects the role applies to.
items:
description: Subject contains a reference to the object or user identities
a role binding applies to. This can either hold a direct API object
reference, or a value for non-objects such as user and group names.
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
name: v1alpha2
schema:
openAPIV3Schema:
description: WorkspaceRoleBinding is the Schema for the workspacerolebindings
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
roleRef:
description: RoleRef can only reference a WorkspaceRole. If the RoleRef
cannot be resolved, the Authorizer must return an error.
properties:
apiGroup:
description: APIGroup holds the API group of the referenced subject.
Defaults to "" for ServiceAccount subjects. Defaults to "rbac.authorization.k8s.io"
for User and Group subjects.
description: APIGroup is the group for the resource being referenced
type: string
kind:
description: Kind of object being referenced. Values defined by this
API group are "User", "Group", and "ServiceAccount". If the Authorizer
does not recognized the kind value, the Authorizer should report
an error.
description: Kind is the type of resource being referenced
type: string
name:
description: Name of the object being referenced.
type: string
namespace:
description: Namespace of the referenced object. If the object kind
is non-namespace, such as "User" or "Group", and this value is not
empty the Authorizer should report an error.
description: Name is the name of resource being referenced
type: string
required:
- apiGroup
- kind
- name
type: object
type: array
required:
- roleRef
type: object
version: v1alpha2
versions:
- name: v1alpha2
subjects:
description: Subjects holds references to the objects the role applies
to.
items:
description: Subject contains a reference to the object or user identities
a role binding applies to. This can either hold a direct API object
reference, or a value for non-objects such as user and group names.
properties:
apiGroup:
description: APIGroup holds the API group of the referenced subject.
Defaults to "" for ServiceAccount subjects. Defaults to "rbac.authorization.k8s.io"
for User and Group subjects.
type: string
kind:
description: Kind of object being referenced. Values defined by
this API group are "User", "Group", and "ServiceAccount". If the
Authorizer does not recognized the kind value, the Authorizer
should report an error.
type: string
name:
description: Name of the object being referenced.
type: string
namespace:
description: Namespace of the referenced object. If the object
kind is non-namespace, such as "User" or "Group", and this value
is not empty the Authorizer should report an error.
type: string
required:
- kind
- name
type: object
type: array
required:
- roleRef
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -8,13 +8,6 @@ metadata:
creationTimestamp: null
name: workspaceroles.iam.kubesphere.io
spec:
additionalPrinterColumns:
- JSONPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
- JSONPath: .metadata.annotations.kubesphere\.io/alias-name
name: Alias
type: string
group: iam.kubesphere.io
names:
categories:
@@ -24,77 +17,83 @@ spec:
plural: workspaceroles
singular: workspacerole
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: Standard object's metadata.
type: object
rules:
description: Rules holds all the PolicyRules for this WorkspaceRole
items:
description: PolicyRule holds information that describes a policy rule,
but does not contain information about who the rule applies to or which
namespace the rule applies to.
properties:
apiGroups:
description: APIGroups is the name of the APIGroup that contains the
resources. If multiple API groups are specified, any action requested
against one of the enumerated resources in any API group will be
allowed.
items:
type: string
type: array
nonResourceURLs:
description: NonResourceURLs is a set of partial urls that a user
should have access to. *s are allowed, but only as the full, final
step in the path Since non-resource URLs are not namespaced, this
field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
Rules can either apply to API resources (such as "pods" or "secrets")
or non-resource URL paths (such as "/api"), but not both.
items:
type: string
type: array
resourceNames:
description: ResourceNames is an optional white list of names that
the rule applies to. An empty set means that everything is allowed.
items:
type: string
type: array
resources:
description: Resources is a list of resources this rule applies to. ResourceAll
represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
and AttributeRestrictions contained in this rule. VerbAll represents
all kinds.
items:
type: string
type: array
required:
- verbs
type: object
type: array
type: object
version: v1alpha2
versions:
- name: v1alpha2
- additionalPrinterColumns:
- jsonPath: .metadata.labels.kubesphere\.io/workspace
name: Workspace
type: string
- jsonPath: .metadata.annotations.kubesphere\.io/alias-name
name: Alias
type: string
name: v1alpha2
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
rules:
description: Rules holds all the PolicyRules for this WorkspaceRole
items:
description: PolicyRule holds information that describes a policy rule,
but does not contain information about who the rule applies to or
which namespace the rule applies to.
properties:
apiGroups:
description: APIGroups is the name of the APIGroup that contains
the resources. If multiple API groups are specified, any action
requested against one of the enumerated resources in any API group
will be allowed.
items:
type: string
type: array
nonResourceURLs:
description: NonResourceURLs is a set of partial urls that a user
should have access to. *s are allowed, but only as the full,
final step in the path Since non-resource URLs are not namespaced,
this field is only applicable for ClusterRoles referenced from
a ClusterRoleBinding. Rules can either apply to API resources
(such as "pods" or "secrets") or non-resource URL paths (such
as "/api"), but not both.
items:
type: string
type: array
resourceNames:
description: ResourceNames is an optional white list of names that
the rule applies to. An empty set means that everything is allowed.
items:
type: string
type: array
resources:
description: Resources is a list of resources this rule applies
to. ResourceAll represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
and AttributeRestrictions contained in this rule. VerbAll represents
all kinds.
items:
type: string
type: array
required:
- verbs
type: object
type: array
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

File diff suppressed because it is too large Load Diff

View File

@@ -1,763 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: destinationrules.istio.kubesphere.io
spec:
group: istio.kubesphere.io
names:
kind: DestinationRule
plural: destinationrules
scope: Namespaced
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
host:
description: 'REQUIRED. The name of a service from the service registry.
Service names are looked up from the platform''s service registry
(e.g., Kubernetes services, Consul services, etc.) and from the hosts
declared by [ServiceEntries](#ServiceEntry). Rules defined for services
that do not exist in the service registry will be ignored. *Note
for Kubernetes users*: When short names are used (e.g. "reviews" instead
of "reviews.default.svc.cluster.local"), Istio will interpret the
short name based on the namespace of the rule, not the service. A
rule in the "default" namespace containing a host "reviews will be
interpreted as "reviews.default.svc.cluster.local", irrespective of
the actual namespace associated with the reviews service. _To avoid
potential misconfigurations, it is recommended to always use fully
qualified domain names over short names._ Note that the host field
applies to both HTTP and TCP services.'
type: string
subsets:
description: One or more named sets that represent individual versions
of a service. Traffic policies can be overridden at subset level.
items:
properties:
labels:
description: REQUIRED. Labels apply a filter over the endpoints
of a service in the service registry. See route rules for examples
of usage.
type: object
name:
description: REQUIRED. Name of the subset. The service name and
the subset name can be used for traffic splitting in a route
rule.
type: string
trafficPolicy:
description: Traffic policies that apply to this subset. Subsets
inherit the traffic policies specified at the DestinationRule
level. Settings specified at the subset level will override
the corresponding settings specified at the DestinationRule
level.
properties:
connectionPool:
description: Settings controlling the volume of connections
to an upstream service
properties:
http:
description: HTTP connection pool settings.
properties:
maxRequestsPerConnection:
description: Maximum number of requests per connection
to a backend. Setting this parameter to 1 disables
keep alive.
format: int32
type: integer
maxRetries:
description: Maximum number of retries that can be
outstanding to all hosts in a cluster at a given
time. Defaults to 3.
format: int32
type: integer
type: object
tcp:
description: Settings common to both HTTP and TCP upstream
connections.
properties:
connectTimeout:
description: TCP connection timeout.
type: string
maxConnections:
description: Maximum number of HTTP1 /TCP connections
to a destination host.
format: int32
type: integer
type: object
type: object
loadBalancer:
description: Settings controlling the load balancer algorithms.
properties:
consistentHash:
properties:
httpCookie:
description: Hash based on HTTP cookie.
properties:
name:
description: REQUIRED. Name of the cookie.
type: string
path:
description: Path to set for the cookie.
type: string
ttl:
description: REQUIRED. Lifetime of the cookie.
type: string
required:
- name
- ttl
type: object
httpHeaderName:
description: 'It is required to specify exactly one
of the fields as hash key: HttpHeaderName, HttpCookie,
or UseSourceIP. Hash based on a specific HTTP header.'
type: string
minimumRingSize:
description: The minimum number of virtual nodes to
use for the hash ring. Defaults to 1024. Larger
ring sizes result in more granular load distributions.
If the number of hosts in the load balancing pool
is larger than the ring size, each host will be
assigned a single virtual node.
format: int64
type: integer
useSourceIp:
description: Hash based on the source IP address.
type: boolean
type: object
simple:
description: 'It is required to specify exactly one of
the fields: Simple or ConsistentHash'
type: string
type: object
outlierDetection:
description: Settings controlling eviction of unhealthy hosts
from the load balancing pool
properties:
baseEjectionTime:
description: 'Minimum ejection duration. A host will remain
ejected for a period equal to the product of minimum
ejection duration and the number of times the host has
been ejected. This technique allows the system to automatically
increase the ejection period for unhealthy upstream
servers. format: 1h/1m/1s/1ms. MUST BE >=1ms. Default
is 30s.'
type: string
consecutiveErrors:
description: Number of errors before a host is ejected
from the connection pool. Defaults to 5. When the upstream
host is accessed over HTTP, a 5xx return code qualifies
as an error. When the upstream host is accessed over
an opaque TCP connection, connect timeouts and connection
error/failure events qualify as an error.
format: int32
type: integer
interval:
description: 'Time interval between ejection sweep analysis.
format: 1h/1m/1s/1ms. MUST BE >=1ms. Default is 10s.'
type: string
maxEjectionPercent:
description: Maximum % of hosts in the load balancing
pool for the upstream service that can be ejected. Defaults
to 10%.
format: int32
type: integer
type: object
portLevelSettings:
description: Traffic policies specific to individual ports.
Note that port level settings will override the destination-level
settings. Traffic settings specified at the destination-level
will not be inherited when overridden by port-level settings,
i.e. default values will be applied to fields omitted in
port-level traffic policies.
items:
properties:
connectionPool:
description: Settings controlling the volume of connections
to an upstream service
properties:
http:
description: HTTP connection pool settings.
properties:
maxRequestsPerConnection:
description: Maximum number of requests per
connection to a backend. Setting this parameter
to 1 disables keep alive.
format: int32
type: integer
maxRetries:
description: Maximum number of retries that
can be outstanding to all hosts in a cluster
at a given time. Defaults to 3.
format: int32
type: integer
type: object
tcp:
description: Settings common to both HTTP and TCP
upstream connections.
properties:
connectTimeout:
description: TCP connection timeout.
type: string
maxConnections:
description: Maximum number of HTTP1 /TCP connections
to a destination host.
format: int32
type: integer
type: object
type: object
loadBalancer:
description: Settings controlling the load balancer
algorithms.
properties:
consistentHash:
properties:
httpCookie:
description: Hash based on HTTP cookie.
properties:
name:
description: REQUIRED. Name of the cookie.
type: string
path:
description: Path to set for the cookie.
type: string
ttl:
description: REQUIRED. Lifetime of the cookie.
type: string
required:
- name
- ttl
type: object
httpHeaderName:
description: 'It is required to specify exactly
one of the fields as hash key: HttpHeaderName,
HttpCookie, or UseSourceIP. Hash based on
a specific HTTP header.'
type: string
minimumRingSize:
description: The minimum number of virtual nodes
to use for the hash ring. Defaults to 1024.
Larger ring sizes result in more granular
load distributions. If the number of hosts
in the load balancing pool is larger than
the ring size, each host will be assigned
a single virtual node.
format: int64
type: integer
useSourceIp:
description: Hash based on the source IP address.
type: boolean
type: object
simple:
description: 'It is required to specify exactly
one of the fields: Simple or ConsistentHash'
type: string
type: object
outlierDetection:
description: Settings controlling eviction of unhealthy
hosts from the load balancing pool
properties:
baseEjectionTime:
description: 'Minimum ejection duration. A host
will remain ejected for a period equal to the
product of minimum ejection duration and the number
of times the host has been ejected. This technique
allows the system to automatically increase the
ejection period for unhealthy upstream servers.
format: 1h/1m/1s/1ms. MUST BE >=1ms. Default is
30s.'
type: string
consecutiveErrors:
description: Number of errors before a host is ejected
from the connection pool. Defaults to 5. When
the upstream host is accessed over HTTP, a 5xx
return code qualifies as an error. When the upstream
host is accessed over an opaque TCP connection,
connect timeouts and connection error/failure
events qualify as an error.
format: int32
type: integer
interval:
description: 'Time interval between ejection sweep
analysis. format: 1h/1m/1s/1ms. MUST BE >=1ms.
Default is 10s.'
type: string
maxEjectionPercent:
description: Maximum % of hosts in the load balancing
pool for the upstream service that can be ejected.
Defaults to 10%.
format: int32
type: integer
type: object
port:
description: Specifies the port name or number of a
port on the destination service on which this policy
is being applied. Names must comply with DNS label
syntax (rfc1035) and therefore cannot collide with
numbers. If there are multiple ports on a service
with the same protocol the names should be of the
form <protocol-name>-<DNS label>.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
tls:
description: TLS related settings for connections to
the upstream service.
properties:
caCertificates:
description: 'OPTIONAL: The path to the file containing
certificate authority certificates to use in verifying
a presented server certificate. If omitted, the
proxy will not verify the server''s certificate.
Should be empty if mode is `ISTIO_MUTUAL`.'
type: string
clientCertificate:
description: REQUIRED if mode is `MUTUAL`. The path
to the file holding the client-side TLS certificate
to use. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
mode:
description: 'REQUIRED: Indicates whether connections
to this port should be secured using TLS. The
value of this field determines how TLS is enforced.'
type: string
privateKey:
description: REQUIRED if mode is `MUTUAL`. The path
to the file holding the client's private key.
Should be empty if mode is `ISTIO_MUTUAL`.
type: string
sni:
description: SNI string to present to the server
during TLS handshake. Should be empty if mode
is `ISTIO_MUTUAL`.
type: string
subjectAltNames:
description: A list of alternate names to verify
the subject identity in the certificate. If specified,
the proxy will verify that the server certificate's
subject alt name matches one of the specified
values. Should be empty if mode is `ISTIO_MUTUAL`.
items:
type: string
type: array
required:
- mode
type: object
required:
- port
type: object
type: array
tls:
description: TLS related settings for connections to the upstream
service.
properties:
caCertificates:
description: 'OPTIONAL: The path to the file containing
certificate authority certificates to use in verifying
a presented server certificate. If omitted, the proxy
will not verify the server''s certificate. Should be
empty if mode is `ISTIO_MUTUAL`.'
type: string
clientCertificate:
description: REQUIRED if mode is `MUTUAL`. The path to
the file holding the client-side TLS certificate to
use. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
mode:
description: 'REQUIRED: Indicates whether connections
to this port should be secured using TLS. The value
of this field determines how TLS is enforced.'
type: string
privateKey:
description: REQUIRED if mode is `MUTUAL`. The path to
the file holding the client's private key. Should be
empty if mode is `ISTIO_MUTUAL`.
type: string
sni:
description: SNI string to present to the server during
TLS handshake. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
subjectAltNames:
description: A list of alternate names to verify the subject
identity in the certificate. If specified, the proxy
will verify that the server certificate's subject alt
name matches one of the specified values. Should be
empty if mode is `ISTIO_MUTUAL`.
items:
type: string
type: array
required:
- mode
type: object
type: object
required:
- name
- labels
type: object
type: array
trafficPolicy:
description: Traffic policies to apply (load balancing policy, connection
pool sizes, outlier detection).
properties:
connectionPool:
description: Settings controlling the volume of connections to an
upstream service
properties:
http:
description: HTTP connection pool settings.
properties:
maxRequestsPerConnection:
description: Maximum number of requests per connection to
a backend. Setting this parameter to 1 disables keep alive.
format: int32
type: integer
maxRetries:
description: Maximum number of retries that can be outstanding
to all hosts in a cluster at a given time. Defaults to
3.
format: int32
type: integer
type: object
tcp:
description: Settings common to both HTTP and TCP upstream connections.
properties:
connectTimeout:
description: TCP connection timeout.
type: string
maxConnections:
description: Maximum number of HTTP1 /TCP connections to
a destination host.
format: int32
type: integer
type: object
type: object
loadBalancer:
description: Settings controlling the load balancer algorithms.
properties:
consistentHash:
properties:
httpCookie:
description: Hash based on HTTP cookie.
properties:
name:
description: REQUIRED. Name of the cookie.
type: string
path:
description: Path to set for the cookie.
type: string
ttl:
description: REQUIRED. Lifetime of the cookie.
type: string
required:
- name
- ttl
type: object
httpHeaderName:
description: 'It is required to specify exactly one of the
fields as hash key: HttpHeaderName, HttpCookie, or UseSourceIP.
Hash based on a specific HTTP header.'
type: string
minimumRingSize:
description: The minimum number of virtual nodes to use
for the hash ring. Defaults to 1024. Larger ring sizes
result in more granular load distributions. If the number
of hosts in the load balancing pool is larger than the
ring size, each host will be assigned a single virtual
node.
format: int64
type: integer
useSourceIp:
description: Hash based on the source IP address.
type: boolean
type: object
simple:
description: 'It is required to specify exactly one of the fields:
Simple or ConsistentHash'
type: string
type: object
outlierDetection:
description: Settings controlling eviction of unhealthy hosts from
the load balancing pool
properties:
baseEjectionTime:
description: 'Minimum ejection duration. A host will remain
ejected for a period equal to the product of minimum ejection
duration and the number of times the host has been ejected.
This technique allows the system to automatically increase
the ejection period for unhealthy upstream servers. format:
1h/1m/1s/1ms. MUST BE >=1ms. Default is 30s.'
type: string
consecutiveErrors:
description: Number of errors before a host is ejected from
the connection pool. Defaults to 5. When the upstream host
is accessed over HTTP, a 5xx return code qualifies as an error.
When the upstream host is accessed over an opaque TCP connection,
connect timeouts and connection error/failure events qualify
as an error.
format: int32
type: integer
interval:
description: 'Time interval between ejection sweep analysis.
format: 1h/1m/1s/1ms. MUST BE >=1ms. Default is 10s.'
type: string
maxEjectionPercent:
description: Maximum % of hosts in the load balancing pool for
the upstream service that can be ejected. Defaults to 10%.
format: int32
type: integer
type: object
portLevelSettings:
description: Traffic policies specific to individual ports. Note
that port level settings will override the destination-level settings.
Traffic settings specified at the destination-level will not be
inherited when overridden by port-level settings, i.e. default
values will be applied to fields omitted in port-level traffic
policies.
items:
properties:
connectionPool:
description: Settings controlling the volume of connections
to an upstream service
properties:
http:
description: HTTP connection pool settings.
properties:
maxRequestsPerConnection:
description: Maximum number of requests per connection
to a backend. Setting this parameter to 1 disables
keep alive.
format: int32
type: integer
maxRetries:
description: Maximum number of retries that can be
outstanding to all hosts in a cluster at a given
time. Defaults to 3.
format: int32
type: integer
type: object
tcp:
description: Settings common to both HTTP and TCP upstream
connections.
properties:
connectTimeout:
description: TCP connection timeout.
type: string
maxConnections:
description: Maximum number of HTTP1 /TCP connections
to a destination host.
format: int32
type: integer
type: object
type: object
loadBalancer:
description: Settings controlling the load balancer algorithms.
properties:
consistentHash:
properties:
httpCookie:
description: Hash based on HTTP cookie.
properties:
name:
description: REQUIRED. Name of the cookie.
type: string
path:
description: Path to set for the cookie.
type: string
ttl:
description: REQUIRED. Lifetime of the cookie.
type: string
required:
- name
- ttl
type: object
httpHeaderName:
description: 'It is required to specify exactly one
of the fields as hash key: HttpHeaderName, HttpCookie,
or UseSourceIP. Hash based on a specific HTTP header.'
type: string
minimumRingSize:
description: The minimum number of virtual nodes to
use for the hash ring. Defaults to 1024. Larger
ring sizes result in more granular load distributions.
If the number of hosts in the load balancing pool
is larger than the ring size, each host will be
assigned a single virtual node.
format: int64
type: integer
useSourceIp:
description: Hash based on the source IP address.
type: boolean
type: object
simple:
description: 'It is required to specify exactly one of
the fields: Simple or ConsistentHash'
type: string
type: object
outlierDetection:
description: Settings controlling eviction of unhealthy hosts
from the load balancing pool
properties:
baseEjectionTime:
description: 'Minimum ejection duration. A host will remain
ejected for a period equal to the product of minimum
ejection duration and the number of times the host has
been ejected. This technique allows the system to automatically
increase the ejection period for unhealthy upstream
servers. format: 1h/1m/1s/1ms. MUST BE >=1ms. Default
is 30s.'
type: string
consecutiveErrors:
description: Number of errors before a host is ejected
from the connection pool. Defaults to 5. When the upstream
host is accessed over HTTP, a 5xx return code qualifies
as an error. When the upstream host is accessed over
an opaque TCP connection, connect timeouts and connection
error/failure events qualify as an error.
format: int32
type: integer
interval:
description: 'Time interval between ejection sweep analysis.
format: 1h/1m/1s/1ms. MUST BE >=1ms. Default is 10s.'
type: string
maxEjectionPercent:
description: Maximum % of hosts in the load balancing
pool for the upstream service that can be ejected. Defaults
to 10%.
format: int32
type: integer
type: object
port:
description: Specifies the port name or number of a port on
the destination service on which this policy is being applied. Names
must comply with DNS label syntax (rfc1035) and therefore
cannot collide with numbers. If there are multiple ports
on a service with the same protocol the names should be
of the form <protocol-name>-<DNS label>.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
tls:
description: TLS related settings for connections to the upstream
service.
properties:
caCertificates:
description: 'OPTIONAL: The path to the file containing
certificate authority certificates to use in verifying
a presented server certificate. If omitted, the proxy
will not verify the server''s certificate. Should be
empty if mode is `ISTIO_MUTUAL`.'
type: string
clientCertificate:
description: REQUIRED if mode is `MUTUAL`. The path to
the file holding the client-side TLS certificate to
use. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
mode:
description: 'REQUIRED: Indicates whether connections
to this port should be secured using TLS. The value
of this field determines how TLS is enforced.'
type: string
privateKey:
description: REQUIRED if mode is `MUTUAL`. The path to
the file holding the client's private key. Should be
empty if mode is `ISTIO_MUTUAL`.
type: string
sni:
description: SNI string to present to the server during
TLS handshake. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
subjectAltNames:
description: A list of alternate names to verify the subject
identity in the certificate. If specified, the proxy
will verify that the server certificate's subject alt
name matches one of the specified values. Should be
empty if mode is `ISTIO_MUTUAL`.
items:
type: string
type: array
required:
- mode
type: object
required:
- port
type: object
type: array
tls:
description: TLS related settings for connections to the upstream
service.
properties:
caCertificates:
description: 'OPTIONAL: The path to the file containing certificate
authority certificates to use in verifying a presented server
certificate. If omitted, the proxy will not verify the server''s
certificate. Should be empty if mode is `ISTIO_MUTUAL`.'
type: string
clientCertificate:
description: REQUIRED if mode is `MUTUAL`. The path to the file
holding the client-side TLS certificate to use. Should be
empty if mode is `ISTIO_MUTUAL`.
type: string
mode:
description: 'REQUIRED: Indicates whether connections to this
port should be secured using TLS. The value of this field
determines how TLS is enforced.'
type: string
privateKey:
description: REQUIRED if mode is `MUTUAL`. The path to the file
holding the client's private key. Should be empty if mode
is `ISTIO_MUTUAL`.
type: string
sni:
description: SNI string to present to the server during TLS
handshake. Should be empty if mode is `ISTIO_MUTUAL`.
type: string
subjectAltNames:
description: A list of alternate names to verify the subject
identity in the certificate. If specified, the proxy will
verify that the server certificate's subject alt name matches
one of the specified values. Should be empty if mode is `ISTIO_MUTUAL`.
items:
type: string
type: array
required:
- mode
type: object
type: object
required:
- host
type: object
required:
- spec
version: v1alpha3
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,129 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: gateways.istio.kubesphere.io
spec:
group: istio.kubesphere.io
names:
kind: Gateway
plural: gateways
scope: Namespaced
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
selector:
description: One or more labels that indicate a specific set of pods/VMs
on which this gateway configuration should be applied. If no selectors
are provided, the gateway will be implemented by the default istio-ingress
controller.
type: object
servers:
description: 'REQUIRED: A list of server specifications.'
items:
properties:
hosts:
description: A list of hosts exposed by this gateway. While typically
applicable to HTTP services, it can also be used for TCP services
using TLS with SNI. Standard DNS wildcard prefix syntax is permitted. A
VirtualService that is bound to a gateway must having a matching
host in its default destination. Specifically one of the VirtualService
destination hosts is a strict suffix of a gateway host or a
gateway host is a suffix of one of the VirtualService hosts.
items:
type: string
type: array
port:
description: 'REQUIRED: The Port on which the proxy should listen
for incoming connections'
properties:
name:
description: Label assigned to the port.
type: string
number:
description: 'REQUIRED: A valid non-negative integer port
number.'
format: int64
type: integer
protocol:
description: 'REQUIRED: The protocol exposed on the port.
MUST BE one of HTTP|HTTPS|GRPC|HTTP2|MONGO|TCP.'
type: string
required:
- number
- protocol
type: object
tls:
description: Set of TLS related options that govern the server's
behavior. Use these options to control if all http requests
should be redirected to https, and the TLS modes to use.
properties:
caCertificates:
description: REQUIRED if mode is "MUTUAL". The path to a file
containing certificate authority certificates to use in
verifying a presented client side certificate.
type: string
httpsRedirect:
description: If set to true, the load balancer will send a
302 redirect for all http connections, asking the clients
to use HTTPS.
type: boolean
mode:
description: 'Optional: Indicates whether connections to this
port should be secured using TLS. The value of this field
determines how TLS is enforced.'
type: string
privateKey:
description: REQUIRED if mode is "SIMPLE" or "MUTUAL". The
path to the file holding the server's private key.
type: string
serverCertificate:
description: REQUIRED if mode is "SIMPLE" or "MUTUAL". The
path to the file holding the server-side TLS certificate
to use.
type: string
subjectAltNames:
description: A list of alternate names to verify the subject
identity in the certificate presented by the client.
items:
type: string
type: array
required:
- httpsRedirect
- serverCertificate
- privateKey
- caCertificates
- subjectAltNames
type: object
required:
- port
type: object
type: array
required:
- servers
type: object
required:
- spec
version: v1alpha3
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,695 +0,0 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: virtualservices.istio.kubesphere.io
spec:
group: istio.kubesphere.io
names:
kind: VirtualService
plural: virtualservices
scope: Namespaced
validation:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
gateways:
description: The names of gateways and sidecars that should apply these
routes. A single VirtualService is used for sidecars inside the mesh
as well as for one or more gateways. The selection condition imposed
by this field can be overridden using the source field in the match
conditions of HTTP/TCP routes. The reserved word "mesh" is used to
imply all the sidecars in the mesh. When this field is omitted, the
default gateway ("mesh") will be used, which would apply the rule
to all sidecars in the mesh. If a list of gateway names is provided,
the rules will apply only to the gateways. To apply the rules to both
gateways and sidecars, specify "mesh" as one of the gateway names.
items:
type: string
type: array
hosts:
description: REQUIRED. The destination address for traffic captured
by this virtual service. Could be a DNS name with wildcard prefix
or a CIDR prefix. Depending on the platform, short-names can also
be used instead of a FQDN (i.e. has no dots in the name). In such
a scenario, the FQDN of the host would be derived based on the underlying
platform. For example on Kubernetes, when hosts contains a short
name, Istio will interpret the short name based on the namespace of
the rule. Thus, when a client namespace applies a rule in the "default"
namespace containing a name "reviews, Istio will setup routes to the
"reviews.default.svc.cluster.local" service. However, if a different
name such as "reviews.sales.svc.cluster.local" is used, it would be
treated as a FQDN during virtual host matching. In Consul, a plain
service name would be resolved to the FQDN "reviews.service.consul". Note
that the hosts field applies to both HTTP and TCP services. Service
inside the mesh, i.e., those found in the service registry, must always
be referred to using their alphanumeric names. IP addresses or CIDR
prefixes are allowed only for services defined via the Gateway.
items:
type: string
type: array
http:
description: An ordered list of route rules for HTTP traffic. The first
rule matching an incoming request is used.
items:
properties:
appendHeaders:
description: Additional HTTP headers to add before forwarding
a request to the destination service.
type: object
corsPolicy:
description: Cross-Origin Resource Sharing policy
properties:
allowCredentials:
description: Indicates whether the caller is allowed to send
the actual request (not the preflight) using credentials.
Translates to Access-Control-Allow-Credentials header.
type: boolean
allowHeaders:
description: List of HTTP headers that can be used when requesting
the resource. Serialized to Access-Control-Allow-Methods
header.
items:
type: string
type: array
allowMethods:
description: List of HTTP methods allowed to access the resource.
The content will be serialized into the Access-Control-Allow-Methods
header.
items:
type: string
type: array
allowOrigin:
description: The list of origins that are allowed to perform
CORS requests. The content will be serialized into the Access-Control-Allow-Origin
header. Wildcard * will allow all origins.
items:
type: string
type: array
exposeHeaders:
description: A white list of HTTP headers that the browsers
are allowed to access. Serialized into Access-Control-Expose-Headers
header.
items:
type: string
type: array
maxAge:
description: Specifies how long the the results of a preflight
request can be cached. Translates to the Access-Control-Max-Age
header.
type: string
type: object
fault:
description: Fault injection policy to apply on HTTP traffic.
properties:
abort:
description: Abort Http request attempts and return error
codes back to downstream service, giving the impression
that the upstream service is faulty.
properties:
httpStatus:
description: REQUIRED. HTTP status code to use to abort
the Http request.
format: int64
type: integer
percent:
description: Percentage of requests to be aborted with
the error code provided (0-100).
format: int64
type: integer
required:
- httpStatus
type: object
delay:
description: Delay requests before forwarding, emulating various
failures such as network issues, overloaded upstream service,
etc.
properties:
exponentialDelay:
description: (-- Add a delay (based on an exponential
function) before forwarding the request. mean delay
needed to derive the exponential delay values --)
type: string
fixedDelay:
description: 'REQUIRED. Add a fixed delay before forwarding
the request. Format: 1h/1m/1s/1ms. MUST be >=1ms.'
type: string
percent:
description: Percentage of requests on which the delay
will be injected (0-100).
format: int64
type: integer
required:
- fixedDelay
type: object
type: object
match:
description: Match conditions to be satisfied for the rule to
be activated. All conditions inside a single match block have
AND semantics, while the list of match blocks have OR semantics.
The rule is matched if any one of the match blocks succeed.
items:
properties:
authority:
description: 'HTTP Authority values are case-sensitive and
formatted as follows: - `exact: "value"` for exact string
match - `prefix: "value"` for prefix-based match - `regex:
"value"` for ECMAscript style regex-based match'
properties:
exact:
description: exact string match
type: string
prefix:
description: prefix-based match
type: string
regex:
description: ECMAscript style regex-based match
type: string
suffix:
description: suffix-based match.
type: string
type: object
gateways:
description: Names of gateways where the rule should be
applied to. Gateway names at the top of the VirtualService
(if any) are overridden. The gateway match is independent
of sourceLabels.
items:
type: string
type: array
headers:
description: 'The header keys must be lowercase and use
hyphen as the separator, e.g. _x-request-id_. Header
values are case-sensitive and formatted as follows: -
`exact: "value"` for exact string match - `prefix: "value"`
for prefix-based match - `regex: "value"` for ECMAscript
style regex-based match **Note:** The keys `uri`, `scheme`,
`method`, and `authority` will be ignored.'
type: object
method:
description: 'HTTP Method values are case-sensitive and
formatted as follows: - `exact: "value"` for exact string
match - `prefix: "value"` for prefix-based match - `regex:
"value"` for ECMAscript style regex-based match'
properties:
exact:
description: exact string match
type: string
prefix:
description: prefix-based match
type: string
regex:
description: ECMAscript style regex-based match
type: string
suffix:
description: suffix-based match.
type: string
type: object
port:
description: Specifies the ports on the host that is being
addressed. Many services only expose a single port or
label ports with the protocols they support, in these
cases it is not required to explicitly select the port.
format: int32
type: integer
scheme:
description: 'URI Scheme values are case-sensitive and formatted
as follows: - `exact: "value"` for exact string match -
`prefix: "value"` for prefix-based match - `regex: "value"`
for ECMAscript style regex-based match'
properties:
exact:
description: exact string match
type: string
prefix:
description: prefix-based match
type: string
regex:
description: ECMAscript style regex-based match
type: string
suffix:
description: suffix-based match.
type: string
type: object
sourceLabels:
description: One or more labels that constrain the applicability
of a rule to workloads with the given labels. If the VirtualService
has a list of gateways specified at the top, it should
include the reserved gateway `mesh` in order for this
field to be applicable.
type: object
uri:
description: 'URI to match values are case-sensitive and
formatted as follows: - `exact: "value"` for exact string
match - `prefix: "value"` for prefix-based match - `regex:
"value"` for ECMAscript style regex-based match'
properties:
exact:
description: exact string match
type: string
prefix:
description: prefix-based match
type: string
regex:
description: ECMAscript style regex-based match
type: string
suffix:
description: suffix-based match.
type: string
type: object
type: object
type: array
mirror:
description: Mirror HTTP traffic to a another destination in addition
to forwarding the requests to the intended destination. Mirrored
traffic is on a best effort basis where the sidecar/gateway
will not wait for the mirrored cluster to respond before returning
the response from the original destination. Statistics will
be generated for the mirrored destination.
properties:
host:
description: 'REQUIRED. The name of a service from the service
registry. Service names are looked up from the platform''s
service registry (e.g., Kubernetes services, Consul services,
etc.) and from the hosts declared by [ServiceEntry](#ServiceEntry).
Traffic forwarded to destinations that are not found in
either of the two, will be dropped. *Note for Kubernetes
users*: When short names are used (e.g. "reviews" instead
of "reviews.default.svc.cluster.local"), Istio will interpret
the short name based on the namespace of the rule, not the
service. A rule in the "default" namespace containing a
host "reviews will be interpreted as "reviews.default.svc.cluster.local",
irrespective of the actual namespace associated with the
reviews service. _To avoid potential misconfigurations,
it is recommended to always use fully qualified domain names
over short names._'
type: string
port:
description: Specifies the port on the host that is being
addressed. If a service exposes only a single port it is
not required to explicitly select the port.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
subset:
description: The name of a subset within the service. Applicable
only to services within the mesh. The subset must be defined
in a corresponding DestinationRule.
type: string
required:
- host
type: object
redirect:
description: A http rule can either redirect or forward (default)
traffic. If traffic passthrough option is specified in the rule,
route/redirect will be ignored. The redirect primitive can be
used to send a HTTP 302 redirect to a different URI or Authority.
properties:
authority:
description: On a redirect, overwrite the Authority/Host portion
of the URL with this value.
type: string
uri:
description: On a redirect, overwrite the Path portion of
the URL with this value. Note that the entire path will
be replaced, irrespective of the request URI being matched
as an exact path or prefix.
type: string
type: object
removeResponseHeaders:
description: Http headers to remove before returning the response
to the caller
type: object
retries:
description: Retry policy for HTTP requests.
properties:
attempts:
description: REQUIRED. Number of retries for a given request.
The interval between retries will be determined automatically
(25ms+). Actual number of retries attempted depends on the
httpReqTimeout.
format: int64
type: integer
perTryTimeout:
description: 'Timeout per retry attempt for a given request.
format: 1h/1m/1s/1ms. MUST BE >=1ms.'
type: string
required:
- attempts
- perTryTimeout
type: object
rewrite:
description: Rewrite HTTP URIs and Authority headers. Rewrite
cannot be used with Redirect primitive. Rewrite will be performed
before forwarding.
properties:
authority:
description: rewrite the Authority/Host header with this value.
type: string
uri:
description: rewrite the path (or the prefix) portion of the
URI with this value. If the original URI was matched based
on prefix, the value provided in this field will replace
the corresponding matched prefix.
type: string
type: object
route:
description: A http rule can either redirect or forward (default)
traffic. The forwarding target can be one of several versions
of a service (see glossary in beginning of document). Weights
associated with the service version determine the proportion
of traffic it receives.
items:
properties:
destination:
description: REQUIRED. Destination uniquely identifies the
instances of a service to which the request/connection
should be forwarded to.
properties:
host:
description: 'REQUIRED. The name of a service from the
service registry. Service names are looked up from
the platform''s service registry (e.g., Kubernetes
services, Consul services, etc.) and from the hosts
declared by [ServiceEntry](#ServiceEntry). Traffic
forwarded to destinations that are not found in either
of the two, will be dropped. *Note for Kubernetes
users*: When short names are used (e.g. "reviews"
instead of "reviews.default.svc.cluster.local"), Istio
will interpret the short name based on the namespace
of the rule, not the service. A rule in the "default"
namespace containing a host "reviews will be interpreted
as "reviews.default.svc.cluster.local", irrespective
of the actual namespace associated with the reviews
service. _To avoid potential misconfigurations, it
is recommended to always use fully qualified domain
names over short names._'
type: string
port:
description: Specifies the port on the host that is
being addressed. If a service exposes only a single
port it is not required to explicitly select the port.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
subset:
description: The name of a subset within the service.
Applicable only to services within the mesh. The subset
must be defined in a corresponding DestinationRule.
type: string
required:
- host
type: object
weight:
description: REQUIRED. The proportion of traffic to be forwarded
to the service version. (0-100). Sum of weights across
destinations SHOULD BE == 100. If there is only destination
in a rule, the weight value is assumed to be 100.
format: int64
type: integer
required:
- destination
- weight
type: object
type: array
timeout:
description: Timeout for HTTP requests.
type: string
websocketUpgrade:
description: Indicates that a HTTP/1.1 client connection to this
particular route should be allowed (and expected) to upgrade
to a WebSocket connection. The default is false. Istio's reference
sidecar implementation (Envoy) expects the first request to
this route to contain the WebSocket upgrade headers. Otherwise,
the request will be rejected. Note that Websocket allows secondary
protocol negotiation which may then be subject to further routing
rules based on the protocol selected.
type: boolean
type: object
type: array
tcp:
description: An ordered list of route rules for TCP traffic. The first
rule matching an incoming request is used.
items:
properties:
match:
description: Match conditions to be satisfied for the rule to
be activated. All conditions inside a single match block have
AND semantics, while the list of match blocks have OR semantics.
The rule is matched if any one of the match blocks succeed.
items:
properties:
destinationSubnets:
description: IPv4 or IPv6 ip address of destination with
optional subnet. E.g., a.b.c.d/xx form or just a.b.c.d.
items:
type: string
type: array
gateways:
description: Names of gateways where the rule should be
applied to. Gateway names at the top of the VirtualService
(if any) are overridden. The gateway match is independent
of sourceLabels.
items:
type: string
type: array
port:
description: Specifies the port on the host that is being
addressed. Many services only expose a single port or
label ports with the protocols they support, in these
cases it is not required to explicitly select the port.
format: int64
type: integer
sourceLabels:
description: One or more labels that constrain the applicability
of a rule to workloads with the given labels. If the VirtualService
has a list of gateways specified at the top, it should
include the reserved gateway `mesh` in order for this
field to be applicable.
type: object
type: object
type: array
route:
description: The destinations to which the connection should be
forwarded to. Weights must add to 100%.
items:
properties:
destination:
description: REQUIRED. Destination uniquely identifies the
instances of a service to which the request/connection
should be forwarded to.
properties:
host:
description: 'REQUIRED. The name of a service from the
service registry. Service names are looked up from
the platform''s service registry (e.g., Kubernetes
services, Consul services, etc.) and from the hosts
declared by [ServiceEntry](#ServiceEntry). Traffic
forwarded to destinations that are not found in either
of the two, will be dropped. *Note for Kubernetes
users*: When short names are used (e.g. "reviews"
instead of "reviews.default.svc.cluster.local"), Istio
will interpret the short name based on the namespace
of the rule, not the service. A rule in the "default"
namespace containing a host "reviews will be interpreted
as "reviews.default.svc.cluster.local", irrespective
of the actual namespace associated with the reviews
service. _To avoid potential misconfigurations, it
is recommended to always use fully qualified domain
names over short names._'
type: string
port:
description: Specifies the port on the host that is
being addressed. If a service exposes only a single
port it is not required to explicitly select the port.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
subset:
description: The name of a subset within the service.
Applicable only to services within the mesh. The subset
must be defined in a corresponding DestinationRule.
type: string
required:
- host
type: object
weight:
description: REQUIRED. The proportion of traffic to be forwarded
to the service version. (0-100). Sum of weights across
destinations SHOULD BE == 100. If there is only destination
in a rule, the weight value is assumed to be 100.
format: int64
type: integer
required:
- destination
- weight
type: object
type: array
required:
- match
- route
type: object
type: array
tls:
items:
properties:
match:
description: REQUIRED. Match conditions to be satisfied for the
rule to be activated. All conditions inside a single match block
have AND semantics, while the list of match blocks have OR semantics.
The rule is matched if any one of the match blocks succeed.
items:
properties:
destinationSubnets:
description: IPv4 or IPv6 ip addresses of destination with
optional subnet. E.g., a.b.c.d/xx form or just a.b.c.d.
items:
type: string
type: array
gateways:
description: Names of gateways where the rule should be
applied to. Gateway names at the top of the VirtualService
(if any) are overridden. The gateway match is independent
of sourceLabels.
items:
type: string
type: array
port:
description: Specifies the port on the host that is being
addressed. Many services only expose a single port or
label ports with the protocols they support, in these
cases it is not required to explicitly select the port.
format: int64
type: integer
sniHosts:
description: REQUIRED. SNI (server name indicator) to match
on. Wildcard prefixes can be used in the SNI value, e.g.,
*.com will match foo.example.com as well as example.com.
An SNI value must be a subset (i.e., fall within the domain)
of the corresponding virtual service's hosts
items:
type: string
type: array
sourceLabels:
description: One or more labels that constrain the applicability
of a rule to workloads with the given labels. If the VirtualService
has a list of gateways specified at the top, it should
include the reserved gateway `mesh` in order for this
field to be applicable.
type: object
required:
- sniHosts
type: object
type: array
route:
description: The destination to which the connection should be
forwarded to.
items:
properties:
destination:
description: REQUIRED. Destination uniquely identifies the
instances of a service to which the request/connection
should be forwarded to.
properties:
host:
description: 'REQUIRED. The name of a service from the
service registry. Service names are looked up from
the platform''s service registry (e.g., Kubernetes
services, Consul services, etc.) and from the hosts
declared by [ServiceEntry](#ServiceEntry). Traffic
forwarded to destinations that are not found in either
of the two, will be dropped. *Note for Kubernetes
users*: When short names are used (e.g. "reviews"
instead of "reviews.default.svc.cluster.local"), Istio
will interpret the short name based on the namespace
of the rule, not the service. A rule in the "default"
namespace containing a host "reviews will be interpreted
as "reviews.default.svc.cluster.local", irrespective
of the actual namespace associated with the reviews
service. _To avoid potential misconfigurations, it
is recommended to always use fully qualified domain
names over short names._'
type: string
port:
description: Specifies the port on the host that is
being addressed. If a service exposes only a single
port it is not required to explicitly select the port.
properties:
name:
description: Valid port name
type: string
number:
description: Valid port number
format: int32
type: integer
type: object
subset:
description: The name of a subset within the service.
Applicable only to services within the mesh. The subset
must be defined in a corresponding DestinationRule.
type: string
required:
- host
type: object
weight:
description: REQUIRED. The proportion of traffic to be forwarded
to the service version. (0-100). Sum of weights across
destinations SHOULD BE == 100. If there is only destination
in a rule, the weight value is assumed to be 100.
format: int64
type: integer
required:
- destination
- weight
type: object
type: array
required:
- match
- route
type: object
type: array
required:
- hosts
type: object
required:
- spec
version: v1alpha3
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,80 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: ipamblocks.network.kubesphere.io
spec:
group: network.kubesphere.io
names:
kind: IPAMBlock
listKind: IPAMBlockList
plural: ipamblocks
singular: ipamblock
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Specification of the IPAMBlock.
properties:
allocations:
items:
type: integer
type: array
attributes:
items:
properties:
handle_id:
type: string
secondary:
additionalProperties:
type: string
type: object
type: object
type: array
cidr:
type: string
deleted:
type: boolean
id:
format: int32
type: integer
unallocated:
items:
type: integer
type: array
required:
- allocations
- attributes
- cidr
- deleted
- id
- unallocated
type: object
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,59 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: ipamhandles.network.kubesphere.io
spec:
group: network.kubesphere.io
names:
kind: IPAMHandle
listKind: IPAMHandleList
plural: ipamhandles
singular: ipamhandle
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Specification of the IPAMHandle.
properties:
block:
additionalProperties:
type: integer
type: object
deleted:
type: boolean
handleID:
type: string
required:
- block
- deleted
- handleID
type: object
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -0,0 +1,136 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: ippools.network.kubesphere.io
spec:
group: network.kubesphere.io
names:
kind: IPPool
listKind: IPPoolList
plural: ippools
singular: ippool
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
blockSize:
description: The block size to use for IP address assignments from
this pool. Defaults to 26 for IPv4 and 112 for IPv6.
type: integer
cidr:
description: The pool CIDR.
type: string
disabled:
description: When disabled is true, IPAM will not assign addresses
from this pool.
type: boolean
dns:
description: DNS contains values interesting for DNS resolvers
properties:
domain:
type: string
nameservers:
items:
type: string
type: array
options:
items:
type: string
type: array
search:
items:
type: string
type: array
type: object
gateway:
type: string
rangeEnd:
description: The last ip, inclusive
type: string
rangeStart:
description: The first ip, inclusive
type: string
routes:
items:
properties:
dst:
type: string
gateway:
type: string
type: object
type: array
type:
type: string
vlanConfig:
properties:
master:
type: string
vlanId:
format: int32
type: integer
required:
- master
- vlanId
type: object
required:
- cidr
- type
type: object
status:
properties:
allocations:
type: integer
capacity:
type: integer
reserved:
type: integer
synced:
type: boolean
unallocated:
type: integer
workspaces:
additionalProperties:
properties:
allocations:
type: integer
required:
- allocations
type: object
type: object
required:
- allocations
- capacity
- unallocated
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -19,236 +19,263 @@ spec:
- nsnp
singular: namespacenetworkpolicy
scope: Namespaced
validation:
openAPIV3Schema:
description: NamespaceNetworkPolicy is the Schema for the namespacenetworkpolicies
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: NamespaceNetworkPolicySpec provides the specification of a
NamespaceNetworkPolicy
properties:
egress:
description: List of egress rules to be applied to the selected pods.
Outgoing traffic is allowed if there are no NetworkPolicies selecting
the pod (and cluster policy otherwise allows the traffic), OR if the
traffic matches at least one egress rule across all of the NetworkPolicy
objects whose podSelector matches the pod. If this field is empty
then this NetworkPolicy limits all outgoing traffic (and serves solely
to ensure that the pods it selects are isolated by default). This
field is beta-level in 1.8
items:
description: NetworkPolicyEgressRule describes a particular set of
traffic that is allowed out of pods matched by a NetworkPolicySpec's
podSelector. The traffic must match both ports and to. This type
is beta-level in 1.8
properties:
ports:
description: List of destination ports for outgoing traffic. Each
item in this list is combined using a logical OR. If this field
is empty or missing, this rule matches all ports (traffic not
restricted by port). If this field is present and contains at
least one item, then this rule allows traffic only if the traffic
matches at least one port in the list.
items:
description: NetworkPolicyPort describes a port to allow traffic
on
properties:
port:
anyOf:
- type: integer
- type: string
description: The port on the given protocol. This can either
be a numerical or named port on a pod. If this field is
not provided, this matches all port names and numbers.
x-kubernetes-int-or-string: true
protocol:
description: The protocol (TCP, UDP, or SCTP) which traffic
must match. If not specified, this field defaults to TCP.
type: string
type: object
type: array
to:
description: List of destinations for outgoing traffic of pods
selected for this rule. Items in this list are combined using
a logical OR operation. If this field is empty or missing, this
rule matches all destinations (traffic not restricted by destination).
If this field is present and contains at least one item, this
rule allows traffic only if the traffic matches at least one
item in the to list.
items:
description: NetworkPolicyPeer describes a peer to allow traffic
from. Only certain combinations of fields are allowed
properties:
ipBlock:
description: IPBlock defines policy on a particular IPBlock.
If this field is set then neither of the other fields
can be.
properties:
cidr:
description: CIDR is a string representing the IP Block
Valid examples are "192.168.1.1/24"
type: string
except:
description: Except is a slice of CIDRs that should
not be included within an IP Block Valid examples
are "192.168.1.1/24" Except values will be rejected
if they are outside the CIDR range
items:
type: string
type: array
required:
- cidr
type: object
namespace:
properties:
name:
type: string
required:
- name
type: object
service:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: object
type: array
type: object
type: array
ingress:
description: List of ingress rules to be applied to the selected pods.
Traffic is allowed to a pod if there are no NetworkPolicies selecting
the pod (and cluster policy otherwise allows the traffic), OR if the
traffic source is the pod's local node, OR if the traffic matches
at least one ingress rule across all of the NetworkPolicy objects
whose podSelector matches the pod. If this field is empty then this
NetworkPolicy does not allow any traffic (and serves solely to ensure
that the pods it selects are isolated by default)
items:
description: NetworkPolicyIngressRule describes a particular set of
traffic that is allowed to the pods matched by a NetworkPolicySpec's
podSelector. The traffic must match both ports and from.
properties:
from:
description: List of sources which should be able to access the
pods selected for this rule. Items in this list are combined
using a logical OR operation. If this field is empty or missing,
this rule matches all sources (traffic not restricted by source).
If this field is present and contains at least one item, this
rule allows traffic only if the traffic matches at least one
item in the from list.
items:
description: NetworkPolicyPeer describes a peer to allow traffic
from. Only certain combinations of fields are allowed
properties:
ipBlock:
description: IPBlock defines policy on a particular IPBlock.
If this field is set then neither of the other fields
can be.
properties:
cidr:
description: CIDR is a string representing the IP Block
Valid examples are "192.168.1.1/24"
type: string
except:
description: Except is a slice of CIDRs that should
not be included within an IP Block Valid examples
are "192.168.1.1/24" Except values will be rejected
if they are outside the CIDR range
items:
type: string
type: array
required:
- cidr
type: object
namespace:
properties:
name:
type: string
required:
- name
type: object
service:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: object
type: array
ports:
description: List of ports which should be made accessible on
the pods selected for this rule. Each item in this list is combined
using a logical OR. If this field is empty or missing, this
rule matches all ports (traffic not restricted by port). If
this field is present and contains at least one item, then this
rule allows traffic only if the traffic matches at least one
port in the list.
items:
description: NetworkPolicyPort describes a port to allow traffic
on
properties:
port:
anyOf:
- type: integer
- type: string
description: The port on the given protocol. This can either
be a numerical or named port on a pod. If this field is
not provided, this matches all port names and numbers.
x-kubernetes-int-or-string: true
protocol:
description: The protocol (TCP, UDP, or SCTP) which traffic
must match. If not specified, this field defaults to TCP.
type: string
type: object
type: array
type: object
type: array
policyTypes:
description: List of rule types that the NetworkPolicy relates to. Valid
options are "Ingress", "Egress", or "Ingress,Egress". If this field
is not specified, it will default based on the existence of Ingress
or Egress rules; policies that contain an Egress section are assumed
to affect Egress, and all policies (whether or not they contain an
Ingress section) are assumed to affect Ingress. If you want to write
an egress-only policy, you must explicitly specify policyTypes [ "Egress"
]. Likewise, if you want to write a policy that specifies that no
egress is allowed, you must specify a policyTypes value that include
"Egress" (since such a policy would not include an Egress section
and would otherwise default to just [ "Ingress" ]). This field is
beta-level in 1.8
items:
description: Policy Type string describes the NetworkPolicy type This
type is beta-level in 1.8
type: string
type: array
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: NamespaceNetworkPolicy is the Schema for the namespacenetworkpolicies
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: NamespaceNetworkPolicySpec provides the specification of
a NamespaceNetworkPolicy
properties:
egress:
description: List of egress rules to be applied to the selected pods.
Outgoing traffic is allowed if there are no NetworkPolicies selecting
the pod (and cluster policy otherwise allows the traffic), OR if
the traffic matches at least one egress rule across all of the NetworkPolicy
objects whose podSelector matches the pod. If this field is empty
then this NetworkPolicy limits all outgoing traffic (and serves
solely to ensure that the pods it selects are isolated by default).
This field is beta-level in 1.8
items:
description: NetworkPolicyEgressRule describes a particular set
of traffic that is allowed out of pods matched by a NetworkPolicySpec's
podSelector. The traffic must match both ports and to. This type
is beta-level in 1.8
properties:
ports:
description: List of destination ports for outgoing traffic.
Each item in this list is combined using a logical OR. If
this field is empty or missing, this rule matches all ports
(traffic not restricted by port). If this field is present
and contains at least one item, then this rule allows traffic
only if the traffic matches at least one port in the list.
items:
description: NetworkPolicyPort describes a port to allow traffic
on
properties:
endPort:
description: If set, indicates that the range of ports
from port to endPort, inclusive, should be allowed by
the policy. This field cannot be defined if the port
field is not defined or if the port field is defined
as a named (string) port. The endPort must be equal
or greater than port. This feature is in Alpha state
and should be enabled using the Feature Gate "NetworkPolicyEndPort".
format: int32
type: integer
port:
anyOf:
- type: integer
- type: string
description: The port on the given protocol. This can
either be a numerical or named port on a pod. If this
field is not provided, this matches all port names and
numbers. If present, only traffic on the specified protocol
AND port will be matched.
x-kubernetes-int-or-string: true
protocol:
default: TCP
description: The protocol (TCP, UDP, or SCTP) which traffic
must match. If not specified, this field defaults to
TCP.
type: string
type: object
type: array
to:
description: List of destinations for outgoing traffic of pods
selected for this rule. Items in this list are combined using
a logical OR operation. If this field is empty or missing,
this rule matches all destinations (traffic not restricted
by destination). If this field is present and contains at
least one item, this rule allows traffic only if the traffic
matches at least one item in the to list.
items:
description: NetworkPolicyPeer describes a peer to allow traffic
from. Only certain combinations of fields are allowed
properties:
ipBlock:
description: IPBlock defines policy on a particular IPBlock.
If this field is set then neither of the other fields
can be.
properties:
cidr:
description: CIDR is a string representing the IP
Block Valid examples are "192.168.1.1/24" or "2001:db9::/64"
type: string
except:
description: Except is a slice of CIDRs that should
not be included within an IP Block Valid examples
are "192.168.1.1/24" or "2001:db9::/64" Except values
will be rejected if they are outside the CIDR range
items:
type: string
type: array
required:
- cidr
type: object
namespace:
properties:
name:
type: string
required:
- name
type: object
service:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: object
type: array
type: object
type: array
ingress:
description: List of ingress rules to be applied to the selected pods.
Traffic is allowed to a pod if there are no NetworkPolicies selecting
the pod (and cluster policy otherwise allows the traffic), OR if
the traffic source is the pod's local node, OR if the traffic matches
at least one ingress rule across all of the NetworkPolicy objects
whose podSelector matches the pod. If this field is empty then this
NetworkPolicy does not allow any traffic (and serves solely to ensure
that the pods it selects are isolated by default)
items:
description: NetworkPolicyIngressRule describes a particular set
of traffic that is allowed to the pods matched by a NetworkPolicySpec's
podSelector. The traffic must match both ports and from.
properties:
from:
description: List of sources which should be able to access
the pods selected for this rule. Items in this list are combined
using a logical OR operation. If this field is empty or missing,
this rule matches all sources (traffic not restricted by source).
If this field is present and contains at least one item, this
rule allows traffic only if the traffic matches at least one
item in the from list.
items:
description: NetworkPolicyPeer describes a peer to allow traffic
from. Only certain combinations of fields are allowed
properties:
ipBlock:
description: IPBlock defines policy on a particular IPBlock.
If this field is set then neither of the other fields
can be.
properties:
cidr:
description: CIDR is a string representing the IP
Block Valid examples are "192.168.1.1/24" or "2001:db9::/64"
type: string
except:
description: Except is a slice of CIDRs that should
not be included within an IP Block Valid examples
are "192.168.1.1/24" or "2001:db9::/64" Except values
will be rejected if they are outside the CIDR range
items:
type: string
type: array
required:
- cidr
type: object
namespace:
properties:
name:
type: string
required:
- name
type: object
service:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: object
type: array
ports:
description: List of ports which should be made accessible on
the pods selected for this rule. Each item in this list is
combined using a logical OR. If this field is empty or missing,
this rule matches all ports (traffic not restricted by port).
If this field is present and contains at least one item, then
this rule allows traffic only if the traffic matches at least
one port in the list.
items:
description: NetworkPolicyPort describes a port to allow traffic
on
properties:
endPort:
description: If set, indicates that the range of ports
from port to endPort, inclusive, should be allowed by
the policy. This field cannot be defined if the port
field is not defined or if the port field is defined
as a named (string) port. The endPort must be equal
or greater than port. This feature is in Alpha state
and should be enabled using the Feature Gate "NetworkPolicyEndPort".
format: int32
type: integer
port:
anyOf:
- type: integer
- type: string
description: The port on the given protocol. This can
either be a numerical or named port on a pod. If this
field is not provided, this matches all port names and
numbers. If present, only traffic on the specified protocol
AND port will be matched.
x-kubernetes-int-or-string: true
protocol:
default: TCP
description: The protocol (TCP, UDP, or SCTP) which traffic
must match. If not specified, this field defaults to
TCP.
type: string
type: object
type: array
type: object
type: array
policyTypes:
description: List of rule types that the NetworkPolicy relates to.
Valid options are "Ingress", "Egress", or "Ingress,Egress". If this
field is not specified, it will default based on the existence of
Ingress or Egress rules; policies that contain an Egress section
are assumed to affect Egress, and all policies (whether or not they
contain an Ingress section) are assumed to affect Ingress. If you
want to write an egress-only policy, you must explicitly specify
policyTypes [ "Egress" ]. Likewise, if you want to write a policy
that specifies that no egress is allowed, you must specify a policyTypes
value that include "Egress" (since such a policy would not include
an Egress section and would otherwise default to just [ "Ingress"
]). This field is beta-level in 1.8
items:
description: PolicyType string describes the NetworkPolicy type
This type is beta-level in 1.8
type: string
type: array
type: object
type: object
served: true
storage: true
status:

View File

@@ -0,0 +1,191 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: resourcequotas.quota.kubesphere.io
spec:
group: quota.kubesphere.io
names:
categories:
- quota
kind: ResourceQuota
listKind: ResourceQuotaList
plural: resourcequotas
singular: resourcequota
scope: Cluster
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: WorkspaceResourceQuota sets aggregate quota restrictions enforced
per workspace
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Spec defines the desired quota
properties:
quota:
description: Quota defines the desired quota
properties:
hard:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'hard is the set of desired hard limits for each
named resource. More info: https://kubernetes.io/docs/concepts/policy/resource-quotas/'
type: object
scopeSelector:
description: scopeSelector is also a collection of filters like
scopes that must match each object tracked by a quota but expressed
using ScopeSelectorOperator in combination with possible values.
For a resource to match, both scopes AND scopeSelector (if specified
in spec), must be matched.
properties:
matchExpressions:
description: A list of scope selector requirements by scope
of the resources.
items:
description: A scoped-resource selector requirement is a
selector that contains values, a scope name, and an operator
that relates the scope name and values.
properties:
operator:
description: Represents a scope's relationship to a
set of values. Valid operators are In, NotIn, Exists,
DoesNotExist.
type: string
scopeName:
description: The name of the scope that the selector
applies to.
type: string
values:
description: An array of string values. If the operator
is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during
a strategic merge patch.
items:
type: string
type: array
required:
- operator
- scopeName
type: object
type: array
type: object
scopes:
description: A collection of filters that must match each object
tracked by a quota. If not specified, the quota matches all
objects.
items:
description: A ResourceQuotaScope defines a filter that must
match each object tracked by a quota
type: string
type: array
type: object
selector:
additionalProperties:
type: string
description: LabelSelector is used to select projects by label.
type: object
required:
- quota
- selector
type: object
status:
description: Status defines the actual enforced quota and its current
usage
properties:
namespaces:
description: Namespaces slices the usage by project.
items:
description: ResourceQuotaStatusByNamespace gives status for a particular
project
properties:
hard:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Hard is the set of enforced hard limits for each
named resource. More info: https://kubernetes.io/docs/concepts/policy/resource-quotas/'
type: object
namespace:
description: Namespace the project this status applies to
type: string
used:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Used is the current observed total usage of the
resource in the namespace.
type: object
required:
- namespace
type: object
type: array
total:
description: Total defines the actual enforced quota and its current
usage across all projects
properties:
hard:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Hard is the set of enforced hard limits for each
named resource. More info: https://kubernetes.io/docs/concepts/policy/resource-quotas/'
type: object
used:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Used is the current observed total usage of the resource
in the namespace.
type: object
type: object
required:
- namespaces
- total
type: object
required:
- spec
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,503 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/260"
creationTimestamp: null
name: volumesnapshotclasses.snapshot.storage.k8s.io
spec:
additionalPrinterColumns:
- JSONPath: .driver
name: Driver
type: string
- JSONPath: .deletionPolicy
description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass
should be deleted when its bound VolumeSnapshot is deleted.
name: DeletionPolicy
type: string
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: snapshot.storage.k8s.io
names:
kind: VolumeSnapshotClass
listKind: VolumeSnapshotClassList
plural: volumesnapshotclasses
singular: volumesnapshotclass
preserveUnknownFields: false
scope: Cluster
subresources: {}
validation:
openAPIV3Schema:
description: VolumeSnapshotClass specifies parameters that a underlying storage
system uses when creating a volume snapshot. A specific VolumeSnapshotClass
is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses
are non-namespaced
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
deletionPolicy:
description: deletionPolicy determines whether a VolumeSnapshotContent created
through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot
is deleted. Supported values are "Retain" and "Delete". "Retain" means
that the VolumeSnapshotContent and its physical snapshot on underlying
storage system are kept. "Delete" means that the VolumeSnapshotContent
and its physical snapshot on underlying storage system are deleted. Required.
enum:
- Delete
- Retain
type: string
driver:
description: driver is the name of the storage driver that handles this
VolumeSnapshotClass. Required.
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
parameters:
additionalProperties:
type: string
description: parameters is a key-value map with storage driver specific
parameters for creating snapshots. These values are opaque to Kubernetes.
type: object
required:
- deletionPolicy
- driver
type: object
version: v1beta1
versions:
- name: v1beta1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/260"
creationTimestamp: null
name: volumesnapshotcontents.snapshot.storage.k8s.io
spec:
additionalPrinterColumns:
- JSONPath: .status.readyToUse
description: Indicates if a snapshot is ready to be used to restore a volume.
name: ReadyToUse
type: boolean
- JSONPath: .status.restoreSize
description: Represents the complete size of the snapshot in bytes
name: RestoreSize
type: integer
- JSONPath: .spec.deletionPolicy
description: Determines whether this VolumeSnapshotContent and its physical snapshot
on the underlying storage system should be deleted when its bound VolumeSnapshot
is deleted.
name: DeletionPolicy
type: string
- JSONPath: .spec.driver
description: Name of the CSI driver used to create the physical snapshot on the
underlying storage system.
name: Driver
type: string
- JSONPath: .spec.volumeSnapshotClassName
description: Name of the VolumeSnapshotClass to which this snapshot belongs.
name: VolumeSnapshotClass
type: string
- JSONPath: .spec.volumeSnapshotRef.name
description: Name of the VolumeSnapshot object to which this VolumeSnapshotContent
object is bound.
name: VolumeSnapshot
type: string
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: snapshot.storage.k8s.io
names:
kind: VolumeSnapshotContent
listKind: VolumeSnapshotContentList
plural: volumesnapshotcontents
singular: volumesnapshotcontent
preserveUnknownFields: false
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: VolumeSnapshotContent represents the actual "on-disk" snapshot
object in the underlying storage system
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: spec defines properties of a VolumeSnapshotContent created
by the underlying storage system. Required.
properties:
deletionPolicy:
description: deletionPolicy determines whether this VolumeSnapshotContent
and its physical snapshot on the underlying storage system should
be deleted when its bound VolumeSnapshot is deleted. Supported values
are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent
and its physical snapshot on underlying storage system are kept. "Delete"
means that the VolumeSnapshotContent and its physical snapshot on
underlying storage system are deleted. In dynamic snapshot creation
case, this field will be filled in with the "DeletionPolicy" field
defined in the VolumeSnapshotClass the VolumeSnapshot refers to. For
pre-existing snapshots, users MUST specify this field when creating
the VolumeSnapshotContent object. Required.
enum:
- Delete
- Retain
type: string
driver:
description: driver is the name of the CSI driver used to create the
physical snapshot on the underlying storage system. This MUST be the
same as the name returned by the CSI GetPluginName() call for that
driver. Required.
type: string
source:
description: source specifies from where a snapshot will be created.
This field is immutable after creation. Required.
properties:
snapshotHandle:
description: snapshotHandle specifies the CSI "snapshot_id" of a
pre-existing snapshot on the underlying storage system. This field
is immutable.
type: string
volumeHandle:
description: volumeHandle specifies the CSI "volume_id" of the volume
from which a snapshot should be dynamically taken from. This field
is immutable.
type: string
type: object
volumeSnapshotClassName:
description: name of the VolumeSnapshotClass to which this snapshot
belongs.
type: string
volumeSnapshotRef:
description: volumeSnapshotRef specifies the VolumeSnapshot object to
which this VolumeSnapshotContent object is bound. VolumeSnapshot.Spec.VolumeSnapshotContentName
field must reference to this VolumeSnapshotContent's name for the
bidirectional binding to be valid. For a pre-existing VolumeSnapshotContent
object, name and namespace of the VolumeSnapshot object MUST be provided
for binding to happen. This field is immutable after creation. Required.
properties:
apiVersion:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead of an
entire object, this string should contain a valid JSON/Go field
access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container within
a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container that triggered
the event) or if no container name is specified "spec.containers[2]"
(container with index 2 in this pod). This syntax is chosen only
to have some well-defined way of referencing a part of an object.
TODO: this design is not final and this field is subject to change
in the future.'
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
type: string
namespace:
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
type: string
resourceVersion:
description: 'Specific resourceVersion to which this reference is
made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
required:
- deletionPolicy
- driver
- source
- volumeSnapshotRef
type: object
status:
description: status represents the current information of a snapshot.
properties:
creationTime:
description: creationTime is the timestamp when the point-in-time snapshot
is taken by the underlying storage system. In dynamic snapshot creation
case, this field will be filled in with the "creation_time" value
returned from CSI "CreateSnapshotRequest" gRPC call. For a pre-existing
snapshot, this field will be filled with the "creation_time" value
returned from the CSI "ListSnapshots" gRPC call if the driver supports
it. If not specified, it indicates the creation time is unknown. The
format of this field is a Unix nanoseconds time encoded as an int64.
On Unix, the command `date +%s%N` returns the current time in nanoseconds
since 1970-01-01 00:00:00 UTC.
format: int64
type: integer
error:
description: error is the latest observed error during snapshot creation,
if any.
properties:
message:
description: 'message is a string detailing the encountered error
during snapshot creation if specified. NOTE: message may be logged,
and it should not contain sensitive information.'
type: string
time:
description: time is the timestamp when the error was encountered.
format: date-time
type: string
type: object
readyToUse:
description: readyToUse indicates if a snapshot is ready to be used
to restore a volume. In dynamic snapshot creation case, this field
will be filled in with the "ready_to_use" value returned from CSI
"CreateSnapshotRequest" gRPC call. For a pre-existing snapshot, this
field will be filled with the "ready_to_use" value returned from the
CSI "ListSnapshots" gRPC call if the driver supports it, otherwise,
this field will be set to "True". If not specified, it means the readiness
of a snapshot is unknown.
type: boolean
restoreSize:
description: restoreSize represents the complete size of the snapshot
in bytes. In dynamic snapshot creation case, this field will be filled
in with the "size_bytes" value returned from CSI "CreateSnapshotRequest"
gRPC call. For a pre-existing snapshot, this field will be filled
with the "size_bytes" value returned from the CSI "ListSnapshots"
gRPC call if the driver supports it. When restoring a volume from
this snapshot, the size of the volume MUST NOT be smaller than the
restoreSize if it is specified, otherwise the restoration will fail.
If not specified, it indicates that the size is unknown.
format: int64
minimum: 0
type: integer
snapshotHandle:
description: snapshotHandle is the CSI "snapshot_id" of a snapshot on
the underlying storage system. If not specified, it indicates that
dynamic snapshot creation has either failed or it is still in progress.
type: string
type: object
required:
- spec
type: object
version: v1beta1
versions:
- name: v1beta1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/260"
creationTimestamp: null
name: volumesnapshots.snapshot.storage.k8s.io
spec:
additionalPrinterColumns:
- JSONPath: .status.readyToUse
description: Indicates if a snapshot is ready to be used to restore a volume.
name: ReadyToUse
type: boolean
- JSONPath: .spec.source.persistentVolumeClaimName
description: Name of the source PVC from where a dynamically taken snapshot will
be created.
name: SourcePVC
type: string
- JSONPath: .spec.source.volumeSnapshotContentName
description: Name of the VolumeSnapshotContent which represents a pre-provisioned
snapshot.
name: SourceSnapshotContent
type: string
- JSONPath: .status.restoreSize
description: Represents the complete size of the snapshot.
name: RestoreSize
type: string
- JSONPath: .spec.volumeSnapshotClassName
description: The name of the VolumeSnapshotClass requested by the VolumeSnapshot.
name: SnapshotClass
type: string
- JSONPath: .status.boundVolumeSnapshotContentName
description: The name of the VolumeSnapshotContent to which this VolumeSnapshot
is bound.
name: SnapshotContent
type: string
- JSONPath: .status.creationTime
description: Timestamp when the point-in-time snapshot is taken by the underlying
storage system.
name: CreationTime
type: date
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: snapshot.storage.k8s.io
names:
kind: VolumeSnapshot
listKind: VolumeSnapshotList
plural: volumesnapshots
singular: volumesnapshot
preserveUnknownFields: false
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: VolumeSnapshot is a user's request for either creating a point-in-time
snapshot of a persistent volume, or binding to a pre-existing snapshot.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: 'spec defines the desired characteristics of a snapshot requested
by a user. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshots#volumesnapshots
Required.'
properties:
source:
description: source specifies where a snapshot will be created from.
This field is immutable after creation. Required.
properties:
persistentVolumeClaimName:
description: persistentVolumeClaimName specifies the name of the
PersistentVolumeClaim object in the same namespace as the VolumeSnapshot
object where the snapshot should be dynamically taken from. This
field is immutable.
type: string
volumeSnapshotContentName:
description: volumeSnapshotContentName specifies the name of a pre-existing
VolumeSnapshotContent object. This field is immutable.
type: string
type: object
volumeSnapshotClassName:
description: 'volumeSnapshotClassName is the name of the VolumeSnapshotClass
requested by the VolumeSnapshot. If not specified, the default snapshot
class will be used if one exists. If not specified, and there is no
default snapshot class, dynamic snapshot creation will fail. Empty
string is not allowed for this field. TODO(xiangqian): a webhook validation
on empty string. More info: https://kubernetes.io/docs/concepts/storage/volume-snapshot-classes'
type: string
required:
- source
type: object
status:
description: 'status represents the current information of a snapshot. NOTE:
status can be modified by sources other than system controllers, and must
not be depended upon for accuracy. Controllers should only use information
from the VolumeSnapshotContent object after verifying that the binding
is accurate and complete.'
properties:
boundVolumeSnapshotContentName:
description: 'boundVolumeSnapshotContentName represents the name of
the VolumeSnapshotContent object to which the VolumeSnapshot object
is bound. If not specified, it indicates that the VolumeSnapshot object
has not been successfully bound to a VolumeSnapshotContent object
yet. NOTE: Specified boundVolumeSnapshotContentName alone does not
mean binding is valid. Controllers MUST always verify bidirectional
binding between VolumeSnapshot and VolumeSnapshotContent to
avoid possible security issues.'
type: string
creationTime:
description: creationTime is the timestamp when the point-in-time snapshot
is taken by the underlying storage system. In dynamic snapshot creation
case, this field will be filled in with the "creation_time" value
returned from CSI "CreateSnapshotRequest" gRPC call. For a pre-existing
snapshot, this field will be filled with the "creation_time" value
returned from the CSI "ListSnapshots" gRPC call if the driver supports
it. If not specified, it indicates that the creation time of the snapshot
is unknown.
format: date-time
type: string
error:
description: error is the last observed error during snapshot creation,
if any. This field could be helpful to upper level controllers(i.e.,
application controller) to decide whether they should continue on
waiting for the snapshot to be created based on the type of error
reported.
properties:
message:
description: 'message is a string detailing the encountered error
during snapshot creation if specified. NOTE: message may be logged,
and it should not contain sensitive information.'
type: string
time:
description: time is the timestamp when the error was encountered.
format: date-time
type: string
type: object
readyToUse:
description: readyToUse indicates if a snapshot is ready to be used
to restore a volume. In dynamic snapshot creation case, this field
will be filled in with the "ready_to_use" value returned from CSI
"CreateSnapshotRequest" gRPC call. For a pre-existing snapshot, this
field will be filled with the "ready_to_use" value returned from the
CSI "ListSnapshots" gRPC call if the driver supports it, otherwise,
this field will be set to "True". If not specified, it means the readiness
of a snapshot is unknown.
type: boolean
restoreSize:
anyOf:
- type: integer
- type: string
description: restoreSize represents the complete size of the snapshot
in bytes. In dynamic snapshot creation case, this field will be filled
in with the "size_bytes" value returned from CSI "CreateSnapshotRequest"
gRPC call. For a pre-existing snapshot, this field will be filled
with the "size_bytes" value returned from the CSI "ListSnapshots"
gRPC call if the driver supports it. When restoring a volume from
this snapshot, the size of the volume MUST NOT be smaller than the
restoreSize if it is specified, otherwise the restoration will fail.
If not specified, it indicates that the size is unknown.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
required:
- spec
type: object
version: v1beta1
versions:
- name: v1beta1
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -14,94 +14,104 @@ spec:
listKind: ProvisionerCapabilityList
plural: provisionercapabilities
singular: provisionercapability
scope: Namespaced
validation:
openAPIV3Schema:
description: ProvisionerCapability is the schema for the provisionercapability
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ProvisionerCapabilitySpec defines the desired state of ProvisionerCapability
properties:
features:
description: CapabilityFeatures describe storage features
properties:
snapshot:
description: SnapshotFeature describe snapshot features
properties:
create:
type: boolean
list:
type: boolean
required:
- create
- list
type: object
topology:
type: boolean
volume:
description: VolumeFeature describe volume features
properties:
attach:
type: boolean
clone:
type: boolean
create:
type: boolean
expandMode:
type: string
list:
type: boolean
stats:
type: boolean
required:
- attach
- clone
- create
- expandMode
- list
- stats
type: object
required:
- snapshot
- topology
- volume
type: object
pluginInfo:
description: PluginInfo describes plugin info
properties:
name:
type: string
version:
type: string
required:
- name
- version
type: object
required:
- features
- pluginInfo
type: object
required:
- spec
type: object
version: v1alpha1
scope: Cluster
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .spec.pluginInfo.name
name: Provisioner
type: string
- jsonPath: .spec.features.volume.expandMode
name: Expand
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: ProvisionerCapability is the schema for the provisionercapability
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ProvisionerCapabilitySpec defines the desired state of ProvisionerCapability
properties:
features:
description: CapabilityFeatures describe storage features
properties:
snapshot:
description: SnapshotFeature describe snapshot features
properties:
create:
type: boolean
list:
type: boolean
required:
- create
- list
type: object
topology:
type: boolean
volume:
description: VolumeFeature describe volume features
properties:
attach:
type: boolean
clone:
type: boolean
create:
type: boolean
expandMode:
type: string
list:
type: boolean
stats:
type: boolean
required:
- attach
- clone
- create
- expandMode
- list
- stats
type: object
required:
- snapshot
- topology
- volume
type: object
pluginInfo:
description: PluginInfo describes plugin info
properties:
name:
type: string
version:
type: string
required:
- name
- version
type: object
required:
- features
- pluginInfo
type: object
required:
- spec
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -14,85 +14,104 @@ spec:
listKind: StorageClassCapabilityList
plural: storageclasscapabilities
singular: storageclasscapability
scope: Namespaced
validation:
openAPIV3Schema:
description: StorageClassCapability is the Schema for the storage class capability
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: StorageClassCapabilitySpec defines the desired state of StorageClassCapability
properties:
features:
description: CapabilityFeatures describe storage features
properties:
snapshot:
description: SnapshotFeature describe snapshot features
properties:
create:
type: boolean
list:
type: boolean
required:
- create
- list
type: object
topology:
type: boolean
volume:
description: VolumeFeature describe volume features
properties:
attach:
type: boolean
clone:
type: boolean
create:
type: boolean
expandMode:
type: string
list:
type: boolean
stats:
type: boolean
required:
- attach
- clone
- create
- expandMode
- list
- stats
type: object
required:
- snapshot
- topology
- volume
type: object
provisioner:
type: string
required:
- features
- provisioner
type: object
required:
- spec
type: object
version: v1alpha1
scope: Cluster
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .spec.provisioner
name: Provisioner
type: string
- jsonPath: .spec.features.volume.create
name: Volume
type: boolean
- jsonPath: .spec.features.volume.expandMode
name: Expand
type: string
- jsonPath: .spec.features.volume.clone
name: Clone
type: boolean
- jsonPath: .spec.features.snapshot.create
name: Snapshot
type: boolean
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: StorageClassCapability is the Schema for the storage class capability
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: StorageClassCapabilitySpec defines the desired state of StorageClassCapability
properties:
features:
description: CapabilityFeatures describe storage features
properties:
snapshot:
description: SnapshotFeature describe snapshot features
properties:
create:
type: boolean
list:
type: boolean
required:
- create
- list
type: object
topology:
type: boolean
volume:
description: VolumeFeature describe volume features
properties:
attach:
type: boolean
clone:
type: boolean
create:
type: boolean
expandMode:
type: string
list:
type: boolean
stats:
type: boolean
required:
- attach
- clone
- create
- expandMode
- list
- stats
type: object
required:
- snapshot
- topology
- volume
type: object
provisioner:
type: string
required:
- features
- provisioner
type: object
required:
- spec
type: object
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""

View File

@@ -0,0 +1,180 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
creationTimestamp: null
name: accessors.storage.kubesphere.io
spec:
group: storage.kubesphere.io
names:
kind: Accessor
listKind: AccessorList
plural: accessors
singular: accessor
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.storageClassName
name: StorageClass
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: Accessor is the Schema for the accessors API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: AccessorSpec defines the desired state of Accessor
properties:
namespaceSelector:
properties:
fieldSelector:
items:
properties:
fieldExpressions:
items:
properties:
field:
enum:
- Name
- Status
type: string
operator:
enum:
- In
- NotIn
type: string
values:
items:
type: string
type: array
required:
- field
- operator
- values
type: object
type: array
required:
- fieldExpressions
type: object
type: array
labelSelector:
items:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
enum:
- In
- NotIn
type: string
values:
items:
type: string
type: array
required:
- key
- operator
- values
type: object
type: array
required:
- matchExpressions
type: object
type: array
type: object
storageClassName:
type: string
workspaceSelector:
properties:
fieldSelector:
items:
properties:
fieldExpressions:
items:
properties:
field:
enum:
- Name
- Status
type: string
operator:
enum:
- In
- NotIn
type: string
values:
items:
type: string
type: array
required:
- field
- operator
- values
type: object
type: array
required:
- fieldExpressions
type: object
type: array
labelSelector:
items:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
enum:
- In
- NotIn
type: string
values:
items:
type: string
type: array
required:
- key
- operator
- values
type: object
type: array
required:
- matchExpressions
type: object
type: array
type: object
required:
- storageClassName
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,37 +17,36 @@ spec:
plural: workspaces
singular: workspace
scope: Cluster
validation:
openAPIV3Schema:
description: Workspace is the Schema for the workspaces API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: WorkspaceSpec defines the desired state of Workspace
properties:
manager:
type: string
networkIsolation:
type: boolean
type: object
status:
description: WorkspaceStatus defines the observed state of Workspace
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Workspace is the Schema for the workspaces API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: WorkspaceSpec defines the desired state of Workspace
properties:
manager:
type: string
networkIsolation:
type: boolean
type: object
status:
description: WorkspaceStatus defines the observed state of Workspace
type: object
type: object
served: true
storage: true
status:

View File

@@ -1,6 +1,6 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
@@ -17,90 +17,126 @@ spec:
plural: workspacetemplates
singular: workspacetemplate
scope: Cluster
validation:
openAPIV3Schema:
description: WorkspaceTemplate is the Schema for the workspacetemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
overrides:
items:
properties:
clusterName:
type: string
clusterOverrides:
items:
properties:
op:
type: string
path:
type: string
value:
type: object
required:
- path
- value
type: object
type: array
required:
- clusterName
- clusterOverrides
type: object
type: array
placement:
properties:
clusterSelector:
properties:
matchLabels:
additionalProperties:
type: string
type: object
type: object
clusters:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
type: object
template:
properties:
metadata:
type: object
spec:
description: WorkspaceSpec defines the desired state of Workspace
properties:
manager:
type: string
networkIsolation:
type: boolean
type: object
required:
- spec
type: object
required:
- placement
- template
type: object
type: object
version: v1alpha2
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: WorkspaceTemplate is the Schema for the workspacetemplates API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
overrides:
items:
properties:
clusterName:
type: string
clusterOverrides:
items:
properties:
op:
type: string
path:
type: string
value:
type: object
x-kubernetes-preserve-unknown-fields: true
required:
- path
type: object
type: array
required:
- clusterName
type: object
type: array
placement:
properties:
clusterSelector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An
empty label selector matches all objects. A null label selector
matches no objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that relates
the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In, NotIn,
Exists and DoesNotExist.
type: string
values:
description: values is an array of string values. If
the operator is In or NotIn, the values array must
be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced
during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A
single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field is "key",
the operator is "In", and the values array contains only
"value". The requirements are ANDed.
type: object
type: object
clusters:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
type: object
template:
properties:
metadata:
type: object
spec:
description: WorkspaceSpec defines the desired state of Workspace
properties:
manager:
type: string
networkIsolation:
type: boolean
type: object
type: object
required:
- placement
- template
type: object
type: object
served: true
storage: true
status:

View File

@@ -1,49 +0,0 @@
# Add namespace to all resources.
namespace: t-system
# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: t-
# Labels to add to all resources and selectors.
#commonLabels:
# someName: someValue
# Each entry in this list must resolve to an existing
# resource definition in YAML. These are the resource
# files that kustomize reads, modifies and emits as a
# YAML string, with resources separated by document
# markers ("---").
resources:
- ../rbac/rbac_role.yaml
- ../rbac/rbac_role_binding.yaml
- ../manager/manager.yaml
# Comment the following 3 lines if you want to disable
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
# which protects your /metrics endpoint.
#- ../rbac/auth_proxy_service.yaml
#- ../rbac/auth_proxy_role.yaml
#- ../rbac/auth_proxy_role_binding.yaml
patches:
- manager_image_patch.yaml
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.
- manager_auth_proxy_patch.yaml
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, uncomment the following line and
# comment manager_auth_proxy_patch.yaml.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.
#- manager_prometheus_metrics_patch.yaml
vars:
- name: WEBHOOK_SECRET_NAME
objref:
kind: Secret
name: webhook-server-secret
apiVersion: v1

View File

@@ -1,24 +0,0 @@
# This patch injects a sidecar container which is an HTTP proxy for the controller manager.
# It performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
containers:
- name: kube-rbac-proxy
image: quay.io/coreos/kube-rbac-proxy:v0.4.0
args:
- "--secure-listen-address=0.0.0.0:8443"
- "--upstream=http://127.0.0.1:8080/"
- "--logtostderr=true"
- "--v=10"
ports:
- containerPort: 8443
name: https
- name: manager
args:
- "--metrics-addr=127.0.0.1:8080"

View File

@@ -1,12 +0,0 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
spec:
template:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: kubespheredev/controller-manager:latest
name: manager

View File

@@ -1,19 +0,0 @@
# This patch enables Prometheus scraping for the manager pod.
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
spec:
template:
metadata:
annotations:
prometheus.io/scrape: 'true'
spec:
containers:
# Expose the prometheus metrics on default port
- name: manager
ports:
- containerPort: 8080
name: metrics
protocol: TCP

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-aws-ebs
spec:
pluginInfo:
name: kubernetes.io/aws-ebs
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: ONLINE
snapshot:
create: false
list: false

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-azure-disk
spec:
pluginInfo:
name: kubernetes.io/azure-disk
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: OFFLINE
snapshot:
create: false
list: false

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-azure-file
spec:
pluginInfo:
name: kubernetes.io/azure-file
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: OFFLINE
snapshot:
create: false
list: false

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-cinder
spec:
pluginInfo:
name: kubernetes.io/cinder
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: ONLINE
snapshot:
create: false
list: false

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-gce-pd
spec:
pluginInfo:
name: kubernetes.io/gce-pd
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: ONLINE
snapshot:
create: false
list: false

View File

@@ -1,20 +0,0 @@
apiVersion: storage.kubesphere.io/v1alpha1
kind: ProvisionerCapability
metadata:
name: kubernetes-io-glusterfs
spec:
pluginInfo:
name: kubernetes.io/glusterfs
version: ""
features:
topology: false
volume:
create: true
attach: true
clone: false
list: false
stats: false
expandMode: OFFLINE
snapshot:
create: false
list: false

Some files were not shown because too many files have changed in this diff Show More