Compare commits

..

1059 Commits

Author SHA1 Message Date
Zexi Li
dd93784606 Merge pull request #10977 from zhasm/automated-cherry-pick-of-#10975-upstream-release-3.6
Automated cherry pick of #10975: feat(arm64,build): arm 编译时,不编译 rbdcli
2021-05-06 15:13:07 +08:00
Zhang Dongliang
aebe35a853 feat(arm64,build): arm 编译时,不编译 rbdcli 2021-05-06 11:47:12 +08:00
Zexi Li
39a944d5d5 Merge pull request #10958 from ioito/automated-cherry-pick-of-#10956-upstream-release-3.6
Automated cherry pick of #10956: fix: avoid host worker is locked when image cache is deleted
2021-04-28 09:56:17 +08:00
yunion-ci-robot
dc2e87a74f Merge pull request #10961 from swordqiu/automated-cherry-pick-of-#10940-upstream-release-3.6
Automated cherry pick of #10940: Hotfix/qj import user require password
2021-04-28 09:55:28 +08:00
Qiu Jian
c3d0b0fe1f fix: require password for imported user 2021-04-28 01:14:19 +08:00
Qu Xuan
adff20026e fix: avoid host worker is locked when image cache is deleted 2021-04-27 20:38:26 +08:00
Zexi Li
d1318d10e3 Merge pull request #10943 from zexi/automated-cherry-pick-of-#10941-upstream-release-3.6
Automated cherry pick of #10941: fix(region): download cached image from source host before migrating
2021-04-27 20:10:10 +08:00
Zexi Li
92ac613717 Merge pull request #10950 from ioito/automated-cherry-pick-of-#10944-upstream-release-3.6
Automated cherry pick of #10944: fix(region): tag list key case insensitive
2021-04-27 17:21:15 +08:00
Zexi Li
243953ba6a fix(region): download cached image from source host before migrating 2021-04-27 17:14:53 +08:00
Qu Xuan
1dc421a6db fix(region): tag list key case insensitive 2021-04-27 11:58:30 +08:00
Zexi Li
64e1116b32 Merge pull request #10939 from swordqiu/automated-cherry-pick-of-#10937-upstream-release-3.6
Automated cherry pick of #10937: fix(baremetal,esxiagent): no cloudroot user initialized
2021-04-27 10:17:24 +08:00
Zexi Li
c8073bdd75 Merge pull request #10936 from swordqiu/automated-cherry-pick-of-#10934-upstream-release-3.6
Automated cherry pick of #10934: fix(region): add all.servers.any_pool/all.hosts.any_pool metrics
2021-04-27 10:16:30 +08:00
Qiu Jian
da585a7b35 fix(baremetal,esxiagent): no cloudroot user initialized 2021-04-27 02:00:32 +08:00
Qiu Jian
da0a7c7b6e fix(region): add all.servers.any_pool/all.hosts.any_pool metrics 2021-04-27 01:49:58 +08:00
Zexi Li
37aa862950 Merge pull request #10924 from ioito/automated-cherry-pick-of-#10922-upstream-release-3.6
Automated cherry pick of #10922: fix(keystone): tag list for keystone service
2021-04-26 19:11:02 +08:00
Zexi Li
e55220cd11 Merge pull request #10930 from ioito/automated-cherry-pick-of-#10928-upstream-release-3.6
Automated cherry pick of #10928: fix(region): account arrears
2021-04-26 19:08:25 +08:00
Qu Xuan
9dfb23c281 fix(region): account arrears 2021-04-26 18:03:15 +08:00
Qu Xuan
8504d364ff fix(keystone): tag list for keystone service 2021-04-26 11:40:49 +08:00
Zexi Li
6aebdcec1f Merge pull request #10908 from rainzm/automated-cherry-pick-of-#10906-upstream-release-3.6
Automated cherry pick of #10906: fix(region): use special localtask to run time-consuming provider synchronization task
2021-04-23 17:39:22 +08:00
rainzm
aa539bff9e fix(region): use special localtask to run time-consuming provider synchronization task
CloudProviderSyncInfoTask will local cloudprovider. Make locaktask run
time-consuming task can avoid holding locks for a long time.
2021-04-23 16:50:04 +08:00
Zexi Li
4a59e25772 Merge pull request #10873 from rainzm/tk/preparenets
Support direct detection and creation of network for vmware
2021-04-22 21:10:25 +08:00
Zexi Li
f68601d1b9 Merge pull request #10895 from rainzm/automated-cherry-pick-of-#10893-upstream-release-3.6
Automated cherry pick of #10893: fix(region): allow owner to operate snapshotpolicy cache
2021-04-22 21:09:42 +08:00
Zexi Li
2eeecf9e68 Merge pull request #10899 from rainzm/automated-cherry-pick-of-#10897-upstream-release-3.6
Automated cherry pick of #10897: fix(region): make SScheduledTaskLabel implement IJointModelManager
2021-04-22 21:08:29 +08:00
rainzm
75a007ea19 fix(region): make SScheduledTaskLabel implement IJointModelManager 2021-04-22 18:21:37 +08:00
rainzm
f3ae127f2c feat(region): support to specify zone for the created wire 2021-04-22 17:58:00 +08:00
rainzm
b95b553b9b fix(region): allow owner to operate snapshotpolicy cache 2021-04-22 17:39:16 +08:00
Zexi Li
7d1f968044 Merge pull request #10890 from ioito/automated-cherry-pick-of-#10888-upstream-release-3.6
Automated cherry pick of #10888: fix(region): avoid panic when sync resources
2021-04-22 16:52:47 +08:00
Zexi Li
7ce8ef8ab0 Merge pull request #10884 from ioito/automated-cherry-pick-of-#10882-upstream-release-3.6
Automated cherry pick of #10882: fix(common): add debug info for lock
2021-04-22 16:51:39 +08:00
Qu Xuan
7c90d219b3 fix(region): avoid panic when sync resources 2021-04-22 16:29:41 +08:00
Qu Xuan
91141d6432 fix(common): add debug info for lock 2021-04-22 16:10:30 +08:00
Zexi Li
0e5459c669 Merge pull request #10869 from ioito/automated-cherry-pick-of-#10867-upstream-release-3.6
Automated cherry pick of #10867: fix(region): avoid network create failed when vpc is ok but wire not sync
2021-04-22 10:24:26 +08:00
Zexi Li
fc61c093e3 Merge pull request #10880 from ioito/automated-cherry-pick-of-#10878-upstream-release-3.6
Automated cherry pick of #10878: fix(region): add egress_mbps params for lb
2021-04-22 10:23:39 +08:00
rainzm
b595f59ef8 fix(region): Refuse to recommend the corresponding network for the ip that crosses the limit 2021-04-22 09:59:36 +08:00
rainzm
07292089fa feat(region): support creating a network with a native vmware network name 2021-04-22 09:59:33 +08:00
Qu Xuan
df79388ded fix(region): add egress_mbps params for lb 2021-04-21 21:46:06 +08:00
Zexi Li
c84dd96fff Merge pull request #10865 from rainzm/automated-cherry-pick-of-#10863-upstream-release-3.6
Automated cherry pick of #10863: fix(region): make cloudprovider sync worker configurable
2021-04-21 15:30:24 +08:00
Qu Xuan
cfef1fe2a3 fix(region): avoid network create failed when vpc is ok but wire not sync 2021-04-21 14:52:52 +08:00
rainzm
46517ebd13 fix(region): make cloudprovider sync worker configurable
这个参数意味着,同时允许多少个 provider 来把自己同步的 region 任务放进后
面的队列。
进一步说,配置数量之外的 provider 必须等待前面的 provider 同步完所有的 region
之后,才有机会开始同步自己的region。
此限制的必要性不高,所以默认值设置比较大,为"10"。
2021-04-21 12:24:01 +08:00
Zexi Li
7093cd6db2 Merge pull request #10836 from zexi/automated-cherry-pick-of-#10833-upstream-release-3.6
Automated cherry pick of #10833: fix(region): fetch cached image from glance by default
2021-04-21 11:19:20 +08:00
Zexi Li
71f0b9e2df Merge pull request #10857 from swordqiu/automated-cherry-pick-of-#10855-upstream-release-3.6
Automated cherry pick of #10855: fix(baremetal): baremetal ipmi probe reset link up state
2021-04-21 10:12:55 +08:00
Zexi Li
aca33fe970 Merge pull request #10853 from rainzm/automated-cherry-pick-of-#10851-upstream-release-3.6
Automated cherry pick of #10851: fix(region): avoid using LocalTaskWorker in time-consuming synchronization of cloudaccount
2021-04-21 10:09:48 +08:00
Qiu Jian
906a591f00 fix(baremetal): baremetal ipmi probe reset link up state 2021-04-20 21:38:02 +08:00
Zexi Li
38f3dceeb1 Merge pull request #10847 from ioito/automated-cherry-pick-of-#10845-upstream-release-3.6
Automated cherry pick of #10845: fix(region): optimized vm account name code
2021-04-20 20:15:23 +08:00
rainzm
c0ba43e5f1 fix(region): avoid using LocalTaskworker in time-consuming synchronization of cloudaccount 2021-04-20 19:58:42 +08:00
Zexi Li
b281cf7137 Merge pull request #10841 from ioito/automated-cherry-pick-of-#10839-upstream-release-3.6
Automated cherry pick of #10839: fix(region): avoid panic when sync aliyun networks
2021-04-20 18:51:27 +08:00
Zexi Li
a11c14dfce Merge pull request #10831 from ioito/automated-cherry-pick-of-#10829-upstream-release-3.6
Automated cherry pick of #10829: fix(region): vm list order by disk size
2021-04-20 18:49:33 +08:00
Zexi Li
0e15b63b78 Merge pull request #10819 from rainzm/automated-cherry-pick-of-#10817-upstream-release-3.6
Automated cherry pick of #10817: fix(esxi): prevent fake template and real template from duplication
2021-04-20 18:45:54 +08:00
Qu Xuan
824fc247a7 fix(region): optimized vm account name code 2021-04-20 18:37:09 +08:00
Qu Xuan
e1c1c0b842 fix(region): avoid panic when sync aliyun networks 2021-04-20 17:55:33 +08:00
Zexi Li
3adae60e23 fix(region): fetch cached image from glance by default 2021-04-20 17:52:50 +08:00
Zexi Li
62b78fd43c Merge pull request #10827 from ioito/automated-cherry-pick-of-#10825-upstream-release-3.6
Automated cherry pick of #10825: fix(region): avoid assign vm ip addr not effect
2021-04-20 17:16:42 +08:00
Qu Xuan
09f44d79a4 fix(region): vm list order by disk size 2021-04-20 16:53:16 +08:00
Qu Xuan
e82392107f fix(region): avoid assign vm ip addr not effect 2021-04-20 16:30:50 +08:00
rainzm
ed676427d2 fix(esxi): prevent fake template and real template from duplication 2021-04-20 10:39:31 +08:00
rainzm
e13885e22b feat(region): increase the log for debugging when syncing cloudimage 2021-04-20 10:39:31 +08:00
Zexi Li
bc159c7c55 Merge pull request #10798 from ioito/automated-cherry-pick-of-#10796-upstream-release-3.6
Automated cherry pick of #10796: fix: add region id params
2021-04-19 21:05:13 +08:00
Zexi Li
bf19d87ed1 Merge pull request #10781 from tb365/automated-cherry-pick-of-#10776-upstream-release-3.6
Automated cherry pick of #10776: fix(region): qcloud redis sync fix
2021-04-19 16:18:26 +08:00
tangbin
9464fbe6b2 fix(region): qcloud redis sync fix 2021-04-19 15:13:41 +08:00
Zexi Li
de811130ca Merge pull request #10779 from ioito/automated-cherry-pick-of-#10777-upstream-release-3.6
Automated cherry pick of #10777: fix: add options for pre allow ip add
2021-04-19 14:55:14 +08:00
Qu Xuan
951e9218ce fix: add region id params 2021-04-19 14:20:52 +08:00
Zexi Li
d79741dc21 Merge pull request #10792 from ioito/automated-cherry-pick-of-#10790-upstream-release-3.6
Automated cherry pick of #10790: fix: avoid panic
2021-04-19 13:16:07 +08:00
Qu Xuan
d43e645ed2 fix: avoid panic 2021-04-19 10:42:03 +08:00
Qu Xuan
170b373740 fix: add options for pre allow ip add 2021-04-16 17:11:17 +08:00
Zexi Li
4eaa4ee9d3 Merge pull request #10773 from ioito/automated-cherry-pick-of-#10771-upstream-release-3.6
Automated cherry pick of #10771: fix: add rbdcli commond for debug
2021-04-16 15:59:46 +08:00
Qu Xuan
2ca8d0f7e4 fix: add rbdcli commond for debug 2021-04-16 15:28:47 +08:00
Zexi Li
2ee3b2c8ab Merge pull request #10767 from yousong/automated-cherry-pick-of-#10765-upstream-release-3.6
Automated cherry pick of #10765: ansibleserver: wait zombie subprocesses
2021-04-16 13:15:34 +08:00
Zexi Li
e1b2e2b508 Merge pull request #10752 from yousong/automated-cherry-pick-of-#10750-upstream-release-3.6
Automated cherry pick of #10750: vpcagent: ovn: fix port match condition formation
2021-04-16 10:07:11 +08:00
Zexi Li
eb4b22eaec Merge pull request #10770 from rainzm/automated-cherry-pick-of-#10763-upstream-release-3.6
Automated cherry pick of #10763: fix(region): purge instancesnapshot when purging guest
2021-04-16 10:02:52 +08:00
Yousong Zhou
42ec59e811 ansibleserver: wait zombie subprocesses 2021-04-16 09:55:58 +08:00
rainzm
a14ab9820d fix(region): purge instancesnapshot when purging guest
fix #10760
2021-04-15 20:27:13 +08:00
Yousong Zhou
94d2bc456d vpcagent: ovn: fix port match condition formation 2021-04-15 16:08:59 +08:00
Zexi Li
5cd48cec5f Merge pull request #10725 from ioito/automated-cherry-pick-of-#10723-upstream-release-3.6
Automated cherry pick of #10723: fix: aliyun lb charge type
2021-04-15 12:42:08 +08:00
Zexi Li
c039a56be1 Merge pull request #10731 from rainzm/automated-cherry-pick-of-#10729-upstream-release-3.6
Automated cherry pick of #10729: fix(esxi): correctly set the imagePath outside the if block
2021-04-15 12:41:14 +08:00
Zexi Li
c24235c137 Merge pull request #10736 from zexi/automated-cherry-pick-of-#10734-upstream-release-3.6
Automated cherry pick of #10734: fix(cloudcommon): unify OS_ARCH constants
2021-04-15 12:21:48 +08:00
Zexi Li
85f85e394d fix(cloudcommon): unify OS_ARCH constants 2021-04-15 11:06:55 +08:00
rainzm
5fdde01bea fix(esxi): correctly set the imagePath outside the if block 2021-04-14 19:04:34 +08:00
Qu Xuan
59e1534222 fix: aliyun lb charge type 2021-04-14 18:05:59 +08:00
yunion-ci-robot
f6da9ad66a Merge pull request #10721 from zexi/automated-cherry-pick-of-#10718-upstream-release-3.6
Automated cherry pick of #10718: fix(baremetal): use command timeout context replace timeout command
2021-04-14 17:56:47 +08:00
Zexi Li
b55c2f7d21 fix(baremetal): use command timeout context replace timeout command 2021-04-14 17:16:05 +08:00
Zexi Li
24e29349bf Merge pull request #10712 from zexi/automated-cherry-pick-of-#10710-upstream-release-3.6
Automated cherry pick of #10710: fix(region): decouple region and etcd service
2021-04-14 16:58:52 +08:00
Zexi Li
aa7c5f1b1a fix(region): decouple region and etcd service 2021-04-13 18:36:47 +08:00
Zexi Li
a3b1b99cc4 Merge pull request #10707 from rainzm/automated-cherry-pick-of-#10705-upstream-release-3.6
Automated cherry pick of #10705: fix(cloudcommon): use rbac authentication dedicated to the list interface in GetModelProperty
2021-04-13 16:56:13 +08:00
Zexi Li
899afd7065 Merge pull request #10704 from zexi/automated-cherry-pick-of-#10702-upstream-release-3.6
Automated cherry pick of #10702: fix(host-deployer): mkfs.ext4 add '-T largefile' option
2021-04-13 15:44:30 +08:00
rainzm
2bf31dbd3a fix(cloudcommon): use rbac authentication dedicated to the list interface in GetModelProperty 2021-04-13 14:46:24 +08:00
Zexi Li
35d8cba97f fix(host-deployer): mkfs.ext4 add '-T largefile' option 2021-04-13 11:50:14 +08:00
Zexi Li
8a1be0852d Merge pull request #10697 from rainzm/automated-cherry-pick-of-#10695-upstream-release-3.6
Automated cherry pick of #10695: feat(region): allow to update account with provider vmware
2021-04-13 10:25:52 +08:00
Zexi Li
ef29136266 Merge pull request #10700 from zexi/automated-cherry-pick-of-#10699-upstream-release-3.6
Automated cherry pick of #10699: feat(fetcherfs): make rpm and deb package
2021-04-13 10:25:07 +08:00
Zexi Li
adaa7fa2ce feat(fetcherfs): make rpm and deb package 2021-04-12 21:31:10 +08:00
rainzm
62a4bce191 feat(region): allow to update account with provider vmware 2021-04-12 15:58:54 +08:00
Zexi Li
1ecbb46e59 Merge pull request #10690 from ioito/automated-cherry-pick-of-#10688-upstream-release-3.6
Automated cherry pick of #10688: fix: actions domain filter by project doamin id
2021-04-12 13:17:11 +08:00
Zexi Li
58ca8180b6 Merge pull request #10685 from swordqiu/automated-cherry-pick-of-#10683-upstream-release-3.6
Automated cherry pick of #10683: fix(baremetal-agent): baremetal will probe status in status unknown
2021-04-12 13:16:08 +08:00
Zexi Li
08819e2201 Merge pull request #10694 from zexi/automated-cherry-pick-of-#10692-upstream-release-3.6
Automated cherry pick of #10692: fix(readme): rename OneCloud to YunionCloud
2021-04-12 13:15:59 +08:00
Zexi Li
b4f5f1a996 fix(readme): rename OneCloud to YunionCloud 2021-04-12 13:14:48 +08:00
Qu Xuan
85f6e95c18 fix: actions domain filter by project doamin id 2021-04-12 11:42:21 +08:00
Qiu Jian
8a71e73afd fix(baremetal-agent): baremetal will probe status in status unknown 2021-04-12 00:23:33 +08:00
Zexi Li
407f155df1 Merge pull request #10680 from zexi/automated-cherry-pick-of-#10678-upstream-release-3.6
Automated cherry pick of #10678: fix(host): detect ovs version
2021-04-09 17:19:54 +08:00
Zexi Li
ab0c6f1284 fix(host): detect ovs version 2021-04-09 17:01:30 +08:00
Zexi Li
99d1137805 Merge pull request #10593 from zhaoxiangchun/automated-cherry-pick-of-#10592-upstream-release-3.6
Automated cherry pick of #10592: fix(host): update host metric tags when server or host  changeowner
2021-04-08 18:13:17 +08:00
zhaoxiangchun
95a03ad58b fix(host): update host metric tags when server or host changeowner 2021-04-08 17:18:22 +08:00
Zexi Li
659022c792 Merge pull request #10621 from swordqiu/automated-cherry-pick-of-#10619-upstream-release-3.6
Automated cherry pick of #10619: fix(region): remove i18n lock and logs
2021-04-08 10:34:22 +08:00
Zexi Li
b55ac81e2a Merge pull request #10660 from swordqiu/automated-cherry-pick-of-#10658-upstream-release-3.6
Automated cherry pick of #10658: fix(region): sync baremetal desc before do ipmi probing
2021-04-08 10:14:28 +08:00
Qiu Jian
bd69dc44d7 fix(region): sync baremetal desc before do ipmi probing 2021-04-08 01:29:55 +08:00
Zexi Li
06c303c648 Merge pull request #10646 from swordqiu/automated-cherry-pick-of-#10644-upstream-release-3.6
Automated cherry pick of #10644: fix(region): allow ipmi probe in status unknown
2021-04-07 17:55:57 +08:00
Zexi Li
15fbc035ab Merge pull request #10649 from rainzm/automated-cherry-pick-of-#10647-upstream-release-3.6
Automated cherry pick of #10647: fix(region): avoid refreshing when checking the image
2021-04-07 17:37:34 +08:00
yunion-ci-robot
a25de48df9 Merge pull request #10642 from tb365/automated-cherry-pick-of-#10637-upstream-release-3.6
Automated cherry pick of #10637: fix(region): guest associate eip checking fix
2021-04-07 16:14:47 +08:00
rainzm
be065e872d fix(region): avoid refreshing when checking the image 2021-04-07 10:59:26 +08:00
Qiu Jian
4c27add0ba fix(region): allow ipmi probe in status unknown 2021-04-07 01:00:53 +08:00
tangbin
d238540dcb fix(region): guest sync eip fix 2021-04-06 18:58:44 +08:00
tangbin
fdd0bf77e6 fix(region): guest associate eip checking fix 2021-04-06 18:58:44 +08:00
Zexi Li
ab5fcdad3d Merge pull request #10635 from ioito/automated-cherry-pick-of-#10633-upstream-release-3.6
Automated cherry pick of #10633: fix: private cloud sku attached disk count
2021-04-06 17:08:42 +08:00
Qu Xuan
38d23b0739 fix: private cloud sku attached disk count 2021-04-06 15:03:26 +08:00
Zexi Li
b45811166b Merge pull request #10624 from swordqiu/automated-cherry-pick-of-#10622-upstream-release-3.6
Automated cherry pick of #10622: fix(keystone): role_assignment effective list ignore groups without user
2021-04-06 10:18:29 +08:00
Qiu Jian
2ee1af186d fix(keystone): role_assignment effective list ignore groups without user 2021-04-05 17:21:40 +08:00
Qiu Jian
14e537fc65 fix(region): remove i18n lock and logs 2021-04-05 16:40:10 +08:00
Zexi Li
f3e503e8a6 Merge pull request #10614 from swordqiu/automated-cherry-pick-of-#10612-upstream-release-3.6
Automated cherry pick of #10612: fix(region): add usage cache, speedup response
2021-04-05 00:55:29 +08:00
yunion-ci-robot
10ad815d6d Merge pull request #10618 from ioito/automated-cherry-pick-of-#10616-upstream-release-3.6
Automated cherry pick of #10616: fix(region): new aws region
2021-04-04 20:14:44 +08:00
yunion-ci-robot
01a17c952d Merge pull request #10610 from ioito/automated-cherry-pick-of-#10608-upstream-release-3.6
Automated cherry pick of #10608: fix: time sync duration
2021-04-04 20:12:46 +08:00
Qiu Jian
dcb8898c06 response scope-specific metrics 2021-04-04 20:08:37 +08:00
Qiu Jian
d7ff1314e6 fix(region): add usage cache, speedup response 2021-04-04 20:08:37 +08:00
Qu Xuan
d6a0764b29 fix: new aws region 2021-04-03 12:31:33 +08:00
Qu Xuan
e841a42143 fix: time sync duration 2021-04-02 20:55:34 +08:00
Zexi Li
c55d5d0cf2 Merge pull request #10605 from zexi/automated-cherry-pick-of-#10603-upstream-release-3.6
Automated cherry pick of #10603: fix(baremetal): sas2iru parse line
2021-04-02 20:04:01 +08:00
Zexi Li
76df031884 Merge pull request #10580 from swordqiu/automated-cherry-pick-of-#10576-upstream-release-3.6
Automated cherry pick of #10576: fix(region): allow ipmi probe when probe fail
2021-04-02 19:44:43 +08:00
Zexi Li
f46dfc6d6a Merge pull request #10583 from swordqiu/automated-cherry-pick-of-#10581-upstream-release-3.6
Automated cherry pick of #10581: fix(hostman): recycle local disk file when rebuilding root
2021-04-02 19:42:51 +08:00
Zexi Li
1fc2503812 Merge pull request #10598 from rainzm/automated-cherry-pick-of-#10595-upstream-release-3.6
Automated cherry pick of #10595: Fixes problem of Esxi Disk with iso creating
2021-04-02 19:40:17 +08:00
Zexi Li
aa9ad9fe00 fix(baremetal): sas2iru parse line 2021-04-02 19:28:54 +08:00
rainzm
4cf674992c fix(esxi): determine whether the disk is a root disk more reasonably
The order of the device is often sorted according to the size of the
key. The disk pointed to by the smallest key is not necessarily the
root disk or the first disk which often has the label of 'Hard disk 1'.
We try to find the label, if not, use the Key again to determine who
is the root disk.
2021-04-02 18:49:13 +08:00
rainzm
5565bb3064 feat(esxi): change parameters for NewDiskDev and avoid unnecessary deploy
1. The fields UnitNumber and Index should be independent
2. Avoid unnecessary deploy, such create vm with iso not image
2021-04-02 18:49:13 +08:00
rainzm
aede49450e fix(esxi): add ListPath for storage and use it to check iso
When remote iso file is used, CheckFile will failed.
2021-04-02 18:41:14 +08:00
Zexi Li
c7efbc3124 Merge pull request #10589 from swordqiu/automated-cherry-pick-of-#7047-upstream-release-3.6
Automated cherry pick of #7047: fix: adjust primary key length when sqlchemy utf8 default to utf8mb4
2021-04-02 15:10:52 +08:00
Qiu Jian
d090d76f92 fix: adjust primary key length when sqlchemy utf8 default to utf8mb4 2021-04-02 15:06:44 +08:00
Qiu Jian
1333d39c60 fix(hostman): recycle local disk file when rebuilding root 2021-04-02 02:17:04 +08:00
Qiu Jian
615cb1e331 fix(region): allow ipmi probe when probe fail 2021-04-01 22:38:54 +08:00
yunion-ci-robot
923e8ea742 Merge pull request #10570 from ioito/automated-cherry-pick-of-#10568-upstream-release-3.6
Automated cherry pick of #10568: fix: avoid listener worker leak
2021-04-01 22:35:54 +08:00
Zexi Li
50b50d57dc Merge pull request #10548 from zexi/automated-cherry-pick-of-#10546-upstream-release-3.6
Automated cherry pick of #10546: fix(host): arm vm virtio-net-pci without addr
2021-04-01 20:52:55 +08:00
Zexi Li
67a4893534 Merge pull request #10551 from swordqiu/automated-cherry-pick-of-#10549-upstream-release-3.6
Automated cherry pick of #10549: fix(image): update min_disk of iso image
2021-04-01 20:52:05 +08:00
Zexi Li
e6d8dbe4a4 Merge pull request #10554 from zhaoxiangchun/automated-cherry-pick-of-#10552-upstream-release-3.6
Automated cherry pick of #10552: fix(monitor):修复监控总览图标钻取后返回数据异常的问题
2021-04-01 20:51:08 +08:00
Zexi Li
6c3c2f76c2 Merge pull request #10559 from ioito/automated-cherry-pick-of-#10557-upstream-release-3.6
Automated cherry pick of #10557: fix: cloudaccount auto sync
2021-04-01 20:50:01 +08:00
Zexi Li
a5cd56f3d7 Merge pull request #10563 from ioito/automated-cherry-pick-of-#10561-upstream-release-3.6
Automated cherry pick of #10561: fix: vendor update
2021-04-01 20:48:57 +08:00
Zexi Li
d691775beb Merge pull request #10567 from rainzm/automated-cherry-pick-of-#10565-upstream-release-3.6
Automated cherry pick of #10565: fix(esxi): be compatible with disconnected host
2021-04-01 20:47:58 +08:00
Qu Xuan
73cda1d909 fix: vendor update 2021-04-01 17:40:48 +08:00
Qu Xuan
0c904591c0 fix: avoid listener worker leak 2021-04-01 17:27:05 +08:00
rainzm
5e8549b30f fix(esxi): be compatible with disconnected host 2021-04-01 17:22:23 +08:00
Qu Xuan
1c1fab0ef6 fix: cloudaccount auto sync 2021-04-01 16:18:56 +08:00
zhaoxiangchun
88d1f93e31 fix(monitor):修复监控总览图标钻取后返回数据异常的问题 2021-04-01 10:05:36 +08:00
Qiu Jian
65748b374c fix(image): update min_disk of iso image 2021-03-31 23:25:58 +08:00
Zexi Li
4c83b1af48 fix(host): arm vm virtio-net-pci without addr 2021-03-31 18:53:39 +08:00
Yousong Zhou
f29d07dbd4 Merge pull request #10545 from zhaoxiangchun/automated-cherry-pick-of-#10543-upstream-release-3.6
Automated cherry pick of #10543: fix(host): modification of netio collection field  of local virtual machine
2021-03-31 15:17:12 +08:00
yunion-ci-robot
420e912c65 Merge pull request #10542 from ioito/automated-cherry-pick-of-#9108-upstream-release-3.6
Automated cherry pick of #9108: Hotfix/qx guest delete
2021-03-31 15:13:40 +08:00
yunion-ci-robot
35d15a23c6 Merge pull request #10540 from swordqiu/automated-cherry-pick-of-#10538-upstream-release-3.6
Automated cherry pick of #10538: fix(region): add more usage metrics, e.g. ports.eip, servers.last_week, pending_delete_servers.last_week
2021-03-31 15:12:42 +08:00
Qu Xuan
44ed684930 feat(region): disks and eip delete with server 2021-03-31 14:45:12 +08:00
zhaoxiangchun
2889279284 fix(host): modification of netio collection field of local virtual machine
1.本地虚拟机指标保存时field存在转换关系
bits_recv
bits_sent
2021-03-31 10:32:26 +08:00
Qu Xuan
1b1cccab94 feat(region): add server delete options 2021-03-31 10:19:05 +08:00
Qiu Jian
5261b52b84 fix(region): add more usage metrics, e.g. ports.eip, servers.last_week, pending_delete_servers.last_week 2021-03-31 03:39:14 +08:00
Zexi Li
6068ea04a2 Merge pull request #10535 from zhaoxiangchun/automated-cherry-pick-of-#10534-upstream-release-3.6
Automated cherry pick of #10534: fix(monitor): alertQuery fix
2021-03-30 19:44:14 +08:00
zhaoxiangchun
d7380f3ecc fix(monitor): alertQuery fix
1.兼容meter相关的监控数据查询
2.根据groupby
  确定resType,从而确定云管中对应的资源,然后进行属性填充,解决资源属性修改的问题
2021-03-30 18:22:24 +08:00
Zexi Li
01eeff06a1 Merge pull request #10533 from swordqiu/automated-cherry-pick-of-#10531-upstream-release-3.6
Automated cherry pick of #10531: fix(region): show storage capacity to project users
2021-03-30 15:53:58 +08:00
Qiu Jian
45d219ac51 fix(region): show storage capacity to project users 2021-03-30 12:29:29 +08:00
Zexi Li
8cc8d101b5 Merge pull request #10518 from zhaoxiangchun/automated-cherry-pick-of-#10516-upstream-release-3.6
Automated cherry pick of #10516: fix(monitor): filter alertquery result according to onecloud resources
2021-03-29 17:15:59 +08:00
zhaoxiangchun
2df45f0a3c fix(monitor): filter alertquery result according to onecloud resources
1.排除已经删除的资源
2.对已经删除的资源不再持续报警
2021-03-29 16:50:16 +08:00
Zexi Li
d397ac8608 Merge pull request #10523 from ioito/automated-cherry-pick-of-#10521-upstream-release-3.6
Automated cherry pick of #10521: fix: account auto sync time
2021-03-29 12:13:37 +08:00
Qu Xuan
71171ed0d9 fix: account auto sync time 2021-03-29 11:22:54 +08:00
yunion-ci-robot
c399153f14 Merge pull request #10512 from ioito/automated-cherry-pick-of-#10510-upstream-release-3.6
Automated cherry pick of #10510: fix: sku zone
2021-03-26 17:27:53 +08:00
Qu Xuan
2f7ee9fc79 fix: sku zone 2021-03-26 16:45:54 +08:00
Zexi Li
630284c2ae Merge pull request #10501 from yousong/automated-cherry-pick-of-#10499-upstream-release-3.6
Automated cherry pick of #10499: vpcagent: ovn: fix qos for eip upload
2021-03-26 15:18:13 +08:00
Zexi Li
b1a4507325 Merge pull request #10507 from swordqiu/automated-cherry-pick-of-#10505-upstream-release-3.6
Automated cherry pick of #10505: fix(baremetal): megactl driver fail to find device by key
2021-03-26 15:16:49 +08:00
Yousong Zhou
5b21958587 vpcagent: ovn: fix qos for eip upload 2021-03-26 10:28:10 +08:00
Qiu Jian
be71185b17 fix(baremetal): megactl driver fail to find device by key 2021-03-26 03:20:29 +08:00
Zexi Li
5981783ea4 Merge pull request #10496 from zhaoxiangchun/automated-cherry-pick-of-#10494-upstream-release-3.6
Automated cherry pick of #10494: fix(monitor): modify onecloud replacement code
2021-03-24 19:34:56 +08:00
zhaoxiangchun
04f4d036cf fix(monitor): modify onecloud replacement code
1.增加copyright api查询逻辑
2021-03-24 18:53:00 +08:00
Zexi Li
c615675ad9 Merge pull request #10485 from tb365/automated-cherry-pick-of-#10483-upstream-release-3.6
Automated cherry pick of #10483: (fix) region: qcloud elb https listener create fix
2021-03-24 18:51:46 +08:00
Zexi Li
4735edff60 Merge pull request #10489 from ioito/automated-cherry-pick-of-#10487-upstream-release-3.6
Automated cherry pick of #10487: fix: remove qcloud region and zone prefix
2021-03-24 12:22:28 +08:00
Zexi Li
4e099b72ad Merge pull request #10492 from zexi/automated-cherry-pick-of-#10491-upstream-release-3.6
Automated cherry pick of #10491: fix(build): build telegraf-raid-plugin
2021-03-24 12:21:41 +08:00
Zexi Li
14bd5def5d fix(build): build telegraf-raid-plugin 2021-03-24 12:20:06 +08:00
Qu Xuan
0ee42cffea fix: remove qcloud region and zone prefix 2021-03-23 17:44:36 +08:00
tangbin
08b74642f8 (fix) region: qcloud elb https listener create fix 2021-03-23 15:48:41 +08:00
Zexi Li
c6433d0a09 Merge pull request #10476 from yousong/automated-cherry-pick-of-#10474-upstream-release-3.6
Automated cherry pick of #10474: Bugfix/yousong guestnic
2021-03-23 10:39:44 +08:00
Zexi Li
db20a5e334 Merge pull request #10479 from zexi/hotfix/resize-disk
fix(host): ignore parted resize disk unknown partition table error
2021-03-23 10:38:20 +08:00
Zexi Li
546f2fcfae fix(host): ignore parted resize disk unknown partition table error 2021-03-23 09:51:02 +08:00
Yousong Zhou
b4a4cd61d9 region: fix setting nic index
When a guest has two nics, changing ip address of the 1st will cause
the new nic after detach then attach to be "1", colliding with the
original nic of index 1
2021-03-22 19:34:22 +08:00
Yousong Zhou
02022c4c29 region: attachnetwork: allow attach by network name
isValidNetworkInfo allows names.  Otherwise the code will panic when
a named was passed and nil was returned by the fetch call
2021-03-22 19:34:22 +08:00
Zexi Li
4377337a4a Merge pull request #10470 from swordqiu/automated-cherry-pick-of-#10468-upstream-release-3.6
Automated cherry pick of #10468: fix(log): add filters to baremetal event logs
2021-03-22 16:09:18 +08:00
Qiu Jian
b9e0c22b2a fix(log): add filters to baremetal event logs 2021-03-22 10:53:45 +08:00
Zexi Li
d8a1e35571 Merge pull request #10464 from ioito/automated-cherry-pick-of-#10462-upstream-release-3.6
Automated cherry pick of #10462: fix: add index for image_type
2021-03-22 10:45:25 +08:00
Zexi Li
13f6a0907f Merge pull request #10454 from ioito/automated-cherry-pick-of-#10452-upstream-release-3.6
Automated cherry pick of #10452: fix: avoid panic when use idc vpc
2021-03-22 10:40:43 +08:00
Zexi Li
99dc612991 Merge pull request #10457 from swordqiu/automated-cherry-pick-of-#10455-upstream-release-3.6
Automated cherry pick of #10455: fix(keystone): allow joint projects across domains by default
2021-03-22 10:39:23 +08:00
Qu Xuan
c5c00f38ba fix: add index for image_type 2021-03-19 14:29:42 +08:00
Zexi Li
b25043be1b Merge pull request #10459 from rainzm/webhook/more1
Notify webhook
2021-03-19 14:27:36 +08:00
Qiu Jian
7de3adac3a fix(keystone): allow joint projects across domains by default 2021-03-19 00:00:42 +08:00
Qu Xuan
be2e979c94 fix: avoid panic when use idc vpc 2021-03-18 21:04:52 +08:00
rainzm
33cb189cb1 feat(region): send webhook message when changing ipaddr 2021-03-18 17:48:01 +08:00
rainzm
10f0e0c8bb fix(region): Compatible with messages that have no recipient and contact information
such as robots
2021-03-18 17:48:01 +08:00
Zexi Li
686d314fa5 Merge pull request #10446 from zexi/feature/host-arm-support
feat(host): adjust qemu args to support aarch64
2021-03-18 15:22:33 +08:00
Zexi Li
ab00f01403 feat(host): adjust qemu args to support aarch64 2021-03-18 14:57:27 +08:00
Zexi Li
fc736bc4ca Merge pull request #10439 from swordqiu/automated-cherry-pick-of-#10437-upstream-release-3.6
Automated cherry pick of #10437: fix(region): scoped policy filter by project id
2021-03-18 10:24:00 +08:00
Zexi Li
a31e8734d0 Merge pull request #10443 from swordqiu/automated-cherry-pick-of-#10441-upstream-release-3.6
Automated cherry pick of #10441: fix(region): including domain info in project-role results
2021-03-18 10:23:30 +08:00
Zexi Li
53494b7764 Merge pull request #10435 from ioito/automated-cherry-pick-of-#10433-upstream-release-3.6
Automated cherry pick of #10433: fix: avoid stop or start vm failed
2021-03-18 10:17:33 +08:00
Qiu Jian
538097ef7c fix(region): including domain info in project-role results 2021-03-18 00:33:36 +08:00
Qiu Jian
6afe83e479 fix(region): scoped policy filter by project id 2021-03-17 23:02:08 +08:00
Qu Xuan
a7b3b1cf46 fix: avoid stop or start vm failed 2021-03-17 20:03:19 +08:00
Zexi Li
3cea602ba4 Merge pull request #10427 from ioito/automated-cherry-pick-of-#10425-upstream-release-3.6
Automated cherry pick of #10425: fix: change rds config skip zone check
2021-03-17 11:43:19 +08:00
Zexi Li
6499250b15 Merge pull request #10419 from zhaoxiangchun/automated-cherry-pick-of-#10418-upstream-release-3.6
Automated cherry pick of #10418: fix(telegraf): megactl raid  add rebuild status
2021-03-15 18:45:57 +08:00
Zexi Li
ace1d353b9 Merge pull request #10423 from ioito/automated-cherry-pick-of-#10421-upstream-release-3.6
Automated cherry pick of #10421: fix: qcloud bucket refer
2021-03-15 17:53:26 +08:00
Qu Xuan
0285e77352 fix: change rds config skip zone check 2021-03-15 17:42:56 +08:00
Qu Xuan
cdd209b59a fix: qcloud bucket refer 2021-03-15 15:47:35 +08:00
zhaoxiangchun
9da39105fb fix(telegraf): megactl raid add rebuild status 2021-03-15 10:04:25 +08:00
yunion-ci-robot
cd4cddc34c Merge pull request #10416 from ioito/automated-cherry-pick-of-#10414-upstream-release-3.6
Automated cherry pick of #10414: fix: sync cloud tags when set tags
2021-03-14 01:25:31 +08:00
Qu Xuan
9d1c0dbd95 fix: sync cloud tags when set tags 2021-03-13 20:48:39 +08:00
yunion-ci-robot
006ce9dc87 Merge pull request #10412 from ioito/automated-cherry-pick-of-#10410-upstream-release-3.6
Automated cherry pick of #10410: fix: skip zone check when rds change config
2021-03-13 19:22:23 +08:00
yunion-ci-robot
6c9c8d25e9 Merge pull request #10407 from ioito/hotfix/qx-bucket-metadata
fix: tag sync
2021-03-13 19:02:25 +08:00
Qu Xuan
32623f7c73 fix: skip zone check when rds change config 2021-03-13 19:00:40 +08:00
Qu Xuan
0b29451319 fix: tag sync 2021-03-13 17:37:11 +08:00
Zexi Li
aae4fae0c1 Merge pull request #10404 from swordqiu/automated-cherry-pick-of-#10402-upstream-release-3.6
Automated cherry pick of #10402: fix(region): cloud provider filter by domain_id ignore private case
2021-03-12 21:17:19 +08:00
Qiu Jian
0f9f2f6ee5 fix(region): cloud provider filter by domain_id ignore private case 2021-03-12 20:15:04 +08:00
Zexi Li
5cfeffcd70 Merge pull request #10389 from swordqiu/automated-cherry-pick-of-#10387-upstream-release-3.6
Automated cherry pick of #10387: fix(region): fail to update network gateway
2021-03-12 17:38:04 +08:00
Zexi Li
6b7355a9ce Merge pull request #10393 from ioito/automated-cherry-pick-of-#10391-upstream-release-3.6
Automated cherry pick of #10391: fix: sync new project for azure resource group
2021-03-12 17:35:28 +08:00
Zexi Li
f531c60e1d Merge pull request #10397 from rainzm/automated-cherry-pick-of-#10395-upstream-release-3.6
Automated cherry pick of #10395: feat(esxi): update guest os info
2021-03-12 17:34:03 +08:00
rainzm
bfb01f5630 feat(esxi): update guest os info 2021-03-11 16:44:25 +08:00
Qu Xuan
d7a7388431 fix: sync new project for azure resource group 2021-03-11 15:02:27 +08:00
Qiu Jian
112e7aac84 fix(region): fail to update network gateway 2021-03-11 14:54:26 +08:00
Zexi Li
f9d1d28d85 Merge pull request #10384 from swordqiu/automated-cherry-pick-of-#10382-upstream-release-3.6
Automated cherry pick of #10382: fix(region): cloud provider filter by domain
2021-03-11 11:39:19 +08:00
Zexi Li
5d7b73f21e Merge pull request #10373 from rainzm/automated-cherry-pick-of-#10365-upstream-release-3.6
Automated cherry pick of #10365: feat(region): filter schedtags from cloudaccount_id
2021-03-11 11:37:49 +08:00
yunion-ci-robot
2b2b502d64 Merge pull request #10376 from tb365/automated-cherry-pick-of-#10357-upstream-release-3.6
Automated cherry pick of #10357: qcloud redis support multi zones
2021-03-11 10:22:24 +08:00
Qiu Jian
22486c31bd fix(region): cloud provider filter by domain 2021-03-11 01:08:23 +08:00
rainzm
9d3c44fe91 feat(region): filter schedtags from cloudprovider_id 2021-03-10 19:45:15 +08:00
tangbin
5145f1250b fix(region) qcloud multi zone instance sync account fix 2021-03-10 19:11:58 +08:00
tangbin
acd7765b33 feat(region) qcloud redis support multi zones 2021-03-10 19:11:58 +08:00
Zexi Li
8636a26418 Merge pull request #10353 from swordqiu/automated-cherry-pick-of-#10351-upstream-release-3.6
Automated cherry pick of #10351: fix(region): network eip stats not correct
2021-03-10 16:30:58 +08:00
Zexi Li
84664f77cf Merge pull request #10369 from zexi/automated-cherry-pick-of-#10367-upstream-release-3.6
Automated cherry pick of #10367: fix(build): DOCKER_CLI_EXPERIMENTAL=enabled
2021-03-10 16:29:05 +08:00
Zexi Li
2d53b542d3 fix(build): DOCKER_CLI_EXPERIMENTAL=enabled 2021-03-10 16:28:02 +08:00
Zexi Li
e63a207c29 Merge pull request #10363 from swordqiu/automated-cherry-pick-of-#10361-upstream-release-3.6
Automated cherry pick of #10361: fix(keystone): update default role associated policy name
2021-03-09 18:06:43 +08:00
Qiu Jian
845d9a1dc0 fix(keystone): update default role associated policy name 2021-03-09 17:50:34 +08:00
Zexi Li
de6ce2cd77 Merge pull request #10360 from zexi/fix/arm64-build
fix(build): build arm64 image
2021-03-09 17:43:22 +08:00
Zexi Li
4032ae669d fix(build): build arm64 image 2021-03-09 17:42:15 +08:00
Zexi Li
0d436306ad Merge pull request #10355 from zexi/automated-cherry-pick-of-#10189-upstream-release-3.6
Automated cherry pick of #10189: host 编译跨平台兼容
2021-03-09 10:24:53 +08:00
Zhang Dongliang
ec3909af50 host 编译跨平台兼容 2021-03-09 10:24:00 +08:00
Qiu Jian
d443279986 fix(region): network eip stats not correct 2021-03-09 02:48:32 +08:00
yunion-ci-robot
9088996b32 Merge pull request #10347 from zexi/automated-cherry-pick-of-#10345-upstream-release-3.6
Automated cherry pick of #10345: feat(build): make multi arch manifest docker image
2021-03-08 20:20:05 +08:00
Zexi Li
9ac72ed678 Merge pull request #10282 from rainzm/vmware/net_boundary
feat(region): increase the network number and host number limit when recommending the network
2021-03-08 15:06:29 +08:00
Zexi Li
72ee6ff899 Merge pull request #10342 from yousong/automated-cherry-pick-of-#10340-upstream-release-3.6
Automated cherry pick of #10340: etcd: fix "fatal error: concurrent map writes"
2021-03-08 14:18:54 +08:00
Zexi Li
49a7ab8670 Merge pull request #10331 from ioito/automated-cherry-pick-of-#10329-upstream-release-3.6
Automated cherry pick of #10329: fix: optimized bucket tag
2021-03-08 14:13:46 +08:00
Zexi Li
55431b87bb feat(build): make multi arch manifest docker image 2021-03-08 12:53:37 +08:00
Yousong Zhou
bc50f09483 etcd: fix "fatal error: concurrent map writes"
Trace

	goroutine 1270434 [running]:
	runtime.throw(0x4b0cc5e, 0x15)
		/home/yousong/.usr/go/goroot-1.15.6/src/runtime/panic.go:1116 +0x72 fp=0xc0011151f8 sp=0xc0011151c8 pc=0x439292
	runtime.mapdelete_faststr(0x40876e0, 0xc0006a54a0, 0xc001e84200, 0x3e)
		/home/yousong/.usr/go/goroot-1.15.6/src/runtime/map_faststr.go:377 +0x34c fp=0xc001115260 sp=0xc0011151f8 pc=0x41664c
	yunion.io/x/onecloud/pkg/cloudcommon/etcd.(*SEtcdClient).Unwatch(0xc0003130e0, 0xc001e84200, 0x3e)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/cloudcommon/etcd/etcd.go:353 +0x134 fp=0xc0011152d0 sp=0xc001115260 pc=0x10031f4
	yunion.io/x/onecloud/pkg/compute/models.(*SHostHealthChecker).WatchHost(0xc000c222a0, 0x5229ca0, 0xc000122000, 0xc001fbc4e0, 0x24)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/host_health.go:149 +0xd5 fp=0xc001115338 sp=0xc0011152d0 pc=0x1816395
	yunion.io/x/onecloud/pkg/compute/models.(*SHost).PerformOnline(0xc001fd8400, 0x5229d20, 0xc001c4d440, 0x52a0c60, 0xc000957c40, 0x5298900, 0xc001629aa0, 0x5298900, 0xc001629ae0, 0xc000957c40, ...)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/hosts.go:3829 +0x227 fp=0xc0011153a0 sp=0xc001115338 pc=0x185a387
	yunion.io/x/onecloud/pkg/compute/models.(*SHost).PerformPing(0xc001fd8400, 0x5229d20, 0xc001c4d440, 0x52a0c60, 0xc000957c40, 0x5298900, 0xc001629aa0, 0x5298900, 0xc001629ae0, 0x0, ...)
		/home/yousong/go/src/yunion.io/x/onecloud/pkg/compute/models/hosts.go:3891 +0xbd fp=0xc001115430 sp=0xc0011153a0 pc=0x185acbd
2021-03-08 09:56:07 +08:00
yunion-ci-robot
30acf67d5c Merge pull request #10338 from rainzm/automated-cherry-pick-of-#10336-upstream-release-3.6
Automated cherry pick of #10336: fix(notify): enable filter of contact type 'email' and 'mobile'
2021-03-06 10:57:27 +08:00
rainzm
a2faac7692 fix(notify): enable filter of contact type 'email' and 'mobile' 2021-03-06 03:02:20 +08:00
Qu Xuan
5910ac16cd fix: optimized bucket tag 2021-03-05 15:36:34 +08:00
rainzm
4f462d614c feat(region): increase the network number and host number limit when recommending the network 2021-03-05 11:14:30 +08:00
Zexi Li
ef0387a023 Merge pull request #10326 from tb365/automated-cherry-pick-of-#10322-upstream-release-3.6
Automated cherry pick of #10322: copyright update brand_cn&brand_en fix
2021-03-05 10:15:50 +08:00
tangbin
31fce9fb78 copyright update brand_cn&brand_en fix 2021-03-05 10:01:23 +08:00
Zexi Li
f774e23248 Merge pull request #10318 from rainzm/automated-cherry-pick-of-#10316-upstream-release-3.6
Automated cherry pick of #10316: fix(region): check whether guest is nil
2021-03-04 19:39:06 +08:00
rainzm
024c14d962 fix(region): check whether guest is nil 2021-03-04 17:55:43 +08:00
Zexi Li
b3ac1d0641 Merge pull request #10308 from tb365/automated-cherry-pick-of-#10305-upstream-release-3.6
Automated cherry pick of #10305: infos copyright add brand_en&brand_cn
2021-03-04 15:25:53 +08:00
tangbin
695139c04e infos copyright add brand_en&brand_cn 2021-03-04 11:20:53 +08:00
Zexi Li
26802d4427 Merge pull request #10294 from zhaoxiangchun/automated-cherry-pick-of-#10292-upstream-release-3.6
Automated cherry pick of #10292: fix(monitor): fix monitor export err
2021-03-02 14:29:51 +08:00
zhaoxiangchun
b46f95ae79 fix(monitor): fix monitor export err
1.修复监控导出报错
2.db_dispatcher.ListItems 方法中对exportKeys的处理新增了一个方法
2021-03-02 11:58:06 +08:00
Zexi Li
7e538b255c Merge pull request #10291 from swordqiu/automated-cherry-pick-of-#10289-upstream-release-3.6
Automated cherry pick of #10289: fix(keystone): adjust default system policy names
2021-03-02 10:17:03 +08:00
yunion-ci-robot
9db72f0722 Merge pull request #10288 from zexi/automated-cherry-pick-of-#10286-upstream-release-3.6
Automated cherry pick of #10286: fix(hostdeployer): windows rootfs umount leak
2021-03-02 10:11:21 +08:00
Zexi Li
cc1b6a2d60 fix(hostdeployer): windows rootfs umount leak 2021-03-02 09:52:49 +08:00
Qiu Jian
1411961035 fix(keystone): adjust default system policy names 2021-03-01 21:30:56 +08:00
Zexi Li
33c979d227 Merge pull request #10280 from swordqiu/automated-cherry-pick-of-#10278-upstream-release-3.6
Automated cherry pick of #10278: fix(baremetal-agent): baremetal fail to stop due to power off soft failed
2021-03-01 10:13:39 +08:00
Qiu Jian
a3621b4707 fix(baremetal-agent): baremetal fail to stop due to power off soft failed 2021-02-27 21:50:50 +08:00
Zexi Li
0bece9d948 Merge pull request #10272 from ioito/automated-cherry-pick-of-#10270-upstream-release-3.6
Automated cherry pick of #10270: fix(cloudevent): optimized cloudevent sql
2021-02-25 11:36:00 +08:00
Qu Xuan
14dcb91758 fix(cloudevent): optimized cloudevent sql 2021-02-25 11:34:07 +08:00
Zexi Li
3d869c69bb Merge pull request #10264 from swordqiu/automated-cherry-pick-of-#10262-upstream-release-3.6
Automated cherry pick of #10262: fix(keystone): ensure comparing id with non-utf8 string
2021-02-25 11:24:22 +08:00
Zexi Li
09ef280e33 Merge pull request #10267 from ioito/automated-cherry-pick-of-#10265-upstream-release-3.6
Automated cherry pick of #10265: fix(region): add azure new region
2021-02-25 11:23:09 +08:00
Qu Xuan
4332008c3f fix(region): add azure new region 2021-02-25 10:23:45 +08:00
Qiu Jian
73c0f0350f fix(keystone): ensure comparing id with non-utf8 string 2021-02-25 02:29:55 +08:00
Zexi Li
48a894efdf Merge pull request #10251 from ioito/automated-cherry-pick-of-#10247-upstream-release-3.6
Automated cherry pick of #10247: Automated cherry pick of #10233: fix(region): support peer secgroup
2021-02-24 18:15:41 +08:00
Zexi Li
fc274d5da6 Merge pull request #10260 from tb365/automated-cherry-pick-of-#10258-upstream-release-3.6
Automated cherry pick of #10258: fix(region): redis change spec bugfix
2021-02-24 16:06:40 +08:00
tangbin
e39015fa45 fix(region): redis change spec bugfix 2021-02-24 11:49:23 +08:00
Zexi Li
1bb9801666 Merge pull request #10249 from zexi/automated-cherry-pick-of-#10223-upstream-release-3.6
Automated cherry pick of #10223: fix(host-deployer): mount may fail to lock /etc/mtab, add retrier
2021-02-23 10:36:22 +08:00
Qiu Jian
c22c4f8ef6 fix(host-deployer): mount may fail to lock /etc/mtab, add retrier 2021-02-23 10:25:14 +08:00
Qu Xuan
5584e9af1a fix(region): support peer secgroup 2021-02-23 10:08:54 +08:00
Zexi Li
44e360dcdd Merge pull request #10229 from ioito/automated-cherry-pick-of-#10227-upstream-release-3.6
Automated cherry pick of #10227: fix(region): qcloud quota sync
2021-02-22 20:52:07 +08:00
Zexi Li
a216ef28dd Merge pull request #10243 from zexi/automated-cherry-pick-of-#6083-upstream-release-3.6
Automated cherry pick of #6083: climc: add k8s monitor component
2021-02-22 19:55:51 +08:00
Zexi Li
3b12892172 Merge pull request #10236 from ioito/automated-cherry-pick-of-#10234-upstream-release-3.6
Automated cherry pick of #10234: fix(region): avoid not sync dns zone
2021-02-22 19:49:40 +08:00
Zexi Li
704cce8392 Merge pull request #10242 from tb365/automated-cherry-pick-of-#10240-upstream-release-3.6
Automated cherry pick of #10240: fix(region): set redis reboot timeout to 30 mins
2021-02-22 19:48:17 +08:00
Zexi Li
2fc04497b2 climc: add k8s monitor component 2021-02-22 19:45:40 +08:00
tangbin
bd64be4d8a fix(region): set redis reboot timeout to 30 mins 2021-02-22 18:52:05 +08:00
Qu Xuan
8dd1a897fc fix(region): avoid not sync dns zone 2021-02-22 16:15:12 +08:00
Qu Xuan
57eef5ede6 fix(region): qcloud quota sync 2021-02-22 14:55:54 +08:00
Zexi Li
ff7fa0a520 Merge pull request #10204 from swordqiu/automated-cherry-pick-of-#10202-upstream-release-3.6
Automated cherry pick of #10202: feature(compute): allow live migration without checking Host CPU modes
2021-02-22 08:59:29 +08:00
Zexi Li
0994e8c1ea Merge pull request #10207 from swordqiu/automated-cherry-pick-of-#10205-upstream-release-3.6
Automated cherry pick of #10205: fix(region): host search by any ip
2021-02-18 11:18:33 +08:00
Jian Qiu
d7dc89ccb3 fix(keystone): policy name duplication (#10201)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2021-02-14 19:14:33 +08:00
Qiu Jian
8610731af3 fix(region): host search by any ip 2021-02-13 23:13:43 +08:00
Qiu Jian
3cc72fac65 feature(compute): allow live migration with checking Host CPU modes 2021-02-13 16:33:59 +08:00
Jian Qiu
f7e8c20f43 fix(keystone): hide system scope policies in domain scope view (#10196)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2021-02-08 12:17:18 -03:00
Jian Qiu
dbf8fde45b fix(scheduler): storage medium type should not exact match (#10192)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2021-02-08 12:15:04 -03:00
yunion-ci-robot
a6a3332e64 Merge pull request #10151 from wanyaoqi/automated-cherry-pick-of-#10149-upstream-release-3.6
Automated cherry pick of #10149: chore(utils): add deb build script
2021-02-08 05:51:59 +08:00
yunion-ci-robot
ca55fbd641 Merge pull request #10186 from swordqiu/automated-cherry-pick-of-#10158-upstream-release-3.6
Automated cherry pick of #10158: fix(apigateway): add enable_quota_check and return-domain-list
2021-02-08 05:49:59 +08:00
Qiu Jian
4ee32ef454 fix(apigateway): add enable_quota_check and return-domain-list attributes to fe params 2021-02-07 17:00:17 +08:00
yunion-ci-robot
eeb2fcfbc8 Merge pull request #10185 from zhaoxiangchun/automated-cherry-pick-of-#10183-upstream-release-3.6
Automated cherry pick of #10183: fix(monitor,host): replace space to '+' when write to influxdb and replace '+' to space  when query
2021-02-07 16:07:59 +08:00
zhaoxiangchun
8612095454 fix(monitor,host): replace space to '+' when write to influxdb and replace '+' to space when query
1.写入influxdb时tag 中不允许存在空格
2021-02-07 14:57:51 +08:00
yunion-ci-robot
7612f85c6a Merge pull request #10148 from zexi/automated-cherry-pick-of-#10146-upstream-release-3.6
Automated cherry pick of #10146: Feature/baremetal h3c oem
2021-02-06 13:33:22 +08:00
Zexi Li
c09c5cac79 Merge pull request #10175 from swordqiu/automated-cherry-pick-of-#10173-upstream-release-3.6
Automated cherry pick of #10173: fix(keystone): cas sso may create new project whenever user login
2021-02-06 10:35:56 +08:00
Qiu Jian
50473268f9 fix(keystone): cas sso may create new project whenever user login 2021-02-06 03:21:01 +08:00
Zexi Li
010ed4f9ad Merge pull request #10145 from swordqiu/automated-cherry-pick-of-#10143-upstream-release-3.6
Automated cherry pick of #10143: fix(baremetal): try channel 8 for default profile
2021-02-05 14:54:31 +08:00
Zexi Li
eefe0aa8cb Merge pull request #10165 from ioito/automated-cherry-pick-of-#10163-upstream-release-3.6
Automated cherry pick of #10163: fix(cloudid): sync role policy
2021-02-05 14:36:18 +08:00
Qu Xuan
a11e5d14de fix(cloudid): sync role policy 2021-02-05 14:00:20 +08:00
wanyaoqi
a1eed47e66 chore(utils): add deb build script 2021-02-04 15:13:56 +08:00
Zexi Li
50fe044cfc feat(baremetal): support H3C oem baremetal 2021-02-04 14:11:50 +08:00
Qiu Jian
cdb97511c3 fix(baremetal): try channel 8 for default profile 2021-02-04 13:23:57 +08:00
yunion-ci-robot
6be7e015d3 Merge pull request #10142 from swordqiu/automated-cherry-pick-of-#10140-upstream-release-3.6
Automated cherry pick of #10140: fix(region): bucket size stats should not count invalid sizes of -1
2021-02-04 13:16:51 +08:00
Zexi Li
0eef67fafb Merge pull request #10139 from ioito/automated-cherry-pick-of-#10137-upstream-release-3.6
Automated cherry pick of #10137: fix(region): delete not exist disk failed
2021-02-04 11:37:10 +08:00
Qiu Jian
bbb538b93d fix(region): bucket size stats should not count invalid sizes of -1 2021-02-04 11:24:43 +08:00
Qu Xuan
4acb2757a9 fix(region): delete not exist disk failed 2021-02-04 11:03:56 +08:00
Zexi Li
d85883780d Merge pull request #10132 from ioito/automated-cherry-pick-of-#10130-upstream-release-3.6
Automated cherry pick of #10130: fix(hostman): fix kvm create disk failed error
2021-02-03 20:38:50 +08:00
Qu Xuan
e76abe883b fix(hostman): fix kvm create disk failed error 2021-02-03 20:17:25 +08:00
Zexi Li
a82f00aae7 Merge pull request #10098 from ioito/automated-cherry-pick-of-#10096-upstream-release-3.6
Automated cherry pick of #10096: fix(region): filter resource by classic vpc
2021-02-03 09:48:26 +08:00
Zexi Li
1bfa27bc49 Merge pull request #10101 from ioito/automated-cherry-pick-of-#10099-upstream-release-3.6
Automated cherry pick of #10099: fix(hostman): avoid panic when disk is nil
2021-02-03 09:47:37 +08:00
Zexi Li
ec688fd206 Merge pull request #10111 from ioito/automated-cherry-pick-of-#10109-upstream-release-3.6
Automated cherry pick of #10109: fix(region): avoid sync huawei unusable account
2021-02-02 22:06:29 +08:00
Zexi Li
20f55fe992 Merge pull request #10106 from ioito/automated-cherry-pick-of-#10104-upstream-release-3.6
Automated cherry pick of #10104: fix(region): delete virtual nics with network
2021-02-02 21:04:11 +08:00
Zexi Li
1fe7a54218 Merge pull request #10119 from wanyaoqi/automated-cherry-pick-of-#10117-upstream-release-3.6
Automated cherry pick of #10117: fix(region): add option auto reconcile backup servers
2021-02-02 20:11:12 +08:00
Zexi Li
24bf2a163a Merge pull request #10124 from rainzm/automated-cherry-pick-of-#10122-upstream-release-3.6
Automated cherry pick of #10122: fix(region): check the global network situation when expanding the network
2021-02-02 20:06:19 +08:00
rainzm
ea4505ae55 fix(region): check the global network situation when expanding the network 2021-02-02 19:49:53 +08:00
wanyaoqi
3bcb337a4b fix(region): add option auto reconcile backup servers 2021-02-02 18:32:01 +08:00
Qu Xuan
7ee2026b21 fix(region): avoid sync huawei unusable account 2021-02-02 14:39:28 +08:00
Qu Xuan
ebe79b12d1 fix(region): delete virtual nics with network 2021-02-02 10:53:52 +08:00
Qu Xuan
650ccdd7c7 fix(hostman): avoid panic when disk is nil 2021-02-01 22:02:49 +08:00
Zexi Li
68e006b71c Merge pull request #10095 from ioito/automated-cherry-pick-of-#10093-upstream-release-3.6
Automated cherry pick of #10093: fix(region): avoid update tags task loop
2021-02-01 20:34:48 +08:00
Qu Xuan
57efd8a86b fix(region): filter resource by classic vpc 2021-02-01 20:16:28 +08:00
Qu Xuan
3aa83bb86d fix(region): avoid update tags task loop 2021-02-01 19:59:10 +08:00
Zexi Li
de926037dc Merge pull request #10069 from swordqiu/automated-cherry-pick-of-#10067-upstream-release-3.6
Automated cherry pick of #10067: fix(keystone): SSO created user name may be duplicated
2021-01-30 10:42:03 +08:00
Zexi Li
df4f30ac47 Merge pull request #10075 from wanyaoqi/automated-cherry-pick-of-#10073-upstream-release-3.6
Automated cherry pick of #10073: fix(host-deployer): remove escape character on windows passwd
2021-01-30 10:40:17 +08:00
Zexi Li
96e443f90b Merge pull request #10085 from zhaoxiangchun/automated-cherry-pick-of-#10083-upstream-release-3.6
Automated cherry pick of #10083: fix(monitor): fix alert notify info do not contain resourceName
2021-01-30 10:37:16 +08:00
Zexi Li
dfa4d87702 Merge pull request #10089 from rainzm/automated-cherry-pick-of-#10086-upstream-release-3.6
Automated cherry pick of #10086: fix(notify): be compatible with member's permission changes
2021-01-30 10:36:27 +08:00
rainzm
4e199b84eb fix(notify): be compatible with member's permission changes
every user can create, modify and delete their own receiver info
2021-01-29 20:13:31 +08:00
zhaoxiangchun
c17fe2df22 fix(monitor): fix alert notify info do not contain resourceName 2021-01-29 18:17:47 +08:00
wanyaoqi
754d046d3a fix(host-deployer): remove escape character on windows passwd 2021-01-29 11:57:24 +08:00
Qiu Jian
20380ae9e6 fix(keystone): SSO created user name may be duplicated 2021-01-29 00:01:29 +08:00
Zexi Li
47d38a253a Merge pull request #10046 from rainzm/automated-cherry-pick-of-#10042-upstream-release-3.6
Automated cherry pick of #10042: Optimize the error message when logging in
2021-01-28 20:48:13 +08:00
Zexi Li
d366048e51 Merge pull request #10057 from ioito/automated-cherry-pick-of-#10055-upstream-release-3.6
Automated cherry pick of #10055: fix(region): add aliyun credit amount check
2021-01-28 20:47:00 +08:00
Zexi Li
410fd2936f Merge pull request #10061 from ioito/automated-cherry-pick-of-#10059-upstream-release-3.6
Automated cherry pick of #10059: fix(region): add huawei credit amount check
2021-01-28 20:46:14 +08:00
Zexi Li
90e10db57c Merge pull request #10065 from ioito/automated-cherry-pick-of-#10063-upstream-release-3.6
Automated cherry pick of #10063: fix(region): avoid stuck at http request
2021-01-28 20:04:03 +08:00
Qu Xuan
9975543ddb fix(region): avoid stuck at http request 2021-01-28 18:24:11 +08:00
Qu Xuan
0c658ec53f fix(region): add huawei credit amount check 2021-01-28 16:59:34 +08:00
Qu Xuan
58fb3fc9e2 fix(region): add aliyun credit amount check 2021-01-28 16:01:46 +08:00
Zexi Li
f74635f3da Merge pull request #10050 from ioito/automated-cherry-pick-of-#10048-upstream-release-3.6
Automated cherry pick of #10048: fix(region): secgroup priority fix
2021-01-28 15:12:13 +08:00
Qu Xuan
f4972c22ba fix(region): secgroup priority fix 2021-01-28 14:21:28 +08:00
rainzm
6f2bdfa22f feat(locale): update 2021-01-28 10:26:56 +08:00
rainzm
e3d3c1f029 feat(apigateway): differentiate error messages when logging in 2021-01-28 10:08:35 +08:00
rainzm
2fd40396c4 feat(keystone): more specific error return during authentication
add error class UserNotFound, UserLocked, UserDisabled and WrongPassword
2021-01-28 10:08:35 +08:00
Zexi Li
f416fe126c Merge pull request #10044 from rainzm/automated-cherry-pick-of-#9948-upstream-release-3.6
Automated cherry pick of #9948: feat(keystone,apigateway): return a readable message when the user is locked or disabled
2021-01-28 10:02:01 +08:00
rainzm
cb7956f1f1 feat(keystone,apigateway): return a readable message when the user is locked or disabled 2021-01-28 09:59:35 +08:00
Yousong Zhou
8ca6cfa3d3 Merge pull request #10034 from yousong/automated-cherry-pick-of-#10032-upstream-release-3.6
Automated cherry pick of #10032: Feature/yousong wire bw filter
2021-01-27 18:54:16 +08:00
Yousong Zhou
e467ef6ec7 feat(climc): wires: allow filter by bandwidth 2021-01-27 10:34:49 +08:00
Yousong Zhou
861cd47e62 feat(region): wire: allow filter by bandwidth 2021-01-27 10:34:49 +08:00
Zexi Li
d515e5e32c Merge pull request #9946 from rainzm/automated-cherry-pick-of-#9944-upstream-release-3.6
Automated cherry pick of #9944: fix(notify): add index fro receiver_notification
2021-01-27 09:06:34 +08:00
Zexi Li
71c0cc65ee Merge pull request #10027 from ioito/automated-cherry-pick-of-#10025-upstream-release-3.6
Automated cherry pick of #10025: fix(region): purge snapshot with not status check
2021-01-27 09:03:05 +08:00
Zexi Li
86896da1f6 Merge pull request #10022 from ioito/automated-cherry-pick-of-#10018-upstream-release-3.6
Automated cherry pick of #10018: fix(region): optimized secgroup rule sync
2021-01-26 14:53:34 +08:00
Qu Xuan
67082f32d3 fix(region): purge snapshot with not status check 2021-01-26 14:49:14 +08:00
Qu Xuan
b96b2f0b53 fix(region): optimized secgroup rule sync 2021-01-26 14:11:30 +08:00
Zexi Li
a8a2a248df Merge pull request #10012 from swordqiu/automated-cherry-pick-of-#10010-upstream-release-3.6
Automated cherry pick of #10010: fix(region): exported number of vpcs less than listed
2021-01-25 21:06:33 +08:00
Zexi Li
3997f6fbe6 Merge pull request #10005 from wanyaoqi/automated-cherry-pick-of-#10003-upstream-release-3.6
Automated cherry pick of #10003: fix(host): fix wait time after execute mount fuse fs
2021-01-25 21:05:47 +08:00
Zexi Li
05efb17d35 Merge pull request #10015 from swordqiu/automated-cherry-pick-of-#10013-upstream-release-3.6
Automated cherry pick of #10013: fix(keystone): user create without password can login with any password
2021-01-25 21:03:31 +08:00
Qiu Jian
2af9104d96 fix(keystone): user create without password can login with any password 2021-01-23 23:51:31 +08:00
yunion-ci-robot
a0d99cf879 Merge pull request #9997 from ioito/automated-cherry-pick-of-#9995-upstream-release-3.6
Automated cherry pick of #9995: fix(region): aws not support create server with public ip
2021-01-23 22:47:37 +08:00
Qiu Jian
a8d550d4d8 fix(region): exported number of vpcs less than listed 2021-01-23 20:11:33 +08:00
wanyaoqi
5ccece54ac fix(host): fix wait time after mount fuse fs 2021-01-22 19:19:36 +08:00
Qu Xuan
180b122167 fix(region): aws not support create server with public ip 2021-01-22 10:45:15 +08:00
Zexi Li
78ba5e2fd8 Merge pull request #9968 from ioito/automated-cherry-pick-of-#9966-upstream-release-3.6
Automated cherry pick of #9966: fix(cloudevent): update aliyun lookupevent api
2021-01-22 02:53:38 +08:00
Zexi Li
9f5256c344 Merge pull request #9976 from yousong/automated-cherry-pick-of-#9974-upstream-release-3.6
Automated cherry pick of #9974: fix(region): cloudaccount: allow only one sync func in flight
2021-01-22 02:47:17 +08:00
Zexi Li
cdd032c711 Merge pull request #9986 from ioito/automated-cherry-pick-of-#9973-upstream-release-3.6
Automated cherry pick of #9973: fix(region): avoid clean all rules when sync secgroups
2021-01-22 00:39:04 +08:00
Zexi Li
81133a53a2 Merge pull request #9983 from rainzm/automated-cherry-pick-of-#9981-upstream-release-3.6
Automated cherry pick of #9981: fix(notify): send websocket messages according to language preference
2021-01-21 21:33:49 +08:00
Qu Xuan
c6893892d9 fix(region): avoid clean all rules when sync secgroups 2021-01-21 21:30:47 +08:00
rainzm
8a9f3e09ea fix(notify): send websocket messages according to language preference 2021-01-21 19:51:03 +08:00
Yousong Zhou
606b241b0d fix(region): cloudaccount: allow only one sync func in flight
Ref https://github.com/yunionio/onecloud/pull/6859
2021-01-21 16:23:05 +08:00
Qu Xuan
178a7071f0 fix(cloudevent): update aliyun lookupevent api 2021-01-21 15:18:27 +08:00
Zexi Li
27e5ff8635 Merge pull request #9962 from zhaoxiangchun/automated-cherry-pick-of-#9960-upstream-release-3.6
Automated cherry pick of #9960: fix(monitor): domain view can list scope is domain or project alertrecords; fix nodata alert return info
2021-01-21 12:45:04 +08:00
zhaoxiangchun
5dc1486e7f fix(monitor): domain view can list scope is domain or project alertrecords; fix nodata alert return info 2021-01-20 11:51:46 +08:00
Zexi Li
6a50fce0ab Merge pull request #9936 from rainzm/automated-cherry-pick-of-#9934-upstream-release-3.6
Automated cherry pick of #9934: feat(notify): clean data for receiver_notifications
2021-01-20 03:19:29 +08:00
Zexi Li
132a00d8e0 Merge pull request #9954 from ioito/automated-cherry-pick-of-#9952-upstream-release-3.6
Automated cherry pick of #9952: fix(region): fix zstack delete server with local disks
2021-01-20 02:25:35 +08:00
Qu Xuan
fed6395132 fix(region): fix zstack delete server with local disks 2021-01-19 18:10:38 +08:00
rainzm
7c87d73d95 fix(notify): add index fro receiver_notification 2021-01-19 15:54:04 +08:00
yunion-ci-robot
a73c3c8d0e Merge pull request #9940 from ioito/automated-cherry-pick-of-#9938-upstream-release-3.6
Automated cherry pick of #9938: fix(region): azure default subscription id
2021-01-18 21:41:23 +08:00
Qu Xuan
f3a567f630 fix(region): azure default subscription id 2021-01-18 21:25:20 +08:00
rainzm
5160669550 feat(notify): clean data for receiver_notifications 2021-01-18 19:48:45 +08:00
Zexi Li
e1c5ebc29c Merge pull request #9927 from rainzm/automated-cherry-pick-of-#9925-upstream-release-3.6
Automated cherry pick of #9925: Notify Optimization
2021-01-18 11:47:06 +08:00
rainzm
de1553770c fix(notify): add a time limit for resending notifications 2021-01-18 11:14:45 +08:00
rainzm
928c0602dd feat(notify): delete the notification 1 month ago and remove the data migration 2021-01-18 11:14:45 +08:00
Zexi Li
6cc34c6fb1 Merge pull request #9924 from rainzm/automated-cherry-pick-of-#9922-upstream-release-3.6
Automated cherry pick of #9922: fix(notify): remote 'lang' filter when contact type is 'mobile'
2021-01-18 10:24:23 +08:00
rainzm
4885025618 fix(notify): remote 'lang' filter when contact type is 'mobile' 2021-01-17 20:56:55 +08:00
yunion-ci-robot
68ebbbcbcc Merge pull request #9912 from ioito/automated-cherry-pick-of-#9910-upstream-release-3.6
Automated cherry pick of #9910: fix(region): avoid azure detach disk failed
2021-01-17 11:40:31 +08:00
Jian Qiu
040a45aa46 fix(cloudcommon): missing set_meta opslog (#9916)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2021-01-17 11:33:28 +08:00
Qu Xuan
299d3bed6e fix(region): avoid azure detach disk failed 2021-01-16 18:38:07 +08:00
yunion-ci-robot
c4c302236f Merge pull request #9909 from zhaoxiangchun/automated-cherry-pick-of-#9907-upstream-release-3.6
Automated cherry pick of #9907: feat(monitor): influxQuery add P95 reduce
2021-01-16 12:42:29 +08:00
zhaoxiangchun
88bcb82197 feat(monitor): query reduce percentile
1.增加reduce.type == percentile ,进行对应数值处理
2021-01-16 12:01:15 +08:00
Zexi Li
80a9ed9a79 Merge pull request #9890 from ioito/automated-cherry-pick-of-#9888-upstream-release-3.6
Automated cherry pick of #9888: fix(cloudid): optimized saml sso
2021-01-15 09:08:31 +08:00
Zexi Li
f4f973429d Merge pull request #9897 from ioito/automated-cherry-pick-of-#9895-upstream-release-3.6
Automated cherry pick of #9895: fix(region): update google latitude and langtitude
2021-01-14 23:50:03 +08:00
Qu Xuan
863a28f294 fix(region): update google latitude and langtitude 2021-01-14 20:53:14 +08:00
Qu Xuan
8858e7913c fix(cloudid): optimized saml sso 2021-01-14 18:14:29 +08:00
Zexi Li
6254b64d5d Merge pull request #9886 from ioito/automated-cherry-pick-of-#9856-upstream-release-3.6
Automated cherry pick of #9856: fix(region): optimized azure reset linux pasword
2021-01-14 17:39:46 +08:00
Zexi Li
43f8ac0027 Merge pull request #9884 from rainzm/automated-cherry-pick-of-#9882-upstream-release-3.6
Automated cherry pick of #9882: Fix Notifition about Panic_Error Send too much
2021-01-14 14:50:07 +08:00
Qu Xuan
36bd1baafe fix(region): optimized azure reset linux pasword 2021-01-14 14:44:20 +08:00
rainzm
98ca80e630 feat(notify): change default verify expire interval 5m => 2m 2021-01-14 14:26:04 +08:00
rainzm
a2613e6bce fix(notify): update receiver's lang when update event occurs 2021-01-14 14:26:04 +08:00
rainzm
a8b14bb739 fix(notify): panic for err 2021-01-14 14:26:04 +08:00
Zexi Li
4850c4f8e2 Merge pull request #9880 from zhaoxiangchun/automated-cherry-pick-of-#9879-upstream-release-3.6
Automated cherry pick of #9879: feat(monitor): influxQuery add P95 reduce
2021-01-14 11:05:29 +08:00
zhaoxiangchun
64dec4254f feat(monitor): influxQuery add P95 reduce 2021-01-14 10:48:34 +08:00
Zexi Li
ada90754f9 Merge pull request #9874 from swordqiu/automated-cherry-pick-of-#9872-upstream-release-3.6
Automated cherry pick of #9872: fix(region): AWS buckets in us-east-1 have null location
2021-01-14 09:36:28 +08:00
Qiu Jian
fb3456c42d fix(region): AWS buckets in us-east-1 have null location 2021-01-14 09:12:35 +08:00
Zexi Li
cefbeb7a14 Merge pull request #9867 from zhaoxiangchun/automated-cherry-pick-of-#9865-upstream-release-3.6
Automated cherry pick of #9865: feat(monitor): support monitor overview influxdb query pass through
2021-01-13 21:12:20 +08:00
zhaoxiangchun
1fc01ebe94 feat(monitor): support monitor overview influxdb query pass through
1.监控总览支持查询穿透
2021-01-13 16:19:55 +08:00
Zexi Li
ff0606f166 Merge pull request #9864 from rainzm/automated-cherry-pick-of-#9862-upstream-release-3.6
Automated cherry pick of #9862: fix(notify): set status after sending
2021-01-13 16:10:46 +08:00
rainzm
83dd534241 fix(notify): set status after sending 2021-01-13 15:49:15 +08:00
Zexi Li
a7771885cf Merge pull request #9859 from rainzm/automated-cherry-pick-of-#9857-upstream-release-3.6
Automated cherry pick of #9857: fix(notify): set ModelManager in Receiver()
2021-01-13 14:41:34 +08:00
rainzm
88fa743e4e fix(notify): set ModelManager in Receiver() 2021-01-13 09:56:28 +08:00
Zexi Li
0e917bb275 Merge pull request #9849 from rainzm/automated-cherry-pick-of-#9847-upstream-release-3.6
Automated cherry pick of #9847: feat(notify): send notifications of different templates according to language
2021-01-12 10:29:51 +08:00
Zexi Li
cd76ce27c3 Merge pull request #9838 from swordqiu/automated-cherry-pick-of-#9836-upstream-release-3.6
Automated cherry pick of #9836: fix(keystone): add suggestion previliges to meter admin
2021-01-12 10:26:35 +08:00
Zexi Li
114de75e7e Merge pull request #9834 from ioito/automated-cherry-pick-of-#9833-upstream-release-3.6
Automated cherry pick of #9833: fix(cloudid): multi cloudaccount with saml user
2021-01-12 10:25:25 +08:00
Zexi Li
047509ebb8 Merge pull request #9843 from tb365/automated-cherry-pick-of-#9841-upstream-release-3.6
Automated cherry pick of #9841: server skus filter by mem size fix
2021-01-11 22:37:36 +08:00
Zexi Li
71e79e5a7b Merge pull request #9846 from yousong/automated-cherry-pick-of-#9844-upstream-release-3.6
Automated cherry pick of #9844: Feature/yousong i18n apigateway
2021-01-11 22:27:49 +08:00
Zexi Li
4c62508b01 Merge pull request #9852 from zhaoxiangchun/automated-cherry-pick-of-#9851-upstream-release-3.6
Automated cherry pick of #9851: fix(monitor): monitor overview throw err
2021-01-11 22:25:39 +08:00
zhaoxiangchun
e5b637906c fix(monitor): monitor overview throw err 2021-01-11 21:26:16 +08:00
rainzm
dd7d34402f feat(notify): send notifications of different templates according to language 2021-01-11 19:46:03 +08:00
Yousong Zhou
157bfb696b apigateway: try return httperrors 2021-01-11 18:35:51 +08:00
Yousong Zhou
464e0450f9 locales: generate 2021-01-11 18:35:51 +08:00
Yousong Zhou
a4b5562bd0 locales: zh-CN: add some translations 2021-01-11 18:35:51 +08:00
Yousong Zhou
f0354d0c9b locales: generate 2021-01-11 18:29:14 +08:00
Yousong Zhou
c3c3c00759 locales: zh-CN: extract current 2021-01-11 18:27:30 +08:00
Yousong Zhou
83adeaae4e apigateway: reword error messages 2021-01-11 17:51:33 +08:00
Yousong Zhou
d7f05e983f keystone: reword error messages 2021-01-11 17:51:33 +08:00
tangbin
5d075bbaaf server skus filter by mem size fix 2021-01-11 14:41:51 +08:00
Qiu Jian
86fda0f7d0 fix(keystone): add suggestion previliges to meter admin 2021-01-11 02:07:44 +08:00
Qu Xuan
53c8c16052 fix(cloudid): multi cloudaccount with saml user 2021-01-10 20:00:25 +08:00
Zexi Li
46ba9cd424 Merge pull request #9831 from tb365/automated-cherry-pick-of-#9830-upstream-release-3.6
Automated cherry pick of #9830: loadbalancer add lb purge validate
2021-01-09 19:58:29 +08:00
Zexi Li
ee59f2a410 Merge pull request #9795 from tb365/automated-cherry-pick-of-#9793-upstream-release-3.6
Automated cherry pick of #9793: feat(region): server sku os_arch & cpu_arch checking
2021-01-09 19:57:17 +08:00
Zexi Li
5cfbb416b3 Merge pull request #9818 from zhaoxiangchun/automated-cherry-pick-of-#9817-upstream-release-3.6
Automated cherry pick of #9817: fix(monitor): fix monitoroverview and meter send alerting info to  notify
2021-01-09 19:56:05 +08:00
Zexi Li
a711f832e6 Merge pull request #9827 from rainzm/automated-cherry-pick-of-#9825-upstream-release-3.6
Automated cherry pick of #9825: fix(notify): avoid duplication of notification names
2021-01-09 19:54:51 +08:00
tangbin
f31216be0e loadbalancer add lb purge validate 2021-01-09 19:20:36 +08:00
rainzm
bc0106902a fix(notify): avoid duplication of notification names 2021-01-09 18:46:52 +08:00
yunion-ci-robot
2dbfc80fac Merge pull request #9810 from tb365/automated-cherry-pick-of-#9808-upstream-release-3.6
Automated cherry pick of #9808: fix(region): aws elb backendgroup sync bugfix
2021-01-09 16:55:09 +08:00
tangbin
4fa95bf608 fix(region): aws elb backendgroup sync bugfix 2021-01-09 16:12:44 +08:00
zhaoxiangchun
af0813cd09 fix(monitor): fix monitoroverview and meter send alerting info to notify
1.调整报警总览中今日报警数量计算逻辑
2.报警模版的web路径支持跳转到不同web页面:监控报警和meter
3.nodata 前端可配制功能fix
2021-01-09 15:34:04 +08:00
Zexi Li
3b5602e1ea Merge pull request #9800 from ioito/automated-cherry-pick-of-#9798-upstream-release-3.6
Automated cherry pick of #9798: fix(region): optimized for qcloud prepaid instance delete
2021-01-09 15:33:14 +08:00
Zexi Li
e4f7d3233c Merge pull request #9815 from rainzm/automated-cherry-pick-of-#9813-upstream-release-3.6
Automated cherry pick of #9813: fix(notify): loose phone number rules in updating receiver
2021-01-09 13:03:52 +08:00
rainzm
287f98ac86 fix(notify): loose phone number rules in updating receiver 2021-01-09 11:32:31 +08:00
Zexi Li
bb44f1cdfb Merge pull request #9804 from rainzm/automated-cherry-pick-of-#9802-upstream-release-3.6
Automated cherry pick of #9802: fix(notify): loose mobile phone number matching rules
2021-01-08 14:19:50 +08:00
rainzm
644ab6f925 fix(notify): loose mobile phone number matching rules 2021-01-08 12:03:00 +08:00
Qu Xuan
e775e798aa fix(region): optimized for qcloud prepaid instance delete 2021-01-08 11:32:58 +08:00
tangbin
331d9d2a67 feat(region): server sku os_arch & cpu_arch checking 2021-01-08 10:35:08 +08:00
Zexi Li
d5ed96a651 Merge pull request #9792 from wanyaoqi/automated-cherry-pick-of-#9790-upstream-release-3.6
Automated cherry pick of #9790: fix(host-deployer): add retry on check is vgactived
2021-01-07 21:18:13 +08:00
Zexi Li
4ce85f310b Merge pull request #9787 from yousong/automated-cherry-pick-of-#9785-upstream-release-3.6
Automated cherry pick of #9785: guest_deploy_task: log other deploy details with i18n
2021-01-07 21:16:39 +08:00
Zexi Li
3f6e669324 Merge pull request #9784 from zhaoxiangchun/automated-cherry-pick-of-#9782-upstream-release-3.6
Automated cherry pick of #9782: fix(monitor,suggestion): order commonalert metric and modify alertresoruce type value and add suggestion models climc
2021-01-07 21:14:46 +08:00
wanyaoqi
3f4b2163f3 fix(host-deployer): add retry on check is vgactived 2021-01-07 19:28:09 +08:00
Yousong Zhou
78b6f85662 guest_deploy_task: log other deploy details with i18n
Fixes 9f350392 ("add service tag for actionlog")
2021-01-07 11:40:27 +08:00
zhaoxiangchun
3124113e2f fix(monitor,suggestion): order commonalert metric and modify alertresoruce type value and add suggestion models climc
1.修改监控metric排序
2.统一报警资源type和监控报警中res_type 进行统一,前端可以统一展示
3.增加suggestion服务相关climc
2021-01-06 21:31:31 +08:00
Zexi Li
38b34239cd Merge pull request #9780 from ioito/automated-cherry-pick-of-#9778-upstream-release-3.6
Automated cherry pick of #9778: fix(region): avoid auzre request timeout
2021-01-06 21:23:27 +08:00
Zexi Li
370b35852c Merge pull request #9777 from ioito/automated-cherry-pick-of-#9775-upstream-release-3.6
Automated cherry pick of #9775: fix(cloudevent): default policy
2021-01-06 21:23:08 +08:00
Zexi Li
f7c8bbc00b Merge pull request #9773 from ioito/automated-cherry-pick-of-#9771-upstream-release-3.6
Automated cherry pick of #9771: fix(region): avoid panic when register service not work
2021-01-06 21:21:47 +08:00
Qu Xuan
f64c6c54da fix(region): avoid auzre request timeout 2021-01-06 15:34:14 +08:00
Qu Xuan
c4db4bc43e fix(cloudevent): default policy 2021-01-06 14:05:35 +08:00
Qu Xuan
1afe6ef41b fix(region): avoid panic when register service not work 2021-01-05 21:20:04 +08:00
Zexi Li
83896cdcc3 Merge pull request #9764 from wanyaoqi/automated-cherry-pick-of-#9762-upstream-release-3.6
Automated cherry pick of #9762: feat(region): stop guest before freeze
2021-01-05 18:33:32 +08:00
wanyaoqi
38914b967d feat(region): stop guest before freeze 2021-01-05 15:19:13 +08:00
Zexi Li
7695eb905c Merge pull request #9758 from zhaoxiangchun/automated-cherry-pick-of-#9757-upstream-release-3.6
Automated cherry pick of #9757: fix(monitor): modify totalrecord query
2021-01-04 15:57:09 +08:00
zhaoxiangchun
562aefda85 fix(monitor): modify totalrecord query
1. influxdb 增加abs function
2. 调整total报警记录接口query
2021-01-04 15:40:57 +08:00
Zexi Li
0143d271e1 Merge pull request #9756 from zhaoxiangchun/automated-cherry-pick-of-#9754-upstream-release-3.6
Automated cherry pick of #9754: feat(monitor): get today alerting resource info
2020-12-31 20:23:52 +08:00
zhaoxiangchun
de2b95cab7 feat(monitor): get today alerting resource info
1.提供接口获取当前时间发生报警的资源统计
2020-12-31 20:09:16 +08:00
Zexi Li
fc5a78c7e3 Merge pull request #9751 from rainzm/automated-cherry-pick-of-#9750-upstream-release-3.6
Automated cherry pick of #9750: feat(region): be compatible with changes in monitor api in scaling group
2020-12-30 21:45:01 +08:00
Zexi Li
3986dbc434 Merge pull request #9740 from zhaoxiangchun/automated-cherry-pick-of-#9735-upstream-release-3.6
Automated cherry pick of #9735: fix(monitor): modify rds,redis,oss field descriptions
2020-12-30 21:43:16 +08:00
Zexi Li
192e03fcd7 Merge pull request #9734 from ioito/automated-cherry-pick-of-#9730-upstream-release-3.6
Automated cherry pick of #9730: fix(cloudevent): cloudevent is domain level resource
2020-12-30 21:42:32 +08:00
Zexi Li
44db018039 Merge pull request #9729 from ioito/automated-cherry-pick-of-#9727-upstream-release-3.6
Automated cherry pick of #9727: fix(region): rds list with secgorups info
2020-12-30 21:41:49 +08:00
Zexi Li
6751d1d3af Merge pull request #9736 from wanyaoqi/automated-cherry-pick-of-#9731-upstream-release-3.6
Automated cherry pick of #9731: fix(region): server start check host memory is enough
2020-12-30 21:40:24 +08:00
Zexi Li
5ea100865d Merge pull request #9746 from rainzm/automated-cherry-pick-of-#9744-upstream-release-3.6
Automated cherry pick of #9744: fix(esxiagent): nicIndex should be incremented
2020-12-30 21:35:56 +08:00
rainzm
987b641bd0 feat(region): be compatible with changes in monitor api in scaling group 2020-12-30 19:16:47 +08:00
rainzm
77e56db095 fix(esxiagent): nicIndex should be incremented 2020-12-30 19:02:54 +08:00
Zexi Li
b7629422f7 Merge pull request #9725 from zhaoxiangchun/automated-cherry-pick-of-#9724-upstream-release-3.6
Automated cherry pick of #9724: feat(suggestion,apigateway): add analysispredict climc
2020-12-30 18:54:41 +08:00
zhaoxiangchun
589daf5063 fix(monitor): modify rds,redis,oss field descriptions
1.修改后端redis,rds,oss desc 信息,和前端索引进行对应
2020-12-30 16:09:17 +08:00
wanyaoqi
a066301ae2 fix(region): server start check host memory is enough 2020-12-30 15:50:52 +08:00
Qu Xuan
7d07b4aa5f fix(cloudevent): cloudevent is domain level resource 2020-12-30 15:48:33 +08:00
Qu Xuan
b96f225274 fix(region): rds list with secgorups info 2020-12-30 14:20:03 +08:00
zhaoxiangchun
40c8b54cba feat(suggestion,apigateway): add analysispredict climc 2020-12-30 14:09:02 +08:00
Zexi Li
93879980f5 Merge pull request #9720 from swordqiu/automated-cherry-pick-of-#9719-upstream-release-3.6
Automated cherry pick of #9719: fix(cloudcommon): splitable may not initialize underlying table
2020-12-29 21:17:17 +08:00
Zexi Li
5bb13e48b7 Merge pull request #9716 from wanyaoqi/automated-cherry-pick-of-#9711-upstream-release-3.6
Automated cherry pick of #9711: fix(region,host,host-deployer): sync status chekc block jobs
2020-12-29 20:43:37 +08:00
Zexi Li
64fcdea2b0 Merge pull request #9712 from rainzm/automated-cherry-pick-of-#9693-upstream-release-3.6
Automated cherry pick of #9693: Solve the permission problem of notify to create receiver
2020-12-29 20:41:44 +08:00
Zexi Li
57fa6361fc Merge pull request #9708 from rainzm/automated-cherry-pick-of-#9706-upstream-release-3.6
Automated cherry pick of #9706: feat(region): multilingual timer description
2020-12-29 20:39:31 +08:00
Qiu Jian
732159137b fix(cloudcommon): splitable may not initialize underlying table 2020-12-29 18:54:26 +08:00
wanyaoqi
d2ec564ccc fix(region,host): sync status check block jobs 2020-12-29 15:31:54 +08:00
wanyaoqi
a4323eab43 fix(host-deployer): add log line on blkid failed 2020-12-29 15:31:54 +08:00
wanyaoqi
7335875ef1 fix(climc): host add netif add params bridge/interface 2020-12-29 15:31:54 +08:00
rainzm
8d98218f06 feat(region): multilingual timer description 2020-12-29 15:23:45 +08:00
rainzm
af274d7ad2 feat(db): progressive inspection when determining the required scope 2020-12-29 15:04:28 +08:00
rainzm
25baa6f509 fix(notify): inject domain info in ReceiverManager.FetchOwnerId 2020-12-29 15:04:28 +08:00
Zexi Li
4cb9304d4c Merge pull request #9702 from swordqiu/automated-cherry-pick-of-#9701-upstream-release-3.6
Automated cherry pick of #9701: fix(region): omit vpc quota check if vpc created by owner
2020-12-29 09:35:53 +08:00
Zexi Li
db198f06d6 Merge pull request #9700 from zhaoxiangchun/automated-cherry-pick-of-#9698-upstream-release-3.6
Automated cherry pick of #9698: fix(monitor): sore reture info:resourceType,measurement
2020-12-29 09:35:02 +08:00
Qiu Jian
e38ea05c21 fix(region): omit vpc quota check if vpc created by owner
Vpc quota check is omitted if vpc is create by owner user
2020-12-29 01:18:44 +08:00
--global
ba22334382 fix(monitor): sore reture info:resourceType,measurement
1.对资源类型和对应的measurement进行排序输出
2020-12-28 21:44:04 +08:00
Zexi Li
4020c6dd9e Merge pull request #9695 from zhaoxiangchun/automated-cherry-pick-of-#9694-upstream-release-3.6
Automated cherry pick of #9694: fix(monitor): add resType   filter
2020-12-28 21:22:27 +08:00
--global
ccf0653581 fix(monitor): add resType filter
1.修复资源类型过滤失效的问题
2020-12-28 17:21:01 +08:00
Zexi Li
5f566f517c Merge pull request #9541 from ioito/automated-cherry-pick-of-#9540-upstream-release-3.6
Automated cherry pick of #9540: fix(region): openstack network is regional
2020-12-28 10:20:30 +08:00
Zexi Li
787a0a61d0 Merge pull request #9683 from rainzm/automated-cherry-pick-of-#9681-upstream-release-3.6
Automated cherry pick of #9681: feat(region): make DeleteSnapshotExpiredRelease applies to postpaid vm
2020-12-27 21:06:12 +08:00
Zexi Li
60392d84aa Merge pull request #9679 from ioito/automated-cherry-pick-of-#9677-upstream-release-3.6
Automated cherry pick of #9677: optimized(region): qcloud bucket policy set and get operation
2020-12-26 20:01:08 +08:00
rainzm
be042a0758 feat(region): make DeleteSnapshotExpiredRelease applies to postpaid vm 2020-12-26 18:43:10 +08:00
Zexi Li
ea3bdba3c6 Merge pull request #9588 from tb365/automated-cherry-pick-of-#9587-upstream-release-3.6
Automated cherry pick of #9587: fix(region): cloudregion&zone add namei18n
2020-12-26 18:42:58 +08:00
Qu Xuan
c0bcfa9a53 optimized(region): qcloud bucket policy set and get operation 2020-12-26 17:42:49 +08:00
TangBin
e289553015 fix(region): remove i18n fix & zone &region name support i18n 2020-12-26 17:34:55 +08:00
TangBin
834f5a97de fix(region): aws sync vpc access mode bugfix 2020-12-26 17:34:55 +08:00
TangBin
2a4a762f24 fix(region): cloudregion&zone add namei18n 2020-12-26 17:34:54 +08:00
Zexi Li
eae0c59eb3 Merge pull request #9662 from rainzm/automated-cherry-pick-of-#9660-upstream-release-3.6
Automated cherry pick of #9660: feat(region): add options DeleteSnapshotExpiredRelease
2020-12-26 15:12:32 +08:00
Zexi Li
5368888dd8 Merge pull request #9650 from ioito/automated-cherry-pick-of-#9627-upstream-release-3.6
Automated cherry pick of #9627: fix(region): support rds secgroup operation
2020-12-26 12:20:10 +08:00
Zexi Li
85c2ea5ccc Merge pull request #9649 from lvyangyang/automated-cherry-pick-of-#9636-upstream-release-3.6
Automated cherry pick of #9636: fix(region): aws lb create tags param
2020-12-26 12:18:29 +08:00
Zexi Li
f9da623770 Merge pull request #9641 from ioito/automated-cherry-pick-of-#9640-upstream-release-3.6
Automated cherry pick of #9640: fix(region): purge private cloud sku
2020-12-26 12:15:08 +08:00
Zexi Li
4a2ef4163e Merge pull request #9643 from ioito/automated-cherry-pick-of-#9642-upstream-release-3.6
Automated cherry pick of #9642: fix(region): apsara optimized
2020-12-26 12:13:51 +08:00
Zexi Li
a192d40495 Merge pull request #9645 from swordqiu/automated-cherry-pick-of-#9644-upstream-release-3.6
Automated cherry pick of #9644: feature(climc): policy save data into file
2020-12-26 12:09:23 +08:00
Zexi Li
1ab4b68080 Merge pull request #9655 from ioito/automated-cherry-pick-of-#9654-upstream-release-3.6
Automated cherry pick of #9654: fix(region): optimized azure rebuild root
2020-12-26 12:06:41 +08:00
Zexi Li
c829c02325 Merge pull request #9653 from swordqiu/automated-cherry-pick-of-#9652-upstream-release-3.6
Automated cherry pick of #9652: fix(cloudevent): adjust cloudevents resource scope
2020-12-26 12:04:56 +08:00
rainzm
e4efbdc336 feat(region): add options DeleteSnapshotExpiredRelease 2020-12-26 11:09:19 +08:00
yunion-ci-robot
22e318b6c1 Merge pull request #9658 from zhaoxiangchun/automated-cherry-pick-of-#9657-upstream-release-3.6
Automated cherry pick of #9657: fix(monitor): monitor notify international and 3.6 bugfix
2020-12-26 11:06:58 +08:00
--global
ab14706ff5 fix(monitor): monitor notify international and 3.6 bugfix
1.修复项目下无法查看报警记录
2.修复报警策略切换所属范围signature失败
3.国际化问题处理
2020-12-26 09:54:08 +08:00
Qu Xuan
0252c00efc fix(region): optimized azure rebuild root 2020-12-25 20:56:29 +08:00
Qiu Jian
540af1a3af fix(cloudevent): adjust cloudevents resource scope
Change cloudevents resource scope from system to project.
2020-12-25 20:41:57 +08:00
Qu Xuan
c5a974e744 fix(region): support rds secgroup operation 2020-12-25 19:13:11 +08:00
lvyangyang
4cb9c936cd fix(region): aws lb create tags param 2020-12-25 18:24:41 +08:00
Zexi Li
22d31a39c1 Merge pull request #9638 from ioito/automated-cherry-pick-of-#9637-upstream-release-3.6
Automated cherry pick of #9637: fix(cloudid): optimized system policy sync
2020-12-25 17:24:07 +08:00
Qiu Jian
94dd5c5777 feature(climc): policy save data into file
Allow saveing policy data into file
2020-12-25 17:02:02 +08:00
Qu Xuan
8a5e682b06 fix(cloudid): optimized system policy sync 2020-12-25 15:04:17 +08:00
Qu Xuan
38a0b76a58 fix(region): apsara optimized 2020-12-25 14:21:35 +08:00
Qu Xuan
a2b15c596c fix(region): purge private cloud sku 2020-12-25 11:23:46 +08:00
Zexi Li
64ed1d4e88 Merge pull request #9634 from ioito/automated-cherry-pick-of-#9633-upstream-release-3.6
Automated cherry pick of #9633: fix(region): sku.meta use global proxy
2020-12-25 01:26:21 +08:00
Zexi Li
f8e228502f Merge pull request #9630 from ioito/automated-cherry-pick-of-#9629-upstream-release-3.6
Automated cherry pick of #9629: fix(region): optimized disk allocate sched failed log
2020-12-24 17:47:59 +08:00
Zexi Li
a0cecc801e Merge pull request #9623 from ioito/automated-cherry-pick-of-#9622-upstream-release-3.6
Automated cherry pick of #9622: fix(region): avoid openstack change config error
2020-12-24 17:42:14 +08:00
Zexi Li
916692b992 Merge pull request #9626 from ioito/automated-cherry-pick-of-#9593-upstream-release-3.6
Automated cherry pick of #9593: fix(region): private cloud sku create
2020-12-24 17:41:15 +08:00
Zexi Li
244a63aa24 Merge pull request #9620 from ioito/automated-cherry-pick-of-#9619-upstream-release-3.6
Automated cherry pick of #9619: fix(region): avolid panic when list role's policies
2020-12-24 17:35:18 +08:00
Zexi Li
1f6e01592e Merge pull request #9610 from wanyaoqi/automated-cherry-pick-of-#9609-upstream-release-3.6
Automated cherry pick of #9609: fix(glance): list image by os arch use startwith
2020-12-24 17:34:32 +08:00
Qu Xuan
14bdbea3e2 fix(region): sku.meta use global proxy 2020-12-24 17:24:38 +08:00
Qu Xuan
27a2d36ff5 fix(region): optimized disk allocate sched failed log 2020-12-24 16:59:09 +08:00
Qu Xuan
1aec7ab259 fix(region): private cloud sku create 2020-12-24 15:33:03 +08:00
Qu Xuan
059cd75273 fix(region): avolid panic when list role's policies 2020-12-24 15:31:26 +08:00
Zexi Li
4c97c6ad3b Merge pull request #9618 from lvyangyang/automated-cherry-pick-of-#9596-upstream-release-3.6
Automated cherry pick of #9596: feat(region): azure tags
2020-12-24 14:33:14 +08:00
Qu Xuan
b60d18c060 fix(region): avoid openstack change config error 2020-12-24 11:52:05 +08:00
lvyangyang
950e75f8b0 feat(region): azure tags 2020-12-24 10:18:10 +08:00
Zexi Li
65781bfe06 Merge pull request #9617 from swordqiu/automated-cherry-pick-of-#9616-upstream-release-3.6
Automated cherry pick of #9616: fix(keystone): add i18n description for policy and role
2020-12-24 02:14:11 +08:00
Qiu Jian
334b347eb9 fix(keystone): add i18n description for policy and role
Add i18n support for descriptions of system policy and role
2020-12-23 23:34:58 +08:00
Zexi Li
d9c38a8550 Merge pull request #9595 from wanyaoqi/automated-cherry-pick-of-#9594-upstream-release-3.6
Automated cherry pick of #9594: chore(util): update centos build version to 1.1-3
2020-12-23 22:15:26 +08:00
Zexi Li
35cc29f86c Merge pull request #9604 from rainzm/automated-cherry-pick-of-#9603-upstream-release-3.6
Automated cherry pick of #9603: feat(webhook): send webhook notification when c/d loadbalancerlisterrule
2020-12-23 22:15:01 +08:00
Zexi Li
50d83a75e5 Merge pull request #9598 from zhaoxiangchun/automated-cherry-pick-of-#9597-upstream-release-3.6
Automated cherry pick of #9597: fix(cloudmon): deal cannot get  azure metric
2020-12-23 22:14:29 +08:00
Zexi Li
2ef96a9b26 Merge pull request #9600 from yousong/automated-cherry-pick-of-#9599-upstream-release-3.6
Automated cherry pick of #9599: Bugfix/yousong climc ssh
2020-12-23 22:13:27 +08:00
Zexi Li
daabb5b411 Merge pull request #9607 from zhaoxiangchun/automated-cherry-pick-of-#9605-upstream-release-3.6
Automated cherry pick of #9605: fix(monitor): fix nodata alertresource list
2020-12-23 22:10:15 +08:00
Zexi Li
9dd09504cd Merge pull request #9614 from rainzm/automated-cherry-pick-of-#9613-upstream-release-3.6
Automated cherry pick of #9613: fix(notify): fit correctly when send notification via contact
2020-12-23 22:03:29 +08:00
Zexi Li
b9560c6765 Merge pull request #9612 from rainzm/automated-cherry-pick-of-#9611-upstream-release-3.6
Automated cherry pick of #9611: feat(cloudcommon): determine the notification template based on the user’s language preference
2020-12-23 20:32:36 +08:00
rainzm
cdf7825379 fix(notify): fit correctly when send notification via contact 2020-12-23 17:50:45 +08:00
rainzm
7d75620d6d feat(cloudcommon): determine the notification template based on the user’s language preference 2020-12-23 17:44:07 +08:00
wanyaoqi
f3404f678c fix(glance): list image by os arch use startwith 2020-12-23 16:25:39 +08:00
--global
cdcfc79232 fix(monitor): fix nodata alertresource list
1.修复nodata报警资源列表无法根据nodata策略正确刷新和删除
2020-12-23 14:52:26 +08:00
rainzm
24f4a684a5 feat(webhook): send webhook notification when c/d loadbalancerlisterrule 2020-12-23 14:51:41 +08:00
Yousong Zhou
8a4c1a0bbe fix(mcclient): options: webconsole: fix passing ssh port 2020-12-23 13:31:40 +08:00
Yousong Zhou
ce00a17614 refactor(climc): webconsole: use helper methods of response struct 2020-12-23 13:31:40 +08:00
Yousong Zhou
8e9b4aed2f refactor(webconsole): api: add helper methods for response struct 2020-12-23 13:31:40 +08:00
Yousong Zhou
5959a204f7 refactor(webconsole): use structured response 2020-12-23 13:31:40 +08:00
--global
d2459a5cc0 fix(cloudmon): deal cannot get azure metric
1.azure重构代码导致监控uri路径出错
2020-12-23 13:17:42 +08:00
wanyaoqi
d980604920 chore(util): update centos build version to 1.1-3 2020-12-23 11:15:15 +08:00
Zexi Li
c5c370d6a2 Merge pull request #9550 from tb365/automated-cherry-pick-of-#9548-upstream-release-3.6
Automated cherry pick of #9548: Bugfix/tb bugfix 121801
2020-12-23 09:48:07 +08:00
Zexi Li
d442f842f2 Merge pull request #9578 from zhaoxiangchun/automated-cherry-pick-of-#9577-upstream-release-3.6
Automated cherry pick of #9577: feat(monitor): add global alertrecord
2020-12-23 09:46:02 +08:00
Zexi Li
347e2f0828 Merge pull request #9571 from ioito/automated-cherry-pick-of-#9570-upstream-release-3.6
Automated cherry pick of #9570: fix(region): 避免从云上同步下来的主机,创建相同配置时network_id为空
2020-12-23 09:41:49 +08:00
Zexi Li
9fe732619d Merge pull request #9574 from ioito/automated-cherry-pick-of-#9573-upstream-release-3.6
Automated cherry pick of #9573: fix(region): add huawei gpssd desc
2020-12-23 09:37:05 +08:00
Zexi Li
540b21cfd4 Merge pull request #9582 from zhaoxiangchun/automated-cherry-pick-of-#9579-upstream-release-3.6
Automated cherry pick of #9579: fix(monitor): other servier create alert add used_by param as a agreement
2020-12-23 09:35:20 +08:00
Zexi Li
7fd9b0f47e Merge pull request #9585 from rainzm/automated-cherry-pick-of-#9584-upstream-release-3.6
Automated cherry pick of #9584: more convenient debugging and role isolation
2020-12-23 09:09:48 +08:00
Zexi Li
60724356ec Merge pull request #9590 from swordqiu/automated-cherry-pick-of-#9589-upstream-release-3.6
Automated cherry pick of #9589: fix(cloudevent,devtool): missing metadata table
2020-12-23 09:06:48 +08:00
Qiu Jian
5d298e71bb fix(cloudevent,devtool): missing metadata table 2020-12-23 03:12:10 +08:00
rainzm
deb3758bfa feat: download the role to tmpdir not system role dir 2020-12-22 20:21:38 +08:00
rainzm
1eaf2eaff0 feat: add keep_tmpdir options
Setting 'keep_tmpdir' as true will keep tmpdir as used by executing
ansible playbook for debugging
2020-12-22 20:21:38 +08:00
Qu Xuan
ea41bb4f18 fix(region): openstack network is regional 2020-12-22 16:26:36 +08:00
--global
e2ca41a5f5 feat(monitor): add global alertrecord
1.支持时间、资源类型、报警级别、报警状态的过滤
2.报警记录删除时,删除关联的报警记录
2020-12-22 16:22:50 +08:00
--global
2ba98e7cee fix(monitor): other servier create alert add used_by param as a agreement
1.解决notify,meter中创建的对应的策略也展示在统一报警策略页面。通过used_by
  进行区分
2020-12-22 16:18:21 +08:00
Qu Xuan
a9c6579b6a fix(region): add huawei gpssd desc 2020-12-22 11:33:03 +08:00
Qu Xuan
f150da6d98 fix(region): 避免从云上同步下来的主机,创建相同配置时network_id为空 2020-12-22 11:18:32 +08:00
Zexi Li
dcf2a3f66c Merge pull request #9499 from wanyaoqi/automated-cherry-pick-of-#9498-upstream-release-3.6
Automated cherry pick of #9498: server migrate misc fix
2020-12-22 10:06:11 +08:00
yunion-ci-robot
eb2f782fd2 Merge pull request #9565 from zexi/automated-cherry-pick-of-#9564-upstream-release-3.6
Automated cherry pick of #9564: Hotfix/baremetal pxe net alloc
2020-12-21 23:50:49 +08:00
Zexi Li
f86e26fec2 Merge pull request #9545 from yousong/automated-cherry-pick-of-#9544-upstream-release-3.6
Automated cherry pick of #9544: fix(region): lbbackend: better error reporting for finding influxdb info
2020-12-21 21:08:35 +08:00
Zexi Li
3effc3ea38 Merge pull request #9556 from ioito/automated-cherry-pick-of-#9555-upstream-release-3.6
Automated cherry pick of #9555: fix(region): fix openstack instance os type
2020-12-21 21:02:06 +08:00
Zexi Li
b023c24250 Merge pull request #9560 from rainzm/automated-cherry-pick-of-#9559-upstream-release-3.6
Automated cherry pick of #9559: feat(scripts): add export DOCKER_BUILDKIT=1
2020-12-21 21:00:26 +08:00
Zexi Li
5d1d8dc145 Merge pull request #9562 from ioito/automated-cherry-pick-of-#9561-upstream-release-3.6
Automated cherry pick of #9561: fix(cloudid): add <br> for notify templete
2020-12-21 20:59:24 +08:00
Zexi Li
9f2b137f08 fix(region,baremetal): choose candidate network not according by types 2020-12-21 20:48:31 +08:00
Zexi Li
829faa1ab6 fix(region,baremetal): pxe net reuse converted server access ip 2020-12-21 20:48:31 +08:00
Qu Xuan
2faead462b fix(cloudid): add <br> for notify templete 2020-12-21 20:42:31 +08:00
rainzm
4135e62f6f feat(scripts): add export DOCKER_BUILDKIT=1 2020-12-21 19:56:39 +08:00
Qu Xuan
9c0ce58a06 fix(region): fix openstack instance os type 2020-12-21 19:49:56 +08:00
TangBin
5a10db10cd fix(region): lbacl &lbcert default share scope 2020-12-21 17:33:21 +08:00
TangBin
0c3a1986f6 fix(region): elb acl validate create data fix 2020-12-21 17:33:21 +08:00
TangBin
1a4faf4101 fix(region): aliyun elb listener&lbbg sync project 2020-12-21 17:33:21 +08:00
TangBin
c4eda6b5af fix(region): cert&acl cache delete condition check 2020-12-21 17:33:21 +08:00
Yousong Zhou
48f1cf12ae fix(region): lbbackend: better error reporting for finding influxdb info 2020-12-21 16:51:44 +08:00
Zexi Li
74d050292f Merge pull request #9370 from ioito/automated-cherry-pick-of-#9360-upstream-release-3.6
Automated cherry pick of #9360: fix(region): sync servers
2020-12-21 10:40:39 +08:00
Zexi Li
db9b653b29 Merge pull request #9539 from swordqiu/automated-cherry-pick-of-#9538-upstream-release-3.6
Automated cherry pick of #9538: fix(cloudcommon): query string may be modified in listItemQuery
2020-12-21 01:32:00 +08:00
Zexi Li
7726efa305 Merge pull request #9537 from swordqiu/automated-cherry-pick-of-#9536-upstream-release-3.6
Automated cherry pick of #9536: fix(keystone): ignore deleted policies when matching policies
2020-12-21 01:30:40 +08:00
Qiu Jian
41b694ad3e fix(cloudcommon): query filter ineffective for splitable
query string may be modified in listItemQuery routine, which cause some query
filter is removed and hence ineffective when query over splitable
2020-12-20 20:31:43 +08:00
Qiu Jian
86476c22a9 fix(keystone): ignore deleted policies when matching policies
ignore deleted policies when matching policies
2020-12-20 14:18:59 +08:00
Zexi Li
495a0283ce Merge pull request #9535 from swordqiu/automated-cherry-pick-of-#9534-upstream-release-3.6
Automated cherry pick of #9534: fix(cloudcommon): add rbac_policy_refresh_internval_seconds option
2020-12-20 02:08:37 +08:00
Zexi Li
f6329cbc71 Merge pull request #9528 from swordqiu/automated-cherry-pick-of-#9527-upstream-release-3.6
Automated cherry pick of #9527: fix(cloudcommon): panic when query a splitable model manager
2020-12-20 02:07:56 +08:00
Zexi Li
742ac46cab Merge pull request #9530 from swordqiu/automated-cherry-pick-of-#9529-upstream-release-3.6
Automated cherry pick of #9529: fix(taskman): use admin token if task userCred token expired
2020-12-20 02:05:55 +08:00
Qiu Jian
6caec234a9 fix(cloudcommon): add rbac_policy_refresh_internval_seconds option
Add new option rbac_policy_refresh_interval_seconds to control the
valid duration of a policy cache. The option is introduced at 3.6.
Replace option rbac_policy_sync_period_seconds.
2020-12-20 01:34:33 +08:00
Qiu Jian
b3c90a8049 fix(taskman): use admin token if task userCred token expired
Use admin credential token if task cached userCred token expired
2020-12-20 01:21:40 +08:00
Qiu Jian
ba8754687a fix(cloudcommon): panic when query an empty splitable model manager
fix panic when querying an empty splitable model manager, e.g. action-show
2020-12-20 00:25:49 +08:00
yunion-ci-robot
5c5178985e Merge pull request #9524 from zexi/automated-cherry-pick-of-#9521-upstream-release-3.6
Automated cherry pick of #9521: Storage actual size filter
2020-12-19 23:56:03 +08:00
Zexi Li
47e739d612 Merge pull request #9495 from wanyaoqi/automated-cherry-pick-of-#9494-upstream-release-3.6
Automated cherry pick of #9494: fix(region): guest to create input keep billing info
2020-12-19 20:06:10 +08:00
Zexi Li
b70ab17dcb Merge pull request #9506 from ioito/automated-cherry-pick-of-#9159-upstream-release-3.6
Automated cherry pick of #9159: feat(region): add instance storage capability
2020-12-19 20:04:27 +08:00
Zexi Li
5010a9154d Merge pull request #9510 from ioito/automated-cherry-pick-of-#9509-upstream-release-3.6
Automated cherry pick of #9509: fix(region): azure async task
2020-12-19 20:02:37 +08:00
Zexi Li
0ac658c2ca Merge pull request #9513 from ioito/automated-cherry-pick-of-#9512-upstream-release-3.6
Automated cherry pick of #9512: fix(region): azure secgroup rule not allow with same priority and dir…
2020-12-19 20:01:01 +08:00
Zexi Li
e7dd6bba0c fix(scheduler): storage predicate add actualCapacity filter 2020-12-19 19:58:10 +08:00
Zexi Li
7a3ad28fd6 Merge pull request #9517 from swordqiu/automated-cherry-pick-of-#9515-upstream-release-3.6
Automated cherry pick of #9515: fix(host): telegraf listen on local ipv4 address explicitly
2020-12-19 18:11:49 +08:00
Zexi Li
bd212de4f7 Merge pull request #9516 from swordqiu/automated-cherry-pick-of-#9501-upstream-release-3.6
Automated cherry pick of #9501: feature(keystone): user add language attribute
2020-12-19 18:11:39 +08:00
Qiu Jian
4606458719 fix(host): telegraf listen on local ipv4 address explicitly
Ensure telegraf listen on local IPv4 address explicityly and host send
metrics to telegraf local IPv4 address explicityly.
2020-12-19 15:37:03 +08:00
Qiu Jian
768c88d28d feature(keystone): user add language attribute
User add language attribute, notify and alarm will use this attribute to
send message in proper language
2020-12-19 15:36:37 +08:00
Qu Xuan
2b0e8afe0f fix(region): azure secgroup rule not allow with same priority and direction 2020-12-19 14:48:57 +08:00
Qu Xuan
09adc5f60f fix(region): azure async task 2020-12-19 14:02:15 +08:00
Qu Xuan
8779895298 feat(region): add instance storage capability 2020-12-19 11:14:58 +08:00
Qu Xuan
d2d96b1229 fix(region): sync servers 2020-12-19 10:26:10 +08:00
Zexi Li
3e74921627 Merge pull request #9503 from swordqiu/automated-cherry-pick-of-#9502-upstream-release-3.6
Automated cherry pick of #9502: fix(keystone): always upload&refresh service config whenever service …
2020-12-19 09:32:47 +08:00
Qiu Jian
97eb6e7bc7 fix(keystone): always upload&refresh service config whenever service restart
Always upload&refresh service config whenever service restart
2020-12-19 00:53:14 +08:00
yunion-ci-robot
54337fe93b Merge pull request #9491 from zexi/automated-cherry-pick-of-#9490-upstream-release-3.6
Automated cherry pick of #9490: Hotfix/baremetal pd makegood
2020-12-18 20:49:19 +08:00
Zexi Li
c8a007d9b3 Merge pull request #9484 from rainzm/automated-cherry-pick-of-#9483-upstream-release-3.6
Automated cherry pick of #9483: Webhook better describe the life cycle of the guest
2020-12-18 20:37:51 +08:00
wanyaoqi
6c96e6d1f8 fix(host): add print migrate progress info 2020-12-18 18:29:36 +08:00
wanyaoqi
e26fb5cc1d fix(region): do not change disk status on migrating 2020-12-18 18:29:36 +08:00
Zexi Li
547df8a171 Merge pull request #9489 from tb365/automated-cherry-pick-of-#9488-upstream-release-3.6
Automated cherry pick of #9488: Bugfix/tb bugfix 121702
2020-12-18 16:36:20 +08:00
Zexi Li
7da3869e24 Merge pull request #9466 from zhaoxiangchun/automated-cherry-pick-of-#9459-upstream-release-3.6
Automated cherry pick of #9459: feat(monitor): add alert slience time and modify scoperesource FetchUniqValues func
2020-12-18 16:33:48 +08:00
Zexi Li
012a84d187 Merge pull request #9487 from wanyaoqi/automated-cherry-pick-of-#9486-upstream-release-3.6
Automated cherry pick of #9486: fix(region): fix change config forecast
2020-12-18 16:31:15 +08:00
Zexi Li
adc27a53f3 Merge pull request #9482 from wanyaoqi/automated-cherry-pick-of-#9481-upstream-release-3.6
Automated cherry pick of #9481: fix(keystone): service config ignore deploy server socket path
2020-12-18 16:29:29 +08:00
wanyaoqi
f8c4c008f8 fix(region): guest to create input keep billing info 2020-12-18 16:18:27 +08:00
Zexi Li
f6bf3050fa fix(baremetal): clear jbod disks do PDMakeGood 2020-12-18 15:50:15 +08:00
TangBin
e4f372ba55 fix(region): remove unnecessary vpc validate create date error wrap 2020-12-18 15:19:54 +08:00
TangBin
755f4a93a3 fix(region): network create mask length validate 2020-12-18 15:19:54 +08:00
TangBin
ad39e790d9 fix(region): vpc create data cird validate 2020-12-18 15:19:54 +08:00
TangBin
bc3fdb890f fix(region): ctyun delete server bugfix
6642
2020-12-18 15:19:54 +08:00
TangBin
2e401b5664 fix(region): create vm with eip task fix 2020-12-18 15:19:53 +08:00
wanyaoqi
52f0afda00 fix(region): fix change config forecast 2020-12-18 14:58:57 +08:00
--global
1a1df0f075 feat(monitor): add alert slience time and modify scoperesource FetchUniqValues func
1.增加报警静默时间
2.后端修改 scoperesource FetchUniqValues :回显scope 属性
2020-12-18 14:40:46 +08:00
rainzm
79eacb5b45 feat(region): send webhook server_create when canceling pending delete 2020-12-18 13:10:21 +08:00
rainzm
0c72872330 feat(region): distinguish between pending delete and delete notification 2020-12-18 13:10:21 +08:00
wanyaoqi
8287f3767e fix(keystone): service config ignore deploy server socket path 2020-12-18 12:52:52 +08:00
Zexi Li
3ab9d15bf0 Merge pull request #9478 from yousong/automated-cherry-pick-of-#9458-upstream-release-3.6
Automated cherry pick of #9458: Bugfix/yousong eip ipaddr
2020-12-18 12:51:32 +08:00
Zexi Li
854d160875 Merge pull request #9473 from yousong/automated-cherry-pick-of-#9472-upstream-release-3.6
Automated cherry pick of #9472: Bugfix/yousong host mtu
2020-12-18 00:19:22 +08:00
Zexi Li
bb23fc8ae9 Merge pull request #9477 from wanyaoqi/automated-cherry-pick-of-#9476-upstream-release-3.6
Automated cherry pick of #9476: fix(host-deployer): probe image info umount rootfs first
2020-12-18 00:17:39 +08:00
Yousong Zhou
bb0568d18a fix(region): eip_allocate_task: set eip status allocate_fail on task failure 2020-12-17 22:01:02 +08:00
Yousong Zhou
baff004838 fix(region,climc): eips: rename arg name for requested eip addr 2020-12-17 22:01:02 +08:00
Yousong Zhou
6e449c123b fix(region): guestnetworks: use net calculated mtu 2020-12-17 21:51:23 +08:00
Yousong Zhou
80efc97c69 feat(region): networks: add getMtu method 2020-12-17 21:51:23 +08:00
Yousong Zhou
aaec97470b feat(apis): add const VPC_OVN_ENCAP_COST 2020-12-17 21:51:22 +08:00
Yousong Zhou
206ae7f9e8 feat(host): startvm: set vpc nic mtu
Windows DHCP client does not respect DHCP MTU option
2020-12-17 21:51:22 +08:00
Yousong Zhou
005fad402c feat(host): startvm: add nic_mtu shell func 2020-12-17 21:51:22 +08:00
Yousong Zhou
c2d173ae1c refactor(host): startvm: for compat
QEMU 2.12 outputs device help on stderr in the following style

```
virtio-net-pci.speed=int32
```

QEMU 5.2.0 outputs it to stdout and in the following format

```
  speed=<int32>          -  (default: -1)
```
2020-12-17 21:51:22 +08:00
Yousong Zhou
38492014b5 refactor(host): startvm: nic_speed: use raw string 2020-12-17 21:51:22 +08:00
Yousong Zhou
4cf3565b29 refactor(host): startvm: add QEMU_CMD_KVM_ARG 2020-12-17 21:51:22 +08:00
wanyaoqi
7ed96af338 fix(host-deployer): probe image info umount rootfs first 2020-12-17 20:34:07 +08:00
Zexi Li
7fcd0fc28a Merge pull request #9471 from ioito/automated-cherry-pick-of-#9470-upstream-release-3.6
Automated cherry pick of #9470: fix(region): apsara metrics fix
2020-12-17 16:03:31 +08:00
Qu Xuan
a67b096686 fix(region): apsara metrics fix 2020-12-17 16:01:58 +08:00
Zexi Li
b2e6c1bd55 Merge pull request #9464 from rainzm/automated-cherry-pick-of-#9463-upstream-release-3.6
Automated cherry pick of #9463: fix(region): exclude network recommended for host when suggesting net…
2020-12-17 11:22:03 +08:00
Zexi Li
fb181a47a1 Merge pull request #9469 from tb365/automated-cherry-pick-of-#9467-upstream-release-3.6
Automated cherry pick of #9467: fix(region): skus add cloudenv
2020-12-17 11:17:46 +08:00
TangBin
f17593d3f4 fix(region): skus add cloudenv 2020-12-17 11:05:14 +08:00
rainzm
930c643153 fix(region): exclude network recommended for host when suggesting network for guest 2020-12-17 10:12:42 +08:00
Zexi Li
6f44812520 Merge pull request #9442 from wanyaoqi/automated-cherry-pick-of-#9441-upstream-release-3.6
Automated cherry pick of #9441: bugfix(region): server change config rebase to sched task
2020-12-17 09:50:45 +08:00
Zexi Li
347857f40e Merge pull request #9455 from zexi/automated-cherry-pick-of-#9454-upstream-release-3.6
Automated cherry pick of #9454: fix(scheduler): fetch input network when specified
2020-12-16 18:24:38 +08:00
wanyaoqi
5314ce98b0 bugfix(region): server change config rebase to sched task 2020-12-16 18:07:50 +08:00
Zexi Li
9644513728 Merge pull request #9453 from swordqiu/automated-cherry-pick-of-#9452-upstream-release-3.6
Automated cherry pick of #9452: fix(keystone): panic if request with an invalid token
2020-12-16 17:57:31 +08:00
Zexi Li
5cfd7f0401 fix(scheduler): fetch input network when specified 2020-12-16 17:50:25 +08:00
Qiu Jian
5a71931982 fix(keystone): panic if request with an invalid token
service report nil pointer panic if request with an invalid token string
2020-12-16 16:47:03 +08:00
Zexi Li
e877b081ea Merge pull request #9445 from tb365/automated-cherry-pick-of-#9443-upstream-release-3.6
Automated cherry pick of #9443: Bugfix/tb bugfix 121501
2020-12-16 12:25:50 +08:00
Zexi Li
5de1f1c3ff Merge pull request #9419 from zexi/automated-cherry-pick-of-#9418-upstream-release-3.6
Automated cherry pick of #9418: fix(region): baremetal post update related server
2020-12-16 10:40:55 +08:00
Zexi Li
f65b3499d9 Merge pull request #9448 from swordqiu/automated-cherry-pick-of-#9447-upstream-release-3.6
Automated cherry pick of #9447: fix(log): fail to submit action log
2020-12-16 09:32:56 +08:00
Zexi Li
903367ce61 Merge pull request #9440 from zhaoxiangchun/automated-cherry-pick-of-#9439-upstream-release-3.6
Automated cherry pick of #9439: feat(monitor): support create nodata alert from web
2020-12-16 09:27:18 +08:00
Qiu Jian
1a2a40a811 fix(log): fail to submit action log
Because splitable not implement InsertOrMethod method, fail to submit
action log
2020-12-16 00:25:58 +08:00
TangBin
eee13a549b fix(awscli): instance-rebuild-root fix 2020-12-15 21:05:06 +08:00
TangBin
cef3d52f08 fix(region): vpc sync external access mode fix 2020-12-15 20:57:39 +08:00
TangBin
596b376d85 fix(region): vpc usable fix 2020-12-15 20:57:39 +08:00
TangBin
efb4368716 fix(region): aws create vpc with igw add defaultroute 2020-12-15 20:57:38 +08:00
TangBin
ac89394947 fix(region): aws delete vpc skipped delete main route table 2020-12-15 20:57:38 +08:00
TangBin
5ff27734bc fix(region): aws vpc delete skip delete default secgroup 2020-12-15 20:57:38 +08:00
TangBin
9f52afdf94 fix(region): aws vpc delete related route table & internet gateway 2020-12-15 20:57:38 +08:00
TangBin
72153ecf58 fix(region): sku list query print missing error info 2020-12-15 20:57:38 +08:00
TangBin
9218c9e0b6 fix(region): aws create storage type fix 2020-12-15 20:57:37 +08:00
TangBin
68a2111bfd fix(region): aws create root device name fix 2020-12-15 20:56:57 +08:00
TangBin
b46d51d1e3 fix(region): vpc create validate cidr mask length 2020-12-15 20:56:57 +08:00
TangBin
da82328076 fix(region): aws detach igw before delete vpc 2020-12-15 20:56:57 +08:00
TangBin
b30a40d707 fix(region): vpc list usable fix 2020-12-15 20:56:57 +08:00
TangBin
8a1d15eba1 feat(region): server list add parameter eip_associable 2020-12-15 20:56:57 +08:00
yunion-ci-robot
007ad2cdc7 Merge pull request #9436 from wanyaoqi/automated-cherry-pick-of-#9435-upstream-release-3.6
Automated cherry pick of #9435: fix(host): fix set windows password with escape charater
2020-12-15 20:51:19 +08:00
zhaoxiangchun
c2b8f6a832 feat(monitor): support create nodata alert from web
1.支持从前端页面创建nodata报警策略,对于nodata的情况给出对应的resource
2020-12-15 18:21:37 +08:00
wanyaoqi
539baf7ba1 fix(host): fix set windows password with escape charater 2020-12-15 16:57:08 +08:00
Zexi Li
5f610498e8 Merge pull request #9416 from swordqiu/automated-cherry-pick-of-#9415-upstream-release-3.6
Automated cherry pick of #9415: fix(keystone): update user attributes whenever user login
2020-12-15 11:54:59 +08:00
Zexi Li
cd798b9094 Merge pull request #9432 from zexi/automated-cherry-pick-of-#9431-upstream-release-3.6
Automated cherry pick of #9431: Fix/climc server create desc
2020-12-15 11:51:56 +08:00
Zexi Li
d86d91dfcc Merge pull request #9427 from yousong/automated-cherry-pick-of-#9426-upstream-release-3.6
Automated cherry pick of #9426: fix(vpcagent): ovn: stable dns A record value
2020-12-15 11:44:49 +08:00
Zexi Li
df45ced78b fix(climc): server-create --desc not work 2020-12-15 11:36:01 +08:00
Yousong Zhou
b3e196950e fix(vpcagent): ovn: stable dns A record value 2020-12-15 10:47:16 +08:00
Zexi Li
d1f09e0799 Merge pull request #9420 from wanyaoqi/automated-cherry-pick-of-#9417-upstream-release-3.6
Automated cherry pick of #9417: fix(region,host): fix hot remove nic
2020-12-15 00:08:57 +08:00
Zexi Li
d001e0ec8f fix(region): baremetal post update related server 2020-12-14 19:16:44 +08:00
wanyaoqi
7c1923abf0 fix(region,host): fix hot remove nic
- region: check is hot remove nic enable
- host: del qemu device after del netdev
2020-12-14 19:01:14 +08:00
wanyaoqi
fbd53b4934 fix(host): fix check hugepage enabled 2020-12-14 19:01:14 +08:00
Qiu Jian
a4b4a1d16e fix(keystone): update user attributes whenever user login
update user attribtues whenever user login
2020-12-14 18:19:46 +08:00
Zexi Li
0210763ca0 Merge pull request #9412 from zexi/automated-cherry-pick-of-#9411-upstream-release-3.6
Automated cherry pick of #9411: fix(scheduler): sku filter check zone if only prefer region specified
2020-12-14 17:56:40 +08:00
yunion-ci-robot
fddf03a3ba Merge pull request #9410 from wanyaoqi/automated-cherry-pick-of-#9409-upstream-release-3.6
Automated cherry pick of #9409: feat(region): export user tags support virtual resources
2020-12-14 17:55:05 +08:00
Zexi Li
019c034133 fix(scheduler): sku filter check zone if only prefer region specified 2020-12-14 17:26:17 +08:00
Zexi Li
b1f2d7f379 Merge pull request #9407 from zexi/automated-cherry-pick-of-#9405-upstream-release-3.6
Automated cherry pick of #9405: Hotfix/webconsole trim url
2020-12-14 17:21:29 +08:00
Zexi Li
db9799c7f5 Merge pull request #9374 from rainzm/automated-cherry-pick-of-#9373-upstream-release-3.6
Automated cherry pick of #9373: feat(region): larger suggest network and more complete vlanid
2020-12-14 15:57:59 +08:00
wanyaoqi
d76915893d feat(region): export user tags support virtual resources 2020-12-14 15:56:46 +08:00
Zexi Li
64f94bd928 Merge pull request #9395 from zexi/automated-cherry-pick-of-#9394-upstream-release-3.6
Automated cherry pick of #9394: fix(scheduler): get candidates error more info
2020-12-14 15:52:27 +08:00
Zexi Li
f6713aab33 Merge pull request #9404 from wanyaoqi/automated-cherry-pick-of-#9403-upstream-release-3.6
Automated cherry pick of #9403: fix(region,glance): list by os arch adapt to empty strings
2020-12-14 15:50:56 +08:00
Zexi Li
1236a03269 fix(webconsole): trim api_server url if end with slashes 2020-12-14 15:47:53 +08:00
Zexi Li
4ef482dbc9 Merge pull request #9400 from rainzm/automated-cherry-pick-of-#9399-upstream-release-3.6
Automated cherry pick of #9399: fix(notify): avoid deadlock
2020-12-14 15:45:34 +08:00
wanyaoqi
027a9439cd fix(region,glance): list by os arch adapt to empty strings 2020-12-14 15:15:26 +08:00
rainzm
b1abb353a9 fix(notify): avoid deadlock 2020-12-14 15:05:46 +08:00
Zexi Li
01124b3128 fix(scheduler): get candidates error more info 2020-12-14 14:40:44 +08:00
rainzm
ae94914a7e feat(region): add test for CloudaccountManger.PerformPrepareNets 2020-12-14 14:17:58 +08:00
rainzm
cc26752697 feat(region): larger suggest network and more complete vlanid
1. 抓取标准 PortGroup 的 vlanid,以前只有分布式 PortGroup 的 vlanid
2. 提供的建议网络会尽可能的大
2020-12-14 14:17:58 +08:00
Zexi Li
d1a4a52915 Merge pull request #9389 from tb365/automated-cherry-pick-of-#9386-upstream-release-3.6
Automated cherry pick of #9386: feat(region): support sync skus by cloudregion
2020-12-13 13:51:46 +08:00
Zexi Li
7837a760b5 Merge pull request #9379 from ioito/automated-cherry-pick-of-#9351-upstream-release-3.6
Automated cherry pick of #9351: feat(cloudid): support aliyun saml auth
2020-12-13 12:13:53 +08:00
Zexi Li
08b436e90d Merge pull request #9385 from ioito/automated-cherry-pick-of-#9384-upstream-release-3.6
Automated cherry pick of #9384: fix(region): optimized server stop code
2020-12-13 12:12:28 +08:00
Zexi Li
5ca9493a55 Merge pull request #9391 from swordqiu/automated-cherry-pick-of-#9390-upstream-release-3.6
Automated cherry pick of #9390: fix(region): network reserved ip count not consider expiration of reserved ips
2020-12-13 12:09:22 +08:00
Qiu Jian
d8684ea5a0 fix(region): network reserved ip count not consider expiration of reserved ips
network reserved ip count not consider expiration of reserved ips
2020-12-12 19:42:05 +08:00
TangBin
d86f9a2009 feat(region): support sync skus by cloudregion 2020-12-12 19:11:21 +08:00
Qu Xuan
0a8348a364 fix(region): optimized server stop code 2020-12-12 18:54:27 +08:00
Zexi Li
9b5f8ae892 Merge pull request #9378 from tb365/automated-cherry-pick-of-#9359-upstream-release-3.6
Automated cherry pick of #9359: Bugfix/tb bugfix cmb 1210
2020-12-12 18:29:02 +08:00
Qu Xuan
592ae29d7e feat(cloudid): support aliyun saml auth 2020-12-12 18:06:54 +08:00
TangBin
86838db6d3 feat(region): support sync skus by cloudregion 2020-12-12 17:48:04 +08:00
TangBin
f20ca8b9c9 fix(region): server login info& keypair import input parameter trimspace 2020-12-12 17:48:04 +08:00
Zexi Li
474831d983 Merge pull request #9314 from zhaoxiangchun/automated-cherry-pick-of-#9313-upstream-release-3.6
Automated cherry pick of #9313: feat(monitor): add metric description
2020-12-12 00:17:54 +08:00
Zexi Li
84c89654ef Merge pull request #9364 from swordqiu/automated-cherry-pick-of-#9361-upstream-release-3.6
Automated cherry pick of #9361: fix(keystone): allow unlink a domain from an IDP
2020-12-12 00:16:36 +08:00
Zexi Li
d6735144c6 Merge pull request #9363 from swordqiu/automated-cherry-pick-of-#9362-upstream-release-3.6
Automated cherry pick of #9362: fix(util): update vendor for log
2020-12-12 00:15:02 +08:00
Zexi Li
6aeb3a77cb Merge pull request #9367 from swordqiu/automated-cherry-pick-of-#9366-upstream-release-3.6
Automated cherry pick of #9366: fix(keystone): ignore service config update without changes
2020-12-12 00:13:46 +08:00
Qiu Jian
e817076c6c fix(keystone): ignore service config update without changes
ignore service config updates that no changes happen. prevent service
config change infomrer messages from flushing the log.
2020-12-11 22:21:51 +08:00
Qiu Jian
253fba47f5 fix(keystone): allow unlink a domain from an IDP
allow unlink a domain from an IDP
2020-12-11 21:50:53 +08:00
Qiu Jian
b4d5400e65 update vendor 2020-12-11 20:50:50 +08:00
zhaoxiangchun
09660da0a9 feat(monitor): add metric description
1.添加oss、rds、redis、vm_netio metric description
2.修改hostmetrics vm_netio 指标:
  bits_sent ==> bps_sent
  bits_recv ==> bps_recv
3.对metric中field进行排序

https://bug.yunion.io/zentao/task-view-2358.html
2020-12-11 20:17:13 +08:00
Zexi Li
6748a36e0c Merge pull request #9357 from ioito/automated-cherry-pick-of-#9356-upstream-release-3.6
Automated cherry pick of #9356: fix(region): sku enabled
2020-12-11 19:37:15 +08:00
Zexi Li
6c57580a8e Merge pull request #9297 from swordqiu/automated-cherry-pick-of-#9160-upstream-release-3.6
Automated cherry pick of #9160: feature(cloudcommon): split opslog table
2020-12-11 19:31:12 +08:00
Qu Xuan
92fee001e8 fix(region): sku enabled 2020-12-11 17:08:50 +08:00
yunion-ci-robot
ce247ab817 Merge pull request #9336 from zexi/automated-cherry-pick-of-#9335-upstream-release-3.6
Automated cherry pick of #9335: Hotfix/baremetal convert host
2020-12-11 13:32:15 +08:00
Zexi Li
8e964f3c3c Merge pull request #9343 from ioito/automated-cherry-pick-of-#9339-upstream-release-3.6
Automated cherry pick of #9339: fix(region,yunionapi,glance): using global proxy
2020-12-11 11:40:48 +08:00
Zexi Li
1f23060475 Merge pull request #9353 from zexi/automated-cherry-pick-of-#9352-upstream-release-3.6
Automated cherry pick of #9352: Bugfix/scheduler SKU net
2020-12-11 09:18:22 +08:00
Zexi Li
24fdb6e84e fix(scheduler): sku by region and fill onecloud vpc networks 2020-12-10 21:13:51 +08:00
Zexi Li
d06c049cd9 Merge pull request #9332 from ioito/automated-cherry-pick-of-#9331-upstream-release-3.6
Automated cherry pick of #9331: fix(region): openstack hosts sync
2020-12-10 20:40:07 +08:00
Zexi Li
1f5916fd7f Merge pull request #9348 from swordqiu/automated-cherry-pick-of-#9347-upstream-release-3.6
Automated cherry pick of #9347: fix(cloudcommon): perform public should check the sharing scope of
2020-12-10 20:38:02 +08:00
Zexi Li
8114d1a292 Merge pull request #9341 from ioito/automated-cherry-pick-of-#9340-upstream-release-3.6
Automated cherry pick of #9340: fix(region): import rule error hint
2020-12-10 20:33:28 +08:00
Zexi Li
ff1b6a1de0 Merge pull request #9346 from wanyaoqi/automated-cherry-pick-of-#9345-upstream-release-3.6
Automated cherry pick of #9345: fix(region): gpu server change config use reserved resources
2020-12-10 20:32:31 +08:00
Qiu Jian
de47e4a69b fix(cloudcommon): perform public should check the sharing scope of resource
perform public should check the sharing scope of resource
2020-12-10 19:15:24 +08:00
wanyaoqi
b07387b57a fix(region): gpu server change config use reserved resources 2020-12-10 18:40:59 +08:00
Qu Xuan
c1ecb63309 fix(region,yunionapi,glance): using global proxy 2020-12-10 18:33:40 +08:00
Qu Xuan
a8116b5252 fix(region): import rule error hint 2020-12-10 18:29:34 +08:00
Zexi Li
24a5cf7a7c Merge pull request #9330 from ioito/automated-cherry-pick-of-#9329-upstream-release-3.6
Automated cherry pick of #9329: fix(region): aws default account
2020-12-10 17:23:38 +08:00
Zexi Li
1e15c450c8 Merge pull request #9326 from rainzm/automated-cherry-pick-of-#9325-upstream-release-3.6
Automated cherry pick of #9325: Try to repull contacts when changing notify config
2020-12-10 17:22:17 +08:00
Zexi Li
1f63971f77 Merge pull request #9299 from ioito/automated-cherry-pick-of-#9298-upstream-release-3.6
Automated cherry pick of #9298: fix(region): support openstack subnet allocation pools
2020-12-10 17:17:53 +08:00
Zexi Li
504feb9504 Merge pull request #9321 from swordqiu/automated-cherry-pick-of-#9320-upstream-release-3.6
Automated cherry pick of #9320: fix(cloudcommon): disable quota check by default
2020-12-10 17:08:39 +08:00
Zexi Li
eb857594f2 fix(baremetal): convert to host failed
- convert schedule should include converting status
- auto register name should lowercase
- finish convert set host name by guest
2020-12-10 16:58:42 +08:00
Qu Xuan
8692498cbd fix(region): openstack hosts sync 2020-12-10 16:55:41 +08:00
Qu Xuan
97eab67f0a fix(region): aws default account 2020-12-10 16:24:48 +08:00
rainzm
c5acc1b482 fix(notify): repull subcontact after changing config 2020-12-10 10:26:09 +08:00
rainzm
6591ccedc5 fix(notify): check for changes before updating config 2020-12-10 10:26:09 +08:00
rainzm
8d6defe227 refactor(notify): add StartSubcontactPullTask for receiver 2020-12-10 10:26:09 +08:00
Qiu Jian
6f7a3cf8a5 fix(cloudcommon): disable quota check by default
1. add enable_quota_check common option
2. disable quota check by default
3. specify scope of quota limit in OutOfQuota error message
2020-12-10 01:23:36 +08:00
Qiu Jian
93ceb707b7 update vendor 2020-12-09 23:05:49 +08:00
Qiu Jian
ec14f9a6bb feature(cloudcommon): split opslog table
automatically split opslog table, so as to delete obsolete event logs
2020-12-09 23:05:49 +08:00
Zexi Li
8570eec751 Merge pull request #9296 from swordqiu/automated-cherry-pick-of-#9295-upstream-release-3.6
Automated cherry pick of #9295: fix(cloudcommon): supplement i18n translations
2020-12-09 20:44:22 +08:00
Zexi Li
689b622066 Merge pull request #9293 from rainzm/automated-cherry-pick-of-#9292-upstream-release-3.6
Automated cherry pick of #9292: feat(notify): add intellij-get for receiver
2020-12-09 20:43:26 +08:00
Zexi Li
c901acb721 Merge pull request #9236 from wanyaoqi/automated-cherry-pick-of-#8848-upstream-release-3.6
Automated cherry pick of #8848: host-deployer: add deploy driver libguestfs
2020-12-09 20:41:37 +08:00
Zexi Li
81ca10b5f7 Merge pull request #9260 from wanyaoqi/automated-cherry-pick-of-#9259-upstream-release-3.6
Automated cherry pick of #9259: fix(region): attach network on register baremetal server
2020-12-09 20:40:06 +08:00
Zexi Li
5a0432fbc9 Merge pull request #9303 from ioito/automated-cherry-pick-of-#9302-upstream-release-3.6
Automated cherry pick of #9302: fix(region): optimized qcloud prepaid instance delete
2020-12-09 20:37:31 +08:00
Zexi Li
d8d6ca8611 Merge pull request #9307 from ioito/automated-cherry-pick-of-#9305-upstream-release-3.6
Automated cherry pick of #9305: fix(region): optimized openstack change config
2020-12-09 20:36:33 +08:00
Zexi Li
27fb34c3d4 Merge pull request #9309 from yousong/automated-cherry-pick-of-#9308-upstream-release-3.6
Automated cherry pick of #9308: Bugfix/yousong eip chargetype
2020-12-09 20:35:00 +08:00
Zexi Li
2ee09e4581 Merge pull request #9316 from wanyaoqi/automated-cherry-pick-of-#9315-upstream-release-3.6
Automated cherry pick of #9315: fix(host): check lease living on restart etcd session
2020-12-09 20:33:35 +08:00
rainzm
e17768fbc2 feat(notify): user cmdline helpler for climc notify-receiver-xxx 2020-12-09 17:03:36 +08:00
rainzm
75b0889c30 feat(notify): add intellij-get for receiver 2020-12-09 17:03:36 +08:00
wanyaoqi
1611ddfcdf fix(host): check lease living on restart etcd session 2020-12-09 16:55:53 +08:00
Yousong Zhou
a28fa3cf40 refactor(apis): compute: remove EIP_CHARGE_TYPE_DEFAULT
The default is now cloud provider specific
2020-12-09 12:16:49 +08:00
Yousong Zhou
14d6c9d6ed fix(region): sanitize eip charge type on all callsites 2020-12-09 12:16:49 +08:00
Yousong Zhou
8d7d240b30 feat(region): regiondriver: add methods on eip charge type 2020-12-09 12:16:49 +08:00
Qu Xuan
0d32c5d8e2 fix(region): optimized openstack change config 2020-12-09 11:51:47 +08:00
Qu Xuan
b5b7e89c6a fix(region): optimized qcloud prepaid instance delete 2020-12-09 11:48:57 +08:00
Qu Xuan
edcff8045f fix(region): support openstack subnet allocation pools 2020-12-09 10:29:52 +08:00
Qiu Jian
83a5f95b0e fix(cloudcommon): supplement i18n translations 2020-12-09 00:57:03 +08:00
Zexi Li
5878ce8bf5 Merge pull request #9254 from ioito/automated-cherry-pick-of-#9253-upstream-release-3.6
Automated cherry pick of #9253: fix(region): temp url sign wrong
2020-12-08 21:39:45 +08:00
Zexi Li
b63a1a0811 Merge pull request #9264 from ioito/automated-cherry-pick-of-#9263-upstream-release-3.6
Automated cherry pick of #9263: fix(region): azure instance data disk storage type
2020-12-08 21:38:49 +08:00
Zexi Li
f99acd1aeb Merge pull request #9276 from ioito/automated-cherry-pick-of-#9266-upstream-release-3.6
Automated cherry pick of #9266: fix(region): openstack available zones
2020-12-08 21:37:30 +08:00
Zexi Li
6cb5b3314d Merge pull request #9278 from wanyaoqi/automated-cherry-pick-of-#9277-upstream-release-3.6
Automated cherry pick of #9277: fix(region): validate isolated devices on migrate
2020-12-08 21:35:59 +08:00
Zexi Li
bb3ed50e5d Merge pull request #9283 from ioito/automated-cherry-pick-of-#9282-upstream-release-3.6
Automated cherry pick of #9282: fix(region): restore password validate condition
2020-12-08 21:35:11 +08:00
Zexi Li
7120df1e22 Merge pull request #9286 from ioito/automated-cherry-pick-of-#9285-upstream-release-3.6
Automated cherry pick of #9285: fix(region): sync account id
2020-12-08 21:34:16 +08:00
Zexi Li
38d561dee8 Merge pull request #9291 from zhasm/automated-cherry-pick-of-#9288-upstream-release-3.6
Automated cherry pick of #9288: fix(git,make): 更新获取 git branch 的规则
2020-12-08 18:11:44 +08:00
Zhang Dongliang
e8376f9981 fix(git,make): 更新获取 git branch 的规则 2020-12-08 18:01:15 +08:00
Qu Xuan
e540e6561a fix(region): sync account id 2020-12-08 17:58:43 +08:00
wanyaoqi
cfa1a4ee4f feat(host-deployer): add deploy driver libguestfs
Add drvier libguestfs to support deploy more operator system,
you can use it by edit host config file add 'image_deploy_driver: libguestfs'.
By the default host-deploy support run three guestfish at the same time.
And host deployer will recycle free guestfish every ten minitues.

cherrypick: release/3.6
2020-12-08 17:50:39 +08:00
Qu Xuan
acedb4a4f4 fix(region): restore password validate condition 2020-12-08 17:45:42 +08:00
yunion-ci-robot
3851497bad Merge pull request #9273 from wanyaoqi/automated-cherry-pick-of-#9272-upstream-release-3.6
Automated cherry pick of #9272: fix(host-deployer): cancel rename centos vgname
2020-12-08 17:07:39 +08:00
wanyaoqi
78e8d2f35e fix(region): validate isolated devices on migrate 2020-12-08 16:51:12 +08:00
Qu Xuan
7abd40c545 fix(region): openstack available zones 2020-12-08 16:47:17 +08:00
Zexi Li
1a2ed75cfa Merge pull request #9269 from zhasm/automated-cherry-pick-of-#9268-upstream-release-3.6
Automated cherry pick of #9268: fix(git,make): git branch 获取方式优化
2020-12-08 16:35:33 +08:00
wanyaoqi
41631ec09d fix(host-deployer): cancel rename centos vgname 2020-12-08 16:29:40 +08:00
wanyaoqi
dcd8936927 fix(region): attach network on register baremetal server 2020-12-08 16:08:19 +08:00
Zhang Dongliang
d7d4e6bf6e fix(git,make): git branch 获取方式优化 2020-12-08 15:51:43 +08:00
Qu Xuan
3633baaa2b fix(region): azure instance data disk storage type 2020-12-08 15:03:00 +08:00
Zexi Li
71c4b03644 Merge pull request #9258 from zhasm/automated-cherry-pick-of-#9230-upstream-release-3.6
Automated cherry pick of #9230: fix(git,make): 修正 gitbranch 变量的获取方式,解决自动升级版本 tag 不统一的问题
2020-12-08 12:51:01 +08:00
Zhang Dongliang
b0a95cbbe6 fix(git,make): 修正 gitbranch 变量的获取方式,允许外部传入,解决自动升级版本 tag 不统一的问题 2020-12-08 11:51:34 +08:00
Qu Xuan
c6a7a87014 fix(region): temp url sign wrong 2020-12-08 11:36:14 +08:00
Zexi Li
db0eda7986 Merge pull request #9148 from ioito/automated-cherry-pick-of-#9146-upstream-release-3.6
Automated cherry pick of #9146: fix(keystone): allow refresh scope resource
2020-12-08 09:40:20 +08:00
Zexi Li
9cac40775a Merge pull request #9247 from wanyaoqi/automated-cherry-pick-of-#9246-upstream-release-3.6
Automated cherry pick of #9246: fix(region): fix backup server start task
2020-12-08 09:35:26 +08:00
Zexi Li
3158a5c06b Merge pull request #9252 from swordqiu/automated-cherry-pick-of-#9251-upstream-release-3.6
Automated cherry pick of #9251: fix(keystone): rolepolicies list panic if filter by domain scope
2020-12-08 09:34:23 +08:00
Zexi Li
e8bdb396e9 Merge pull request #9249 from swordqiu/automated-cherry-pick-of-#9248-upstream-release-3.6
Automated cherry pick of #9248: fix(keystone): oidc driver turn on debug mode if log-level is debug
2020-12-08 09:29:00 +08:00
Qiu Jian
695075a853 fix(keystone): rolepolicies list panic if filter by domain scope
rolepolicies list panic if filter by scope=domain
2020-12-08 03:15:56 +08:00
Qiu Jian
e826239abf fix(keystone): oidc driver turn on debug mode if log-level is debug
oidc driver turn on debug mode if log-level is debug
2020-12-08 02:55:36 +08:00
Zexi Li
690efe5ec1 Merge pull request #9244 from ioito/automated-cherry-pick-of-#9243-upstream-release-3.6
Automated cherry pick of #9243: fix(region): azure reset windows os password
2020-12-07 22:18:57 +08:00
wanyaoqi
735f10a508 fix(region): fix backup server start task 2020-12-07 21:08:03 +08:00
Zexi Li
0d537a1dbb Merge pull request #9241 from ioito/automated-cherry-pick-of-#9240-upstream-release-3.6
Automated cherry pick of #9240: fix(region): avoid timeout for waiting azure async task
2020-12-07 20:41:15 +08:00
Zexi Li
b3f4b135ec Merge pull request #9226 from tb365/automated-cherry-pick-of-#9224-upstream-release-3.6
Automated cherry pick of #9224: Bugfix/tb bugfix 1207
2020-12-07 20:37:52 +08:00
Qu Xuan
81b31b2fe1 fix(region): azure reset windows os password 2020-12-07 20:20:01 +08:00
Zexi Li
03c4a66beb Merge pull request #9221 from ioito/automated-cherry-pick-of-#9220-upstream-release-3.6
Automated cherry pick of #9220: fix(region): region qcloud secgroup project id
2020-12-07 20:18:18 +08:00
Zexi Li
923c03e530 Merge pull request #9228 from ioito/automated-cherry-pick-of-#9227-upstream-release-3.6
Automated cherry pick of #9227: fix(region): avoid resize azure disk error
2020-12-07 20:16:49 +08:00
Zexi Li
23faa02b07 Merge pull request #9232 from wanyaoqi/automated-cherry-pick-of-#9231-upstream-release-3.6
Automated cherry pick of #9231: fix(host): update telegraf conf adapter to container environment
2020-12-07 19:59:21 +08:00
Zexi Li
81d37b74dd Merge pull request #9238 from rainzm/automated-cherry-pick-of-#9237-upstream-release-3.6
Automated cherry pick of #9237: feat(notify): add webconsole in enabled contact types
2020-12-07 19:57:48 +08:00
Qu Xuan
f22fe4fe36 fix(region): avoid timeout for waiting azure async task 2020-12-07 19:50:41 +08:00
rainzm
bce332272c feat(notify): add webconsole in enabled contact types 2020-12-07 19:13:59 +08:00
TangBin
7b96d2593d fix(region): lbcert&lbacl releated listener count bugfix 2020-12-07 17:37:38 +08:00
TangBin
08dda723b4 fix(region): lb listener filter by acl_id 2020-12-07 17:37:38 +08:00
TangBin
76eb124896 fix(region): redis master zone empty fix 2020-12-07 17:37:38 +08:00
TangBin
8bdcc83a8f fix(region): elastic cache name is empty fix
#6527
2020-12-07 17:37:38 +08:00
wanyaoqi
cbc2859248 fix(host): update telegraf conf adapter to container environment 2020-12-07 17:14:36 +08:00
Qu Xuan
0bfa488acd fix(region): avoid resize azure disk error 2020-12-07 15:25:59 +08:00
Zexi Li
23c5ba2b68 Merge pull request #9208 from ioito/automated-cherry-pick-of-#9205-upstream-release-3.6
Automated cherry pick of #9205: fix(region): validate invalid character for password
2020-12-07 10:52:09 +08:00
Qu Xuan
3e7d3c829a fix(keystone): allow refresh scope resource 2020-12-07 10:48:06 +08:00
Qu Xuan
45a3ce82da fix(region): region qcloud secgroup project id 2020-12-07 10:27:36 +08:00
Zexi Li
ca8e69c981 Merge pull request #9203 from tb365/automated-cherry-pick-of-#9202-upstream-release-3.6
Automated cherry pick of #9202: Bugfix/tb bugfix 1204
2020-12-07 10:23:59 +08:00
Qu Xuan
35544a7c2f fix(region): validate invalid character for password 2020-12-07 10:07:58 +08:00
TangBin
133ba01e94 fix(region): change dbinstance sku sync info log to warn 2020-12-07 10:01:08 +08:00
TangBin
7be898fbca fix(region): dbinstance skus sync log level fix 2020-12-07 10:01:08 +08:00
TangBin
d39b3e820a fix(region): server skus add cloud_env 2020-12-07 10:01:08 +08:00
Zexi Li
43522bbe97 Merge pull request #9218 from ioito/automated-cherry-pick-of-#9217-upstream-release-3.6
Automated cherry pick of #9217: fix(region): optimized qcloud secgroup sync, only redis need secgroup be in same project
2020-12-04 20:31:33 +08:00
Zexi Li
e33c96c2f7 Merge pull request #9216 from zhaoxiangchun/automated-cherry-pick-of-#9215-upstream-release-3.6
Automated cherry pick of #9215: chore(monitor): delete suggestion files
2020-12-04 20:27:26 +08:00
Qu Xuan
a84ed01f2f fix(region): optimized qcloud secgroup sync, only redis need secgroup be in same project 2020-12-04 19:43:45 +08:00
zhaoxiangchun
83e899d9a9 chore(monitor): delete suggestion files
1. 移除优化建议相关内容
2. mcclient中新增baseManager:SuggestionManager,修改优化建议相关的manager
2020-12-04 19:28:45 +08:00
Zexi Li
c2b0c57454 Merge pull request #9214 from zexi/automated-cherry-pick-of-#9213-upstream-release-3.6
Automated cherry pick of #9213: refactor(scheduler): remove unused k8s predicates code
2020-12-04 18:01:36 +08:00
Zexi Li
89f110f635 Merge pull request #9211 from ioito/automated-cherry-pick-of-#9210-upstream-release-3.6
Automated cherry pick of #9210: fix(region): azure metric request path
2020-12-04 18:00:53 +08:00
Zexi Li
2a2867daac refactor(scheduler): remove unused k8s predicates code 2020-12-04 17:25:12 +08:00
Qu Xuan
a79a61c417 fix(region): azure metric request path 2020-12-04 17:14:18 +08:00
Zexi Li
8c78bf5ca0 Merge pull request #9207 from zexi/automated-cherry-pick-of-#9204-upstream-release-3.6
Automated cherry pick of #9204: Hotfix/remove kubernetes depend
2020-12-04 17:02:53 +08:00
Zexi Li
8675c7b4f0 Merge pull request #9200 from lvyangyang/automated-cherry-pick-of-#9196-upstream-release-3.6
Automated cherry pick of #9196: feat(region): add bucket cloud tags support
2020-12-04 16:57:53 +08:00
Zexi Li
734be7c147 fix(go.mod): remove k8s.io/kubernetes dependency 2020-12-04 16:50:01 +08:00
Zexi Li
aab59e899b Merge pull request #9067 from rainzm/automated-cherry-pick-of-#9066-upstream-release-3.6
Automated cherry pick of #9066: feat(region): add wire level for preparing network
2020-12-04 14:53:10 +08:00
lvyangyang
66412faf96 feat(region): add bucket cloud tags support 2020-12-04 14:38:38 +08:00
lvyangyang
de67ee5a26 fix(region): fix modify tags log 2020-12-04 14:38:38 +08:00
rainzm
67788b1790 feat(climc): add cloud-account-preparenets-vmware command 2020-12-04 14:32:19 +08:00
rainzm
aad9aba489 feat(region): allow prepare nets for existed cloudaccounts
纳管云账号 -> 合并网段 -> 为vmware集群添加新的宿主机 ->
如何获取网络信息?

如果重新纳管,那么合并网段的工作又得做一次,很不方便。
最好的方法是,preparenets 接口支持已经存在的 cloudaccount,这样
就可以根据推荐的网络手动设置新设备的网络。
2020-12-04 14:32:19 +08:00
rainzm
5a186dbb3c feat(region): add wire level for preparing network
There are three wire level for vmware: vcenter, datacenter and cluster.
According to different wire levels, the recommended network has a different structure.
2020-12-04 14:32:19 +08:00
Zexi Li
64b9355954 Merge pull request #9190 from rainzm/automated-cherry-pick-of-#9189-upstream-release-3.6
Automated cherry pick of #9189: fix(region): remove default value of diskConfig.Medium
2020-12-04 10:41:27 +08:00
Zexi Li
ef8de3f8ac Merge pull request #9173 from ioito/automated-cherry-pick-of-#9134-upstream-release-3.6
Automated cherry pick of #9134: fix(region): azure win os defualt user
2020-12-04 10:24:31 +08:00
Zexi Li
a3b8f9e1c4 Merge pull request #9145 from yousong/automated-cherry-pick-of-#9144-upstream-release-3.6
Automated cherry pick of #9144: Feature/yousong vpc md
2020-12-04 10:23:34 +08:00
Zexi Li
e93a047b43 Merge pull request #9185 from rainzm/automated-cherry-pick-of-#9183-upstream-release-3.6
Automated cherry pick of #9183: fix(region): inspect invalid guest template
2020-12-04 10:21:09 +08:00
Zexi Li
ca2bfb6f16 Merge pull request #9182 from tb365/automated-cherry-pick-of-#9180-upstream-release-3.6
Automated cherry pick of #9180: Bugfix/tb bugfix 1203
2020-12-04 10:18:48 +08:00
Zexi Li
477edc200b Merge pull request #9193 from swordqiu/automated-cherry-pick-of-#9192-upstream-release-3.6
Automated cherry pick of #9192: fix(apigateway): allow logout by get method
2020-12-04 10:16:33 +08:00
Zexi Li
e1c61f0aae Merge pull request #9187 from zexi/automated-cherry-pick-of-#9184-upstream-release-3.6
Automated cherry pick of #9184: Hotfix/scheduler tag nil
2020-12-04 10:15:37 +08:00
rainzm
216e11f291 fix(region): remove default value of diskConfig.Medium
#8830 中,对调度器增加了通过请求磁盘的介质类型过滤存储的功能。

如果使用 climc 创建虚拟机且不要求磁盘有固定的介质类型,将
只能分配到 hybrid 的存储;进一步,如果没有 hybrid 的存储,将会调度失败。
2020-12-04 09:59:07 +08:00
Qiu Jian
ff24d4a3e3 fix(apigateway): allow logout by get method
All visit logout URL by GET method
2020-12-04 01:13:08 +08:00
Zexi Li
66eee7f72f fix(scheduler): check candidate tag resource is nil 2020-12-03 20:43:50 +08:00
rainzm
5602db8f5e fix(region): inspect invalid guest template
The glance service hangs and other external reasons may cause the guest template to be judged as invalid.
Therefore, health inspection should be performed on time for invalid guest templates.
2020-12-03 20:42:39 +08:00
TangBin
8db56d90f3 fix(region): huawei vnc protocal fix 2020-12-03 20:01:25 +08:00
TangBin
6e0acab93b feat(webconsole): add huawei vnc support 2020-12-03 20:01:25 +08:00
TangBin
69fa370b04 fix(region): elb cached acl sync 2020-12-03 20:01:25 +08:00
Zexi Li
a24d3c478b Merge pull request #9178 from zexi/automated-cherry-pick-of-#9176-upstream-release-3.6
Automated cherry pick of #9176: fix(scheduler): select resource unordered
2020-12-03 19:55:31 +08:00
Zexi Li
4a0aadae45 Merge pull request #9170 from lvyangyang/automated-cherry-pick-of-#9147-upstream-release-3.6
Automated cherry pick of #9147: feat(region): 多云 bucket  website.cors,referer 配置
2020-12-03 19:00:19 +08:00
Zexi Li
5b170650f8 fix(scheduler): select resource unordered 2020-12-03 18:43:16 +08:00
Qu Xuan
a823273884 fix(region): azure win os defualt user 2020-12-03 16:31:43 +08:00
lvyangyang
c9185a43c7 feat(region): 多云 bucket website.cors,referer 配置 2020-12-03 15:22:58 +08:00
Zexi Li
edd10faaf8 Merge pull request #9136 from ioito/automated-cherry-pick-of-#9135-upstream-release-3.6
Automated cherry pick of #9135: feat(cloudid): notify clouduser created
2020-12-03 15:17:11 +08:00
Zexi Li
ced5217f55 Merge pull request #9162 from ioito/automated-cherry-pick-of-#9161-upstream-release-3.6
Automated cherry pick of #9161: feat(region): huawei recovery new rds
2020-12-03 14:44:18 +08:00
Zexi Li
f23fa030ed Merge pull request #9164 from wanyaoqi/automated-cherry-pick-of-#9163-upstream-release-3.6
Automated cherry pick of #9163: bugfix(region): fix list by srever type normal
2020-12-03 14:43:15 +08:00
Zexi Li
ac64afa6b3 Merge pull request #9139 from zhaoxiangchun/automated-cherry-pick-of-#9138-upstream-release-3.6
Automated cherry pick of #9138: fix(monitor): modify influxdbSuggestDriver query err
2020-12-03 14:42:12 +08:00
zhaoxiangchun
96d0f0e63c fix(monitor): modify influxdbSuggestDriver query err
1.修复influxdb相关的建议规则查询数据失败的问题
2020-12-03 13:01:13 +08:00
wanyaoqi
3756993c98 bugfix(region): fix list by srever type normal
server list by normal shouldn't contains gpu and backup servers

cherrypick: release/3.4
2020-12-03 12:06:30 +08:00
Qu Xuan
551aa2f91f feat(region): huawei recovery new rds 2020-12-03 10:51:52 +08:00
Zexi Li
fb2a68bdb1 Merge pull request #9155 from wanyaoqi/automated-cherry-pick-of-#9154-upstream-release-3.6
Automated cherry pick of #9154: feat(region): add list filter server type
2020-12-03 09:33:24 +08:00
Zexi Li
311bc0f4d6 Merge pull request #9151 from ioito/automated-cherry-pick-of-#9150-upstream-release-3.6
Automated cherry pick of #9150: fix(region): avoid qcloud sync local disk error
2020-12-02 21:05:14 +08:00
wanyaoqi
6c4ba17371 feat(region): add list filter server type
list server by specific server type: normal, gpu, backup

cherrypick: release/3.4
2020-12-02 20:30:41 +08:00
Qu Xuan
0c7adedaad fix(region): avoid qcloud sync local disk error 2020-12-02 20:27:07 +08:00
Yousong Zhou
7d0828410a feat(appsrv): Application: add Stop method for shutdown behaviour 2020-12-02 18:04:58 +08:00
Yousong Zhou
6a2136f6c2 refactor(hostman): metadata: eliminate import of guestman 2020-12-02 18:04:58 +08:00
Yousong Zhou
de7eb162fc refactor(hostman): use metadata.DescGetterFunc 2020-12-02 18:04:58 +08:00
Yousong Zhou
0f1fc0fa58 refactor(host): metadata: eliminate ref of guestNic 2020-12-02 18:04:58 +08:00
Yousong Zhou
8f1f1f55c6 feat(host): metadata: make vpc aware metadata handler 2020-12-02 18:04:58 +08:00
Yousong Zhou
9288c2fd81 feat(vpcagent): export subnet mac gen funcs 2020-12-02 18:04:58 +08:00
Zexi Li
45dbd119a4 Merge pull request #9141 from swordqiu/automated-cherry-pick-of-#9140-upstream-release-3.6
Automated cherry pick of #9140: fix(keystone): not allow to disable sql driver
2020-12-02 17:08:37 +08:00
Qiu Jian
695aa81f70 fix(keystone): not allow to disable sql driver
not allow to disable default SQL identity_provider driver
2020-12-02 16:40:21 +08:00
Zexi Li
d8d4cbbdc7 Merge pull request #9062 from zhaoxiangchun/automated-cherry-pick-of-#9061-upstream-release-3.6
Automated cherry pick of #9061: fix(monitor): delete suggestConfig auto init data
2020-12-02 14:52:03 +08:00
Qu Xuan
618d07f456 feat(cloudid): notify clouduser created 2020-12-02 14:46:23 +08:00
zhaoxiangchun
815e16eca0 fix(monitor): delete suggestConfig auto init data
1.删除忽略列表之前逻辑初始化生成的配置config
2.忽略列表默认查询ignore=true的数据
3.修复建议列表 忽略一类建议不生效的问题
2020-12-02 11:19:19 +08:00
Zexi Li
266aa51044 Merge pull request #9132 from ioito/automated-cherry-pick-of-#9131-upstream-release-3.6
Automated cherry pick of #9131: fix(cloudid): sync qcloud collaborators user
2020-12-01 21:08:00 +08:00
Zexi Li
58da48eb52 Merge pull request #9092 from tb365/automated-cherry-pick-of-#9091-upstream-release-3.6
Automated cherry pick of #9091: fix(region): reserved name checking while create redis account
2020-12-01 21:06:10 +08:00
Zexi Li
afa183c026 Merge pull request #9124 from ioito/automated-cherry-pick-of-#9123-upstream-release-3.6
Automated cherry pick of #9123: fix(region): allow delete resource which status is unknown
2020-12-01 21:04:56 +08:00
Zexi Li
c8ddc63b39 Merge pull request #9105 from rainzm/automated-cherry-pick-of-#9104-upstream-release-3.6
Automated cherry pick of #9104: fix(notify): return the result of the second attempt to execute the rpc call
2020-12-01 21:03:16 +08:00
Qu Xuan
82dc179074 fix(cloudid): sync qcloud collaborators user 2020-12-01 20:36:20 +08:00
Zexi Li
c2201a031f Merge pull request #9110 from yousong/automated-cherry-pick-of-#9109-upstream-release-3.6
Automated cherry pick of #9109: fix(host): make sure it won't match vpc guests by accident
2020-12-01 20:13:32 +08:00
Zexi Li
0785c58286 Merge pull request #9121 from ioito/automated-cherry-pick-of-#9120-upstream-release-3.6
Automated cherry pick of #9120: fix(region): allow update rds account and database desc
2020-12-01 19:33:04 +08:00
Zexi Li
1cd298ba6a Merge pull request #9117 from rainzm/automated-cherry-pick-of-#9116-upstream-release-3.6
Automated cherry pick of #9116: fix(region): delete guest without 'purge' in GuestDetachScalingGroupTask
2020-12-01 19:32:04 +08:00
rainzm
b1ef8865b8 fix(notify): return the result of the second attempt to execute the rpc call 2020-12-01 18:23:22 +08:00
Qu Xuan
f35be97569 fix(region): allow delete resource which status is unknown 2020-12-01 17:17:12 +08:00
Qu Xuan
e483d1901e fix(region): allow update rds account and database desc 2020-12-01 16:38:59 +08:00
rainzm
0edec40b22 fix(region): delete guest without 'purge' in GuestDetachScalingGroupTask 2020-12-01 16:02:16 +08:00
Yousong Zhou
428e3ab1f5 fix(host): make sure it won't match vpc guests by accident 2020-12-01 15:32:53 +08:00
yunion-ci-robot
9013ab785a Merge pull request #9101 from yousong/automated-cherry-pick-of-#9100-upstream-release-3.6
Automated cherry pick of #9100: Bugfix/yousong qcloud nic
2020-12-01 12:57:57 +08:00
Zexi Li
fb94e7fd28 Merge pull request #9103 from ioito/automated-cherry-pick-of-#9102-upstream-release-3.6
Automated cherry pick of #9102: fix(region): code gen api error
2020-12-01 11:59:41 +08:00
Qu Xuan
b6ace002d7 fix(region): code gen api error 2020-12-01 11:27:00 +08:00
Yousong Zhou
e8ef92ad23 multicloud: qcloud: fix instancenic 2020-12-01 11:17:13 +08:00
Yousong Zhou
5f1fd6c7f9 multicloud: qcloud: add ptr deref func 2020-12-01 11:17:13 +08:00
Yousong Zhou
0e0f8bfa94 multicloud: qcloud: add apiDomainByRegion 2020-12-01 11:17:13 +08:00
Yousong Zhou
1ab4d40497 multicloud: qcloud: add getVpcClient 2020-12-01 11:17:13 +08:00
Yousong Zhou
9dcd0d2db1 multicloud: qcloud: add getSdkClient 2020-12-01 11:17:13 +08:00
Yousong Zhou
4a45ca59df vendor: add tencentcloud-sdk-go vpc 2020-12-01 11:17:13 +08:00
Zexi Li
fef43d3567 Merge pull request #9097 from yousong/automated-cherry-pick-of-#9096-upstream-release-3.6
Automated cherry pick of #9096: Bugfix/yousong informer
2020-12-01 09:34:02 +08:00
Yousong Zhou
a51a0845b4 fix(taskman): SSubTask: set model manager 2020-11-30 23:12:25 +08:00
Yousong Zhou
73f434e034 fix(region): secgrouprule: set model manager 2020-11-30 23:12:25 +08:00
Zexi Li
a4575fa51d Merge pull request #9073 from ioito/automated-cherry-pick-of-#9072-upstream-release-3.6
Automated cherry pick of #9072: fix(cloudid): huawei saml provider create issue
2020-11-30 21:56:22 +08:00
Zexi Li
3fa0f9d37c Merge pull request #9016 from tb365/automated-cherry-pick-of-#9015-upstream-release-3.6
Automated cherry pick of #9015: fix(region): huawei sync storages bugfix
2020-11-30 21:54:53 +08:00
Zexi Li
2a1d1a1cbc Merge pull request #9065 from ioito/automated-cherry-pick-of-#9064-upstream-release-3.6
Automated cherry pick of #9064: fix(region): apsara is private cloud
2020-11-30 21:53:25 +08:00
Zexi Li
f9080330e1 Merge pull request #9085 from yousong/automated-cherry-pick-of-#9084-upstream-release-3.6
Automated cherry pick of #9084: feat(region): networkaddresses: filter by guest ids
2020-11-30 21:52:45 +08:00
Zexi Li
7230c65f8d Merge pull request #9077 from rainzm/automated-cherry-pick-of-#9076-upstream-release-3.6
Automated cherry pick of #9076: Notify via contact skip receiver
2020-11-30 21:50:18 +08:00
Zexi Li
3226f99a33 Merge pull request #9080 from yousong/automated-cherry-pick-of-#9079-upstream-release-3.6
Automated cherry pick of #9079: feat(region): options: allow setting default vpc external access mode
2020-11-30 21:49:31 +08:00
Zexi Li
e62d3fb0be Merge pull request #9088 from rainzm/automated-cherry-pick-of-#9086-upstream-release-3.6
Automated cherry pick of #9086: fix(region): sort excludedNets correctly
2020-11-30 21:47:35 +08:00
yunion-ci-robot
0900860ca0 Merge pull request #9094 from ioito/automated-cherry-pick-of-#9075-upstream-release-3.6
Automated cherry pick of #9075: fix(region): optimized rds backup create
2020-11-30 21:30:08 +08:00
Qu Xuan
2a6421258a fix(region): optimized rds backup create 2020-11-30 20:00:24 +08:00
rainzm
474bd1440f feat(cloudcommon): add NotifyWithContact 2020-11-30 19:59:38 +08:00
rainzm
cff5b8b656 feat(cloudcommon): allways send webconsole notification via contacts
For notification with webconsole type, receiverId is same with contacts.
2020-11-30 19:59:38 +08:00
rainzm
cb663f460f feat(notify): permit admin sending notification via contact
In this way, you can easily send notification to non-existent receiver.
2020-11-30 19:59:38 +08:00
TangBin
a924c9552b fix(region): reserved name checking while create redis account 2020-11-30 19:17:15 +08:00
rainzm
c1d95bc313 fix(region): sort excludedNets correctly
之前,excludedNets 内部表示起始 IP 的字段是 string 类型,直接使用 <
比较是错误的。
现在,把 excludedNets 表示起始 IP 的字段改为了
netutils.IPV4Addr,这样就可以正确地进行比较排序了。
2020-11-30 19:05:19 +08:00
Yousong Zhou
b46d50ae3a feat(region): networkaddresses: filter by guest ids 2020-11-30 19:02:55 +08:00
Yousong Zhou
05c95295b3 feat(region): options: allow setting default vpc external access mode 2020-11-30 18:29:55 +08:00
Yousong Zhou
d2e304bae0 fix(region): pass up error from InitializeData 2020-11-30 18:29:55 +08:00
Qu Xuan
b460a73b0d fix(cloudid): huawei saml provider create issue 2020-11-30 16:31:09 +08:00
Zexi Li
c8d4a33f45 Merge pull request #8996 from ioito/automated-cherry-pick-of-#8995-upstream-release-3.6
Automated cherry pick of #8995: fix(cloudid): avoid new public account sync system policy delay 1 day
2020-11-30 14:13:42 +08:00
Qu Xuan
21d9edcfa6 fix(region): apsara is private cloud 2020-11-30 10:40:52 +08:00
Zexi Li
e2833b0760 Merge pull request #9059 from ioito/automated-cherry-pick-of-#8434-upstream-release-3.6
Automated cherry pick of #8434: fix: add panic log for worker task
2020-11-27 20:41:33 +08:00
Zexi Li
012b0f2c6a Merge pull request #8969 from yousong/automated-cherry-pick-of-#8575-upstream-release-3.6
Automated cherry pick of #8575: vendor: bump yunion.io/x/sqlchemy
2020-11-27 20:18:33 +08:00
Qu Xuan
f05fc18941 fix(cloudid): avoid new public account sync system policy delay 1 day 2020-11-27 20:17:42 +08:00
Zexi Li
74ca7830aa Merge pull request #9029 from ioito/automated-cherry-pick-of-#9021-upstream-release-3.6
Automated cherry pick of #9021: fix(region): auto sync cloudaccount resources
2020-11-27 20:13:55 +08:00
Zexi Li
bd101e19eb Merge pull request #9037 from yousong/automated-cherry-pick-of-#9036-upstream-release-3.6
Automated cherry pick of #9036: feat(region): search server by substr of ip or mac
2020-11-27 20:09:08 +08:00
Zexi Li
1d7e1938e6 Merge pull request #9055 from zhaoxiangchun/automated-cherry-pick-of-#9054-upstream-release-3.6
Automated cherry pick of #9054: fix(monitor): modify monitor nodata alert matching onecloud host func
2020-11-27 20:07:27 +08:00
Qu Xuan
e97cd02b5b fix: add panic log for worker task 2020-11-27 20:05:07 +08:00
Zexi Li
727c526d3d Merge pull request #9058 from lvyangyang/automated-cherry-pick-of-#9056-upstream-release-3.6
Automated cherry pick of #9056: fix(region): bucket get referer fix
2020-11-27 20:04:03 +08:00
lvyangyang
0174e686df fix(region): bucket get referer fix 2020-11-27 19:44:13 +08:00
zhaoxiangchun
2564f3c060 fix(monitor): modify monitor nodata alert matching onecloud host func 2020-11-27 19:07:12 +08:00
Zexi Li
b5dd92f042 Merge pull request #9050 from wanyaoqi/automated-cherry-pick-of-#9049-upstream-release-3.6
Automated cherry pick of #9049: fix(region,scheduler): fix netwrok predicate
2020-11-27 18:43:37 +08:00
wanyaoqi
c8ca855cbc fix(region,scheduler): fix netwrok predicate
1. Guest config to schedule input should include network exit propertites.
2. Guest migrate and create backup server should not check network count,
because of migrate and create backup server will not allocate new network to guest.

cherrypick: release/3.5
2020-11-27 18:17:15 +08:00
yunion-ci-robot
1e59cd4b84 Merge pull request #9047 from rainzm/automated-cherry-pick-of-#9046-upstream-release-3.6
Automated cherry pick of #9046: fix(region): get provider name via GetProviderName
2020-11-27 18:05:54 +08:00
rainzm
843534c298 fix(region): get provider name via GetProviderName 2020-11-27 17:34:47 +08:00
rainzm
1c475b0912 fix(region): get provider name via GetProviderName 2020-11-27 17:34:47 +08:00
Zexi Li
4ab73f0b1c Merge pull request #9035 from lvyangyang/automated-cherry-pick-of-#9033-upstream-release-3.6
Automated cherry pick of #9033: fix(region): fix set bucket referer
2020-11-27 16:29:56 +08:00
Yousong Zhou
ca21bcf564 feat(region): search server by substr of ip or mac 2020-11-27 15:16:08 +08:00
lvyangyang
9872a05be9 feat(region): set qcloud bucket policy 2020-11-27 14:50:17 +08:00
lvyangyang
6f3cabda6e fix(region): fix set bucket referer 2020-11-27 14:50:17 +08:00
yunion-ci-robot
23c4abedbb Merge pull request #9025 from ioito/automated-cherry-pick-of-#9024-upstream-release-3.6
Automated cherry pick of #9024: fix(cloudid): avoid use invalid character for role name
2020-11-27 09:51:35 +08:00
Qu Xuan
e056bb1028 fix(region): auto sync cloudaccount resources 2020-11-27 09:38:25 +08:00
yunion-ci-robot
5de39adaf7 Merge pull request #9023 from swordqiu/automated-cherry-pick-of-#9022-upstream-release-3.6
Automated cherry pick of #9022: fix(cloudcommon): adjust policy refresh to default 30 seconds
2020-11-26 21:58:32 +08:00
Zexi Li
3bfc6d928a Merge pull request #8999 from ioito/automated-cherry-pick-of-#8998-upstream-release-3.6
Automated cherry pick of #8998: fix(region): allow member user get saml auth addr
2020-11-26 21:39:43 +08:00
Qu Xuan
fd948b8cc5 fix(cloudid): avoid use invalid character for role name 2020-11-26 21:38:50 +08:00
Zexi Li
c64d98f769 Merge pull request #9019 from ioito/automated-cherry-pick-of-#9018-upstream-release-3.6
Automated cherry pick of #9018: fix(cloudid): auto update saml provider metadata
2020-11-26 21:38:21 +08:00
Zexi Li
22e2c2e3ef Merge pull request #9003 from ioito/automated-cherry-pick-of-#9002-upstream-release-3.6
Automated cherry pick of #9002: fix(region): avolid aliyun fin bucket list objects error
2020-11-26 21:36:38 +08:00
Qiu Jian
b9d30c08a2 fix(cloudcommon): adjust policy refresh to default 30 seconds
Cache policy check result for 30 seconds by default
2020-11-26 21:33:15 +08:00
Zexi Li
7a2c8722d5 Merge pull request #9013 from ioito/automated-cherry-pick-of-#9012-upstream-release-3.6
Automated cherry pick of #9012: fix(region): qcloud request retry
2020-11-26 21:31:51 +08:00
Zexi Li
de624a5af9 Merge pull request #9006 from yousong/automated-cherry-pick-of-#9005-upstream-release-3.6
Automated cherry pick of #9005: Feature/yousong ovn encap ip
2020-11-26 21:29:50 +08:00
Zexi Li
fefbd436e0 Merge pull request #9010 from ioito/automated-cherry-pick-of-#9009-upstream-release-3.6
Automated cherry pick of #9009: fix(climc): replace ' -> "
2020-11-26 21:26:59 +08:00
Yousong Zhou
c3b4edae1b vpcagent: ovn: make aware of sub ips 2020-11-26 21:20:01 +08:00
Yousong Zhou
314f9fcc0f vpcagent: models: join network addresses 2020-11-26 21:20:01 +08:00
Yousong Zhou
f699f7cb55 vpcagent: apihelper: filter by cloud_env=onpremise 2020-11-26 21:20:01 +08:00
Yousong Zhou
a3d6a039ac multicloud: aliyun: instancenic: handle InvalidOperation.Ipv4CountExceeded 2020-11-26 21:20:01 +08:00
Yousong Zhou
eec81e73e7 networkaddresses: handle cloudprovider.ErrAddressCountExceed 2020-11-26 21:20:01 +08:00
Yousong Zhou
444e666472 cloudprovider: add ErrAddressCountExceed 2020-11-26 21:20:01 +08:00
Yousong Zhou
159453eceb networkaddresses: do server sync for on premise servers 2020-11-26 21:20:01 +08:00
Yousong Zhou
05984b49a7 networkaddresses: disallow batch create for external resources 2020-11-26 21:20:01 +08:00
Yousong Zhou
7343be04b1 networkaddresses: cloudprovider support 2020-11-26 21:20:01 +08:00
Yousong Zhou
1b6275f803 multicloud: aws: subaddress management 2020-11-26 21:20:01 +08:00
Yousong Zhou
3159f6d6d7 multicloud: aws: instancenic: add interface id attribute 2020-11-26 21:20:01 +08:00
Yousong Zhou
0fe90abea8 multicloud: aliyun: instancenic: secondary address management 2020-11-26 21:20:01 +08:00
Yousong Zhou
47a2d07634 vendor: bump alibaba-cloud-sdk-go to v1.61.684
For commit [1]

 [1] 6313cc407e
2020-11-26 21:20:01 +08:00
Yousong Zhou
edbddb38b6 vendor: add github.com/aliyun/alibaba-cloud-sdk-go/services/ecs 2020-11-26 21:20:01 +08:00
Yousong Zhou
9840d7cf77 cloudprovider: ICloudNic: add methods for secondary addresses 2020-11-26 21:20:01 +08:00
Yousong Zhou
2afa068d71 multicloud: ICloudNic: add GetId() 2020-11-26 21:20:01 +08:00
Yousong Zhou
956bc945a9 multicloud: ICloudNic: fix GetMAC() 2020-11-26 21:20:01 +08:00
Yousong Zhou
adb998ff55 hostman: metadata: add handler for /local-sub-ipv4s 2020-11-26 21:20:01 +08:00
Yousong Zhou
0c8d8358e6 networkaddresses: add to nics field of guest desc 2020-11-26 21:20:01 +08:00
Yousong Zhou
87ed4e9a55 networkaddresses: add parent_type guestnetwork 2020-11-26 21:20:01 +08:00
Yousong Zhou
8ed18fbf34 networks: usedAddressQuery: rename with baseq, ownerq, retq 2020-11-26 21:20:01 +08:00
Yousong Zhou
1609496f9c networks: split getUsedAddressQuery as method of each manager 2020-11-26 21:20:01 +08:00
Yousong Zhou
f54de809b2 networks: fix typo in log 2020-11-26 21:20:01 +08:00
Yousong Zhou
c389aaaeb7 db_dispatcher: allow batch create for models without name 2020-11-26 21:20:01 +08:00
Yousong Zhou
ed1999efaf db: interface: manager: add HasName() method 2020-11-26 21:20:01 +08:00
Yousong Zhou
c8ad511744 db: standalone_anon: empty result for name query 2020-11-26 21:20:01 +08:00
Yousong Zhou
c45550ef63 db: add standalone_anon 2020-11-26 21:20:00 +08:00
Yousong Zhou
b79915d407 schedtags: add ListItemExportKeys 2020-11-26 21:20:00 +08:00
Yousong Zhou
d8ab874ef2 db: add manager methods appliers 2020-11-26 21:20:00 +08:00
Yousong Zhou
f62dddda51 db_dispatcher: delay compute to where needed 2020-11-26 21:20:00 +08:00
Yousong Zhou
0c8ab90f7e db_dispatcher: remove unused GetExtraDetails call 2020-11-26 21:20:00 +08:00
Yousong Zhou
79120f3de3 db: virtualjoint: add FilterById on RowId 2020-11-26 21:20:00 +08:00
Yousong Zhou
0e0a394907 db: modelbase: BatchCreateValidateCreateData: return orig data 2020-11-26 21:20:00 +08:00
Yousong Zhou
3b32ce56cc db: check funcs required by dispatcher 2020-11-26 21:20:00 +08:00
Yousong Zhou
d8cfba9217 region: networks: attach func use struct args 2020-11-26 21:20:00 +08:00
Yousong Zhou
f87d094580 region: networkresource: fix signature of GetExtraDetails 2020-11-26 21:20:00 +08:00
Yousong Zhou
9072a69aec multicloud: aliyun: make getSdkClient proxy aware 2020-11-26 21:20:00 +08:00
Yousong Zhou
91fab12172 climc: helper: add BatchCreate helper 2020-11-26 21:20:00 +08:00
Yousong Zhou
f6f4fc125a climc: helper: create call as a standalone method 2020-11-26 21:20:00 +08:00
Yousong Zhou
9228b17928 climc: s/Keyworkd/Keyword/ 2020-11-26 21:20:00 +08:00
Yousong Zhou
46088408bc vendor: bump yunion.io/x/pkg 2020-11-26 21:20:00 +08:00
Yousong Zhou
f0fba9aa20 vendor: bump yunion.io/x/sqlchemy 2020-11-26 21:20:00 +08:00
Qu Xuan
61d21d2b46 fix(cloudid): auto update saml provider metadata 2020-11-26 20:20:02 +08:00
TangBin
d5973135d2 fix(region): huawei sync storages bugfix 2020-11-26 19:34:49 +08:00
Qu Xuan
e52fb3260f fix(region): qcloud request retry 2020-11-26 19:03:39 +08:00
Qu Xuan
cb594298d4 fix(climc): replace ' -> " 2020-11-26 17:36:48 +08:00
Yousong Zhou
8db93257d6 feat(host): add option OvnEncapIpDetectionMethod can-reach:xx 2020-11-26 17:11:38 +08:00
Yousong Zhou
e53bdd5f94 feat(netutils2): add MyIPTo 2020-11-26 17:11:38 +08:00
yunion-ci-robot
28ff7c29b2 Merge pull request #9001 from wanyaoqi/automated-cherry-pick-of-#8828-upstream-release-3.6
Automated cherry pick of #8828: feature: update cpu arch apis
2020-11-26 16:37:34 +08:00
Qu Xuan
061c5d6dd9 fix(region): avolid aliyun fin bucket list objects error 2020-11-26 16:17:42 +08:00
wanyaoqi
59102f2dda feat(region/glance): update cpu arch apis
add multi arch resourcebase manager
update multi arch resource list apis

cherrypick: release/3.6
2020-11-26 15:33:40 +08:00
Qu Xuan
dea1f29aa1 fix(region): allow member user get saml auth addr 2020-11-26 15:02:49 +08:00
Zexi Li
b479f23a4f Merge pull request #8984 from swordqiu/automated-cherry-pick-of-#8968-upstream-release-3.6
Automated cherry pick of #8968: fix(region,esxiagent): allow host behind a nat
2020-11-26 12:11:09 +08:00
yunion-ci-robot
d974440dec Merge pull request #8992 from zexi/automated-cherry-pick-of-#8991-upstream-release-3.6
Automated cherry pick of #8991: fix(scheduler): clean expire cache before schedule
2020-11-26 11:44:39 +08:00
Zexi Li
bcfb050193 fix(region): wire get vpc releated hosts is empty 2020-11-26 11:03:07 +08:00
Zexi Li
3c85ed11b9 fix(region): network clean schedule cache after real deleted 2020-11-26 11:03:07 +08:00
Zexi Li
a16899c9bf fix(scheduler): clean expire cache before schedule 2020-11-26 11:03:07 +08:00
yunion-ci-robot
761874423f Merge pull request #8931 from tb365/automated-cherry-pick-of-#8779-upstream-release-3.6
Automated cherry pick of #8779: 负载均衡ACL&证书增加项目和共享
2020-11-26 10:47:34 +08:00
TangBin
4d4c84801f fix(region): climc add base projects options 2020-11-26 10:33:36 +08:00
TangBin
670a06d53d 负载均衡ACL&证书增加项目和共享 2020-11-26 10:33:36 +08:00
Zexi Li
8f9015475b Merge pull request #8938 from yousong/automated-cherry-pick-of-#8937-upstream-release-3.6
Automated cherry pick of #8937: fix(treewide): fix task error recording
2020-11-26 09:25:07 +08:00
Zexi Li
4891f16959 Merge pull request #8940 from rainzm/automated-cherry-pick-of-#8925-upstream-release-3.6
Automated cherry pick of #8925: feat(region): add SCloudregionResourceBase for SInstanceSnapshot
2020-11-25 22:04:33 +08:00
Zexi Li
3b7ef422ee Merge pull request #8967 from zhaoxiangchun/automated-cherry-pick-of-#8902-upstream-release-3.6
Automated cherry pick of #8902: feat(monitor): add nodata alert policy
2020-11-25 22:02:38 +08:00
Zexi Li
2e7d107232 Merge pull request #8976 from tb365/automated-cherry-pick-of-#8955-upstream-release-3.6
Automated cherry pick of #8955: fix(region): allow reset huawei system disk
2020-11-25 22:01:48 +08:00
Zexi Li
0676b48513 Merge pull request #8962 from ioito/automated-cherry-pick-of-#8961-upstream-release-3.6
Automated cherry pick of #8961: fix(region): valid qcloud hssd for system disk
2020-11-25 21:59:30 +08:00
Zexi Li
84da1058b2 Merge pull request #8983 from zhaoxiangchun/automated-cherry-pick-of-#8977-upstream-release-3.6
Automated cherry pick of #8977: fix(monitor): modify monitor serviceType in StartService()
2020-11-25 21:57:21 +08:00
Zexi Li
a62d51a681 Merge pull request #8988 from rainzm/automated-cherry-pick-of-#8987-upstream-release-3.6
Automated cherry pick of #8987: fix(region): allow delete storagecachedimage with 'cache_failed' status
2020-11-25 21:55:42 +08:00
rainzm
ed2a867748 fix(region): allow delete storagecachedimage with 'cache_failed' status
Having status 'cache_failed' means this storagecachedimage does not actually exist.
2020-11-25 20:47:10 +08:00
zhaoxiangchun
db565fe0cd fix(monitor): modify monitor serviceType in StartService()
1.修改monitor服务在service代码中注册的serviceType:
   alerter ===> monitor
2020-11-25 20:30:29 +08:00
Qiu Jian
197049dcb7 fix(region,esxiagent): allow host behind a nat
check host by ip may fail if host is behind a nat. ignore this case.
2020-11-25 20:14:09 +08:00
Zexi Li
ec803b3681 Merge pull request #8966 from zhaoxiangchun/automated-cherry-pick-of-#8965-upstream-release-3.6
Automated cherry pick of #8965: fix(monitor): suggestalert ignore throw err
2020-11-25 19:46:46 +08:00
Zexi Li
8e7b812e4f Merge pull request #8974 from ioito/automated-cherry-pick-of-#8973-upstream-release-3.6
Automated cherry pick of #8973: fix(region): set qcloud instance del timeout to 20m
2020-11-25 19:37:46 +08:00
rainzm
4d13956bc6 fix(region): ignore params.Disks when cloning vm from snapshot 2020-11-25 18:26:30 +08:00
rainzm
6ea550d012 fix(region): add size and storageType for VMware InstanceSnapshot 2020-11-25 18:26:30 +08:00
rainzm
eb3da9369d fix(esxiagent): add humanized tips when searching vm failed 2020-11-25 18:26:29 +08:00
rainzm
727b89db5d fix(region): make project of instance snapshot be consistent with the instance 2020-11-25 18:26:29 +08:00
rainzm
6d2e914391 fix(region): save when canceling pendingUsage 2020-11-25 18:26:29 +08:00
rainzm
8627818e14 feat(region): set pendingUsage before creating instance snapshots 2020-11-25 18:26:29 +08:00
rainzm
23b1a2b143 feat(region): add instance_snapshot for regionquota 2020-11-25 18:26:29 +08:00
rainzm
1561d65395 fix(region): purge all instance snapshots when purging guest 2020-11-25 18:26:29 +08:00
rainzm
35fc62bbad feat(region): add SCloudregionResourceBase for SInstanceSnapshot
理论上,可以通过
SInstanceSnapshot->SGuest->SHost->SZone->SCloudregionResourceBase
拿到 cloudregion_id, 但是这样的效率太低了
2020-11-25 18:26:29 +08:00
TangBin
25eb67b373 fix(region): update translations 2020-11-25 18:18:49 +08:00
TangBin
3ed59afae4 fix(region): allow reset huawei system disk 2020-11-25 18:18:49 +08:00
Qu Xuan
2d7cdad8f2 fix(region): set qcloud instance del timeout to 20m 2020-11-25 17:17:06 +08:00
Zexi Li
726a0817ac Merge pull request #8971 from ioito/automated-cherry-pick-of-#8970-upstream-release-3.6
Automated cherry pick of #8970: fix(cloudid): avoid empty auth url
2020-11-25 17:16:50 +08:00
Qu Xuan
869740775c fix(cloudid): avoid empty auth url 2020-11-25 17:07:09 +08:00
Zexi Li
5c448811eb Merge pull request #8959 from ioito/automated-cherry-pick-of-#8958-upstream-release-3.6
Automated cherry pick of #8958: fix(region): validate cloudaccount saml auth params
2020-11-25 16:06:52 +08:00
zhaoxiangchun
7661189370 feat(monitor): add nodata alert policy
1.add queryConditon子类:nodataQueryCondition处理nodata类型策略
2.遍历Onecloud类型宿主机,得到nodata宿主机信息
2020-11-25 12:18:40 +08:00
zhaoxiangchun
81e4463abc fix(monitor): suggestalert ignore throw err
1.修复优化建议忽略操作报错
2020-11-25 12:03:42 +08:00
Qu Xuan
8281411680 fix(region): valid qcloud hssd for system disk 2020-11-25 11:52:04 +08:00
Qu Xuan
a9ef8a1e37 fix(region): validate cloudaccount saml auth params 2020-11-25 11:35:05 +08:00
Zexi Li
f0abdb9e77 Merge pull request #8952 from ioito/automated-cherry-pick-of-#8895-upstream-release-3.6
Automated cherry pick of #8895: fix(region): 避免OneCloud密码校验通过,公有云厂商密码校验不通过
2020-11-25 10:06:10 +08:00
Qu Xuan
782372c35e fix(region): 避免OneCloud密码校验通过,公有云厂商密码校验不通过 2020-11-25 09:54:51 +08:00
Zexi Li
da53fe1cf7 Merge pull request #8948 from yousong/automated-cherry-pick-of-#8947-upstream-release-3.6
Automated cherry pick of #8947: fix(region): change_ipaddr: retain eip_id on detach and attach
2020-11-25 09:28:05 +08:00
yunion-ci-robot
452d8e9caa Merge pull request #8943 from yousong/automated-cherry-pick-of-#8942-upstream-release-3.6
Automated cherry pick of #8942: feat(cloudcommon): db: jointbase: add list:"user" for RowId
2020-11-25 09:18:16 +08:00
Yousong Zhou
f33b9c7164 fix(region): change_ipaddr: retain eip_id on detach and attach 2020-11-24 21:58:57 +08:00
Yousong Zhou
d1f1eda985 fix(vpcagent): models: guestnetworks: accomodate change_ipaddr
change_ipaddr does detach, then attach of network.  It's not solely an
update of ipaddr, but a combination of deletion then creation.
2020-11-24 21:55:30 +08:00
Yousong Zhou
53125e6ed1 feat(cloudcommon): db: jointbase: add list:"user" for RowId 2020-11-24 21:55:30 +08:00
yunion-ci-robot
978677cc02 Merge pull request #8939 from zexi/automated-cherry-pick-of-#8930-upstream-release-3.6
Automated cherry pick of #8930: feat(region/schedtag): schedtag support set multi resources
2020-11-24 21:33:30 +08:00
yunion-ci-robot
20d0cfb95e Merge pull request #8941 from zhaoxiangchun/automated-cherry-pick-of-#8926-upstream-release-3.6
Automated cherry pick of #8926: fix(monitor): modify suggestrule process influxdb data
2020-11-24 21:29:15 +08:00
zhaoxiangchun
ed13fe9e14 fix(monitor): modify suggestrule process influxdb data
1. 调整与监控相关的时间范围的判断逻辑:不再要求时间范围内必须都有数据
2020-11-24 21:13:52 +08:00
Yousong Zhou
d868347773 fix(treewide): fix task error recording 2020-11-24 20:38:20 +08:00
yunion-ci-robot
0a4ddb861e Merge pull request #8934 from ioito/automated-cherry-pick-of-#8933-upstream-release-3.6
Automated cherry pick of #8933: fix(region): avoid public ip bandwidth is zero
2020-11-24 20:25:31 +08:00
Zexi Li
a16b048f96 feat(region/schedtag): schedtag support set multi resources 2020-11-24 20:25:10 +08:00
Qu Xuan
5dea11952f fix(region): avoid public ip bandwidth is zero 2020-11-24 18:10:52 +08:00
22519 changed files with 1112581 additions and 7359708 deletions

View File

@@ -3,11 +3,22 @@
# Check https://circleci.com/docs/2.0/language-go/ for more details
version: 2
jobs:
test:
check:
docker:
- image: yunionio/centos-build:1.0-1
environment:
ONECLOUD_CI_BUILD: "1"
working_directory: /root/go/onecloud
steps:
- checkout
- run:
command: |
make -j3 check
build:
requires:
- check
docker:
- image: yunion/alpine-build:3.22.0-go-1.24.6-1
- image: yunionio/centos-build:1.0-1
environment:
ONECLOUD_CI_BUILD: "1"
@@ -15,22 +26,59 @@ jobs:
#### expecting it in the form of
#### /go/src/github.com/circleci/go-tool
#### /go/src/bitbucket.org/circleci/go-tool
working_directory: /root/go/src/yunion.io/x/onecloud
resource_class: large
parallelism: 1
working_directory: /root/go/onecloud
parallelism: 4
steps:
- checkout
- restore_cache:
key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /root/.cache/go-build
- run:
command: |
make -j3 check
make test
targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
echo $targets | tr ' ' '\n'
make $targets
make -j2 $targets
ls -lh _output/bin/
- save_cache:
key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /root/.cache/go-build
- store_artifacts:
path: _output/
test:
requires:
- check
docker:
- image: yunionio/centos-build:1.0-1
environment:
GO111MODULE: "on"
working_directory: /root/go/onecloud
parallelism: 4
steps:
- checkout
- restore_cache:
key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /root/.cache/go-build
- run:
name: unit_test
command: |
./scripts/coverage.sh --codecov
- save_cache:
key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
paths:
- /root/.cache/go-build
workflows:
version: 2
build_and_test:
jobs:
- test
- check
- build:
requires:
- check
- test:
requires:
- check

View File

@@ -1,3 +0,0 @@
[*.sh]
indent_style = space
indent_size = 4

View File

@@ -1,20 +1,21 @@
---
name: Bug report
about: 报告代码缺陷/Create a bug report to help us improve
title: '[BUG]'
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''
---
**问题描述/What happened**:
**What happened**:
**环境/Environment**:
**What you expected to happen**:
- OS (e.g. `cat /etc/os-release`):
**How to reproduce it**:
**Anything else we need to know?**:
**Environment**:
- OS (e.g: `cat /etc/os-release`):
- Kernel (e.g. `uname -a`):
- Host: (e.g. `dmidecode | egrep -i 'manufacturer|product' |sort -u`)
- Service Version (e.g. `kubectl exec -n onecloud $(kubectl get pods -n onecloud | grep climc | awk '{print $1}') -- climc version-list`):
<!--
- Version (e.g. `climc version-list`):
-->
- Others:

View File

@@ -1,12 +0,0 @@
---
name: 文档问题/Document Request
about: 文档相关缺陷改进/Document request to this project
title: '[文档/Docs]'
labels:
- area/docs
- enhancement
assignees: ''
---
**What part of the document needs to be added**:

View File

@@ -1,10 +1,14 @@
---
name: 新特性/Feature Request
about: 建议新功能特性/Suggest an idea for this project
title: '[Feature]'
name: Feature request
about: Suggest an idea for this project
title: ''
labels: feature
assignees: ''
---
<!-- Please only use this template for submitting feature requests -->
**What would you like to be added**:
**Why is this needed**:

View File

@@ -1,7 +1,7 @@
---
name: 求助/Support Request
about: 求助使用中遇到的问题/Support request relating to this project
title: '[求助/Help]'
name: Support Request
about: Support request or question relating to this project
title: ''
labels: question
assignees: ''

View File

@@ -1,19 +1,15 @@
**What this PR does / why we need it**:
**这个 PR 实现什么功能/修复什么问题**:
<!--
- [ ] Smoke testing completed
- [ ] Unit test written
- [ ] 功能、bugfix描述
- [ ] 冒烟测试
- [ ] 单元测试编写
-->
**Does this PR need to be backport to the previous release branch?**:
**是否需要 backport 到之前的 release 分支**:
<!--
If no, just write "NONE".
If don't know, write "UNKNOWN", and let the reviewer decide.
If yes, write the release branches name in the below format and submit the related cherry-pick PR:
- release/3.11
Take a look at "https://www.cloudpods.org/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR.
如果不需要,填写 "NONE".
如果需要,就以下面 item 的格式写 release 分支名,并提交对应的 cherry-pick PR:
- release/3.2
-->

View File

@@ -1,38 +0,0 @@
name: Building and test for PR
on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
build_and_test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Install check tools
shell: bash
run: |
set -o xtrace
git clone --branch master --depth 4 https://github.com/yunionio/tools && cd tools
go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
git clone --depth 4 https://github.com/yousong/y18n && cd y18n
go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n
- name: Test and build
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
make -j3 check
make test
targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image | grep -v torrent)"
echo $targets | tr ' ' '\n'
make $targets
ls -lh _output/bin

233
.github/workflows/docker.yml vendored Normal file
View File

@@ -0,0 +1,233 @@
name: Docker image
on:
push:
branches:
- master
- releases/*
#paths:
#- 'cmd/*'
#- 'pkg/*'
#- 'vendor/*'
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.14
uses: actions/setup-go@v1
with:
go-version: 1.14
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v1
- name: Build
run: |
sudo apt-get update
sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns make cmd/apigateway cmd/climc cmd/keystone make cmd/logger cmd/region cmd/scheduler cmd/webconsole make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway make cmd/ansibleserver cmd/cloudnet cmd/notify make cmd/host-deployer make cmd/cloudevent cmd/devtool cmd/cloudid make cmd/*cli make cmd/esxi-agent'
- name: Image region
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/region
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.region
- name: Image host
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/host
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.host
- name: Image host-deployer
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.host-deployer
- name: Image baremetal-agent
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.baremetal-agent
- name: Image esxi-agent
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.esxi-agent
- name: Image vpcagent
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.vpcagent
- name: Image climc
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/climc
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.climc
- name: Image keystone
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.keystone
- name: Image logger
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/logger
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.logger
- name: Image scheduler
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.scheduler
- name: Image apigateway
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.apigateway
- name: Image s3gateway
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.s3gateway
- name: Image ansibleserver
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.ansibleserver
- name: Image cloudnet
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.cloudnet
- name: Image glance
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/glance
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.glance
- name: Image notify
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/notify
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.notify
- name: Image cloudevent
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.cloudevent
- name: Image cloudid
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.cloudid
- name: Image devtool
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.devtool
- name: Image region DNS
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: registry.cn-beijing.aliyuncs.com
snapshot: true
dockerfile: build/docker/Dockerfile.region-dns

View File

@@ -1,52 +0,0 @@
name: Apigateway Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/apigateway/**.go'
- 'pkg/apis/apigateway/**.go'
- 'pkg/mcclient/modules/**.go'
jobs:
build_apigateway:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image apigateway

View File

@@ -1,50 +0,0 @@
name: Climc Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'cmd/climc/**.go'
- 'pkg/mcclient/**.go'
- 'vendor/yunion.io/x/structarg/**.go'
jobs:
build_climc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image climc

View File

@@ -1,51 +0,0 @@
name: Cloudmon Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudmon/**.go'
- 'vendor/yunion.io/x/cloudmux/pkg/multicloud/loader/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image cloudmon

View File

@@ -1,49 +0,0 @@
name: Esxi Agent Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/esxi/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image esxi-agent

View File

@@ -1,53 +0,0 @@
name: Glance Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/image/**.go'
- 'pkg/apis/image/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_glance:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image glance

View File

@@ -1,49 +0,0 @@
name: Host Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/hostman/**.go'
- 'pkg/apis/host/**.go'
jobs:
build_host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image host

View File

@@ -1,53 +0,0 @@
name: Keystone Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/keystone/**.go'
- 'pkg/apis/identity/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_keystone:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image keystone

View File

@@ -1,53 +0,0 @@
name: Logger Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/logger/**.go'
- 'pkg/apis/logger/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image logger

View File

@@ -1,53 +0,0 @@
name: Notify Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/notify/**.go'
- 'pkg/apis/notify/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_notify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image notify

View File

@@ -1,54 +0,0 @@
name: Region Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/compute/**.go'
- 'pkg/apis/compute/**.go'
- 'vendor/yunion.io/x/cloudmux/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_region:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image region

View File

@@ -1,50 +0,0 @@
name: Scheduler Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/scheduler/**.go'
- 'pkg/apis/scheduler/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image scheduler

View File

@@ -1,53 +0,0 @@
name: Webconsole Docker Image
on:
push:
branches:
- 'releases/**'
- 'main'
- 'master'
paths:
- 'pkg/appsrv/**.go'
- 'pkg/cloudcommon/db/**.go'
- 'pkg/webconsole/**.go'
- 'pkg/apis/webconsole/**.go'
- 'vendor/yunion.io/x/sqlchemy/**.go'
- 'vendor/yunion.io/x/jsonutils/**.go'
jobs:
build_webconsole:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 8
- uses: actions/setup-go@v4
with:
go-version: '1.26.3'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Aliyun Container Registry (ACR)
uses: docker/login-action@v2
with:
registry: https://registry.us-west-1.aliyuncs.com
username: ${{ secrets.ACR_USERNAME }}
password: ${{ secrets.ACR_PASSWORD }}
- name: Build And Push Docker Image
shell: bash
run: |
set -o xtrace
export GO111MODULE=on
branch="${GITHUB_REF#refs/heads/}"
timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
export VERSION="$branch-$timestamp-solo"
export GOOS=linux
export ARCH=all
export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
make image webconsole

View File

@@ -1,45 +0,0 @@
name: Issue Check Inactive
on:
schedule:
- cron: "0 0 * * *"
permissions:
issues: write
jobs:
issue-check-inactive:
runs-on: ubuntu-latest
steps:
- name: Label inactive issues as stale
env:
GH_TOKEN: ${{ github.token }}
INACTIVE_DAY: "30"
INACTIVE_LABEL: "stale"
EXCLUDE_LABEL: "announcement"
run: |
set -euo pipefail
cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
gh issue list \
--repo "${{ github.repository }}" \
--state open \
--limit 1000 \
--json number,labels,updatedAt \
| jq -c \
--arg cutoff "$cutoff" \
--arg inactive "$INACTIVE_LABEL" \
--arg exclude "$EXCLUDE_LABEL" \
'
.[]
| select(.updatedAt < $cutoff)
| select([.labels[].name] | index($exclude) | not)
| select([.labels[].name] | index($inactive) | not)
' \
| while IFS= read -r issue; do
number="$(echo "$issue" | jq -r .number)"
echo "Marking issue #${number} as ${INACTIVE_LABEL}"
gh issue edit "$number" \
--repo "${{ github.repository }}" \
--add-label "$INACTIVE_LABEL"
done

View File

@@ -1,44 +0,0 @@
name: Issue Close Require
on:
schedule:
- cron: "0 1 * * *"
permissions:
issues: write
jobs:
issue-close-require:
runs-on: ubuntu-latest
steps:
- name: Close inactive issues awaiting user feedback
env:
GH_TOKEN: ${{ github.token }}
INACTIVE_DAY: "7"
run: |
set -euo pipefail
cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
body="$(cat <<'EOF'
If you do not provide feedback for more than 37 days, we will close the issue and you can either reopen it or submit a new issue.
您超过 37 天未反馈信息,我们将关闭该 issue如有需求您可以重新打开或者提交新的 issue。
EOF
)"
# Trim leading indentation from heredoc lines for a cleaner comment.
body="$(printf '%s\n' "$body" | sed 's/^[[:space:]]*//')"
gh issue list \
--repo "${{ github.repository }}" \
--state open \
--label "stale" \
--label "state/awaiting user feedback" \
--limit 1000 \
--json number,updatedAt \
| jq -c --arg cutoff "$cutoff" '.[] | select(.updatedAt < $cutoff)' \
| while IFS= read -r issue; do
number="$(echo "$issue" | jq -r .number)"
echo "Closing issue #${number}"
gh issue close "$number" \
--repo "${{ github.repository }}" \
--comment "$body"
done

View File

@@ -1,22 +0,0 @@
name: Issue Close Check
on:
issues:
types: [closed]
permissions:
issues: write
jobs:
issue-closed-remove-labels:
runs-on: ubuntu-latest
if: "!contains(github.event.issue.labels.*.name, 'stale')"
steps:
- name: Remove state labels when issue that hasn't stale label is closed
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting processing" \
--remove-label "state/awaiting user feedback" || true

View File

@@ -1,51 +0,0 @@
on:
issue_comment:
types: [created]
name: Add issues workflow labels
permissions:
issues: write
jobs:
add-label-if-is-author:
runs-on: ubuntu-latest
if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
steps:
- name: Add require handle label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting processing"
- name: Remove require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting user feedback" \
--remove-label "stale" || true
add-label-if-not-author:
runs-on: ubuntu-latest
if: (github.event.issue.user.id != github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open') && (!contains(github.event.comment.body, '/keep-state'))
steps:
- name: Add require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting user feedback"
- name: Remove require handle label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting processing" \
--remove-label "stale" || true

View File

@@ -1,17 +0,0 @@
on:
issue_comment:
types: [created]
jobs:
notify-author-comment:
runs-on: ubuntu-latest
if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request
# find context from: https://docs.github.com/en/webhooks/webhook-events-and-payloads#issue_comment
steps:
- name: feishu notify
uses: zexi/action-issues-notify@v1
with:
url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
issue_title: "${{ github.event.comment.user.login }} 回复了 issue: ${{ github.event.issue.title }}"
issue_body: "${{ tojson(github.event.comment.body) }}"
issue_link_url: "${{github.event.comment.html_url}}"

View File

@@ -1,41 +0,0 @@
name: Issue Open Check
on:
issues:
types: [opened, reopened]
permissions:
issues: write
jobs:
issue-open-add-labels:
runs-on: ubuntu-latest
if: ${{ !github.event.issue.pull_request }}
steps:
- name: Add labels
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--add-label "state/awaiting processing"
- name: Remove require reply label
env:
GH_TOKEN: ${{ github.token }}
run: |
gh issue edit "${{ github.event.issue.number }}" \
--repo "${{ github.repository }}" \
--remove-label "state/awaiting user feedback" \
--remove-label "stale" || true
notify-author-comment:
runs-on: ubuntu-latest
steps:
- name: feishu notify
uses: zexi/action-issues-notify@v1
with:
url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
issue_title: "${{ github.event.issue.user.login }} 提交了 issue: ${{ github.event.issue.title }}"
issue_body: "${{ tojson(github.event.issue.body) }}"
issue_link_url: "${{github.event.issue.html_url}}"

2
.gitignore vendored
View File

@@ -41,5 +41,3 @@ pkg/generated
# gotext extracted
out.gotext.json
pkg/notify/sender/email_test.go

View File

@@ -1,128 +0,0 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
abuse@cloudpods.org.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

View File

@@ -1,51 +1,3 @@
# Contribution Guide
[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
You can help to make Cloudpods better! There are many things you can do:
## Help others know Cloudpods
First of all, the easiest way to contribute to Cloudpods is to let more people know Cloudpods. To share your experience of Cloudpods. Hopefully Cloudpods may help resolve the issues in their daily jobs.
## Report Bugs
Cloudpods is an infrastructure management tool. Even though it has been thourougly tested and codes have been peer reviwed before merge, due to its complexity, you may still encounter bugs when using Cloudpods. This is frustrating. However, please do not hesitate to submit a issue at Github. The issue may help developers to improve the codes and make Cloudpods more and more robust. Meanwhile, the answer to the issues may also help others who have the similar bugs.
## Answer issues
You may answer issues at Github and help those who encounter issues when using Cloudpods. Sometimes, the issues are not due to bugs in codes but simplely because of misconfigurations, environment or misunderstandings.
## Contribute codes
You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/development/contrib/) for more details on how to contribute codes to Cloudpods.
### Fix Issues
You may help solve bugs by submiting patches.
### New Features
You may help improve the codes of Cloudpods, including:
* Develop new [features for Cloudpods](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature).
* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient.
## Documentation
You may help improve documentations of Cloudpds by directly make pull request to documentations. Once the Pull Request is accepted and merged, the documentations will be updated immediately.
## Translation
You may help translate the UI texts or documents of Cloudpds to other languages. Currently, we support Simplified Chinese and English.
## Write articles
You are also welcome to write articles about Cloudpods and sharing your experience with others. The content of the articles may include the following but not be limited to:
* Your user experiences with Cloudpods
* Your opinion about the direction and area of Cloudpods
* Comparison with other cloud platforms
* Benchmarks
# 开发贡献参考
详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

View File

@@ -1,48 +0,0 @@
# 贡献指南
[English](CONTRIBUTING.md) | [中文](CONTRIBUTING_zh.md)
如果您对Cloudpods感兴趣并且愿意为Cloudpods贡献可以通过以下任意方式贡献您的力量使得Cloudpods变得更完善。
## 让别人知道Cloudpods
最简单的方式就是让更多的人知道Cloudpods向他们分享您对Cloudpds的看法和使用经验向他们推荐Cloudpods。很有可能在您的推荐下他们开始使用Cloudpods并解决了他们在工作中遇到的基础设施管理问题。
## 报告BUG
Cloudpods是一款开源的基础设施管理工具软件运行场景复杂。尽管在开发阶段开发者很有可能已经进行了详尽的测试但难免在实际运行中还会遇到各种意想不到的bug。遇到这种情况请不要犹豫在Github上提交一个issue。这能帮助开发者更好地改进代码逻辑使得Cloudpods越来越鲁棒。同时issue的解答记录也能帮助到遇到类似问题的其他人。
## 回答问题
有时候人们在使用Cloudpods中遇到的问题并不是因为Cloudpods软件缺陷造成的而是因为配置错误环境因素或者误会导致的。这样的问题也许只需要简单地一两句就能解答不需要代码的修改。您可以在Github回答issue或者社区群中回答提问帮助那些在使用Cloudpods中遇到问题的人。
## 贡献代码
我们非常欢迎和感谢开发者向项目提交代码PR流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/docs/development/contrib/).
### 修复BUG
您可以通过提交代码补丁来修复Cloudpods存在的BUG。
### 开发新的功能特性
不仅仅是修复BUG您也可以通过提交代码以改进Cloudpods包括但不限于
* 开发新的功能特性,您可以在[feature issues](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)查找需要的功能。
* 重构代码,使得代码更加简洁易读,更加低健壮,或者执行起来更加高效。
## 文档
您也可以通过给文档提交PR来改进Cloudpods的文档。一旦您的PR被接收并合并Cloudpods的在线文档就能及时地自动更新。
## 翻译
您也可以帮助翻译Cloudpods要么翻译UI界面的i18n配置文件要么翻译文档使得Cloudpods支持更多的语言。目前Cloudpods支持简体中文和英文。
## 写文章
另外欢迎您写关于Cloudpods的文章通过文字分享您使用Cloudpods的经验和技巧。文章可以包括但不限于如下内容
* 使用Cloudpods的体验
* Cloudpods技术领域的观点
* 和其他竞品的比较
* 性能评测

View File

@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Copyright [2018] [Yunion Technology]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

116
Makefile
View File

@@ -47,6 +47,11 @@ PKGS := go list ./...
CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
ifdef LIBQEMUIO_PATH
X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread -L ${LIBQEMUIO_PATH}/src
endif
export GOOS ?= linux
export GO111MODULE:=on
export CGO_CFLAGS = ${X_CGO_CFLAGS}
@@ -58,7 +63,7 @@ ifeq ($(UNAME), Linux)
XARGS_FLAGS = --no-run-if-empty
endif
cmdTargets:=$(wildcard cmd/*)
cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
@@ -76,16 +81,19 @@ gencopyright:
@bash scripts/gencopyright.sh pkg cmd
test:
@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage|torrent')
@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
vet:
go vet ./...
# cmd/esxi-agent: prepare_dir
# CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/esxi-agent: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/fetcherfs: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
rpm/%: cmd/%
$(BUILD_SCRIPT) $*
@@ -96,6 +104,21 @@ deb/%: cmd/%
pkg/%: prepare_dir
$(GO_INSTALL) $(REPO_PREFIX)/$@
rpm/fetcherfs: cmd/fetcherfs
docker run --rm \
--name docker-centos-build-fetcherfs \
-v $(CURDIR):/data \
registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 \
/bin/bash -c "VERSION=3.6 /data/build/build.sh fetcherfs /opt/yunion/fetchclient/bin"
deb/fetcherfs: rpm/fetcherfs
#VERSION=3.6 $(DEB_BUILD_SCRIPT) fetcherfs /opt/yunion/fetchclient/bin
docker run --rm \
--name docker-debian-build-fetcherfs \
-v $(CURDIR):/data \
registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 \
/data/build/convert_rpm2deb.sh
build:
$(MAKE) $(cmdTargets)
@@ -166,8 +189,7 @@ goimports-check:
echo "$@: working tree modified (possibly by goimports)" >&2 ; \
echo "$@: " >&2 ; \
echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
echo "$@: goimports should be installed by: \
echo "$@: git clone --depth 4 https://github.com/yunionio/tools && cd tools && go install ./cmd/goimports ; \
echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
false ; \
fi
.PHONY: goimports-check
@@ -177,69 +199,10 @@ vet-check:
./scripts/vet.sh chk
.PHONY: vet-check
comma:=,
space:=$(space) $(space)
# NOTE: keep y18n-packages in alphabetical order
y18n-src-lang := en-US
y18n-lang := en-US,zh-CN
y18n-packages := \
yunion.io/x/onecloud/cmd/apigateway \
yunion.io/x/onecloud/cmd/keystone \
yunion.io/x/onecloud/cmd/llm \
yunion.io/x/onecloud/cmd/monitor \
yunion.io/x/onecloud/cmd/region \
yunion.io/x/onecloud/cmd/yunionconf \
define y18n-gen
set -o errexit; \
set -o pipefail; \
export GO111MODULE=off; \
y18n \
-chdir $(CURDIR) \
-dir ./locales/ \
-out ./locales/locales.go \
-lang $(y18n-lang) \
$(y18n-packages) \
; \
$(foreach lang,$(filter-out $(y18n-src-lang),$(subst $(comma), ,$(y18n-lang))),cp ./locales/$(lang)/{out,messages}.gotext.json;) \
endef
y18n-gen:
$(y18n-gen)
$(y18n-gen)
.PHONY: y18n-gen
y18n-check:
$(y18n-gen)
if git status --short ./locales | sed 's/^/$@: /' | grep .; then \
echo "$@: Locales content needs care" >&2 ; \
false; \
fi
.PHONY: y18n-check
define hostdeployer-grpc-gen
set -o errexit; \
set -o pipefail; \
protoc -I pkg/hostman/hostdeployer/apis \
--go_out=pkg/hostman/hostdeployer/apis \
--go_opt=paths=source_relative \
--go-grpc_out=pkg/hostman/hostdeployer/apis \
--go-grpc_opt=paths=source_relative \
pkg/hostman/hostdeployer/apis/deploy.proto
endef
hostdeployer-grpc-gen:
$(hostdeployer-grpc-gen)
check: fmt-check
check: gendocgo-check
#check: goimports-check
#check: vet-check
#check: y18n-check
check: goimports-check
check: vet-check
.PHONY: check
@@ -261,18 +224,18 @@ dep:
@echo "$$depDeprecated"
@$(MAKE) mod
RELEASE_BRANCH:=master
GOPROXY ?= direct
mod:
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get yunion.io/x/cloudmux@$(RELEASE_BRANCH)
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
go mod tidy
go mod vendor -v
define helpText
Build with docker
make docker-centos-build F='-j4'
make docker-centos-build F='-j4 cmd/region cmd/climc'
make docker-centos-build-stop
make docker-alpine-build F='-j4'
make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
make docker-alpine-build-stop
@@ -323,9 +286,6 @@ image:
.PHONY: image
image-telegraf-raid-plugin:
VERSION=v4.0-20260115.0 GOOS=linux ARCH=all make image telegraf-raid-plugin
%:
@:

View File

@@ -4,11 +4,12 @@ __inc_Makefile_common_mk:=1
ifeq ($(ModName),)
$(error ModName must be set, e.g. yunion.io/x/onecloud)
endif
ModBaseName:=$(notdir $(ModName))
DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.23-go-1.26.3-0
DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.0-5
DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-4
EnvIf=$(if $($(1)),$(1)=$($(1)))
@@ -16,7 +17,6 @@ define dockerCentOSBuildCmd
set -o xtrace
set -o errexit
set -o pipefail
git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
cd /root/go/src/yunion.io/x/$(ModBaseName)
env \
$(call EnvIf,GOARCH) \
@@ -26,16 +26,33 @@ env \
chown -R $(shell id -u):$(shell id -g) _output
endef
tmpName=$(ModBaseName)-$(shell date +"%Y%m%d.%H%M%S%3N")
docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
docker-centos-build:
docker rm --force docker-centos-build-$(ModBaseName) &>/dev/null || true
docker run \
--rm \
--name docker-centos-build-$(ModBaseName) \
-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
-v $(CURDIR)/_output/centos-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
-v $(CURDIR)/_output/centos-build/_cache:/root/.cache \
$(DockerImageCentOSBuild) \
/bin/bash -c "$$dockerCentOSBuildCmd"
ls -lh _output/centos-build/bin
# NOTE we need a way to stop and remove the container started by docker-build.
# No --tty, --stop-signal won't work
docker-centos-build-stop:
docker stop --time 0 docker-centos-build-$(ModBaseName) || true
.PHONY: docker-centos-build
.PHONY: docker-centos-build-stop
define dockerAlpineBuildCmd
set -o xtrace
set -o errexit
set -o pipefail
git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
cd /root/go/src/yunion.io/x/$(ModBaseName)
git config --global --add safe.directory /root/go/src/yunion.io/x/onecloud
env \
$(call EnvIf,GOARCH) \
$(call EnvIf,GOOS) \
@@ -46,10 +63,10 @@ endef
docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
docker-alpine-build:
docker rm --force docker-alpine-build-$(tmpName) &>/dev/null || true
docker rm --force docker-alpine-build-$(ModBaseName) &>/dev/null || true
docker run \
--rm \
--name docker-alpine-build-$(tmpName) \
--name docker-alpine-build-$(ModBaseName) \
-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
@@ -58,7 +75,7 @@ docker-alpine-build:
ls -lh _output/alpine-build/bin
docker-alpine-build-stop:
docker stop --time 0 docker-alpine-build-$(tmpName) || true
docker stop --time 0 docker-alpine-build-$(ModBaseName) || true
.PHONY: docker-alpine-build
.PHONY: docker-alpine-build-stop

13
OWNERS
View File

@@ -1,6 +1,15 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- swordqiu
reviewers:
- Zexi
- ioito
- swordqiu
- tb365
- wanyaoqi
- yousong
- zhaoxiangchun
- zhasm
approvers:
- swordqiu
- yousong
- wanyaoqi
- Zexi

View File

@@ -1,122 +1,54 @@
# Cloudpods
# Yunion Cloud (云联融合云)
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[![CircleCI](https://circleci.com/gh/yunionio/yunioncloud.svg?style=svg)](https://circleci.com/gh/yunionio/yunioncloud)
[![Build Status](https://travis-ci.com/yunionio/yunioncloud.svg?branch=master)](https://travis-ci.org/yunionio/yunioncloud)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/yunioncloud)](https://goreportcard.com/report/github.com/yunionio/yunioncloud)
[简体中文](./README-CN.md) | [English](./README.md)
## 什么是云联融合云?
## Cloudpods是什么?
云联融合云Yunion Cloud是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上通过技术手段将分布于多云的异构IT资源统一管理将多底层多云的差异向用户屏蔽并通过网络和调度实现资源的融合与打通在多云之上进行抽象向用户呈现统一的使用界面和API接口让用户就像使用一个云平台一样使用分布于多云的资源实现一个统一的“云上之云”的云平台。
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
鉴于企业IT基础设施的两个趋势1. 企业使用多云基础设施并且公有云是最主要的基础设施提供者2. 企业应用将逐步云原生化企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台也就是一个”云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异对外暴露了一套统一的API允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度提升了管理多云的效率。
云联融合云具备以下功能特性:
Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与 AI 容器应用的统一管理平台,帮助企业在同一平台完成 AI 工作负载的部署、调度与运维,与 Cloudpods 私有云/多云资源体系无缝集成。
- 多云资源统一管理
## 谁需要Cloudpods?
统一API、镜像、调度、账号体系、监控和计费等操作能够全面管理 On premises、 私有云、公有云资源。
* 将几台物理服务器虚拟化成一个私有云平台
* 需要一个紧凑而且功能相对完整的物理机全生命周期管理工具
* 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
* 在混合云的场景,能够在一个界面访问私有云和公有云
* 通过一个集中的入口访问分布在多个公有云平台上的多个账号
* 当前只使用一个公有云账号但希望将来使用多云的用户
* 需要部署和管理 LLM 推理服务及 AI 容器应用,并需要 GPU 调度支持的用户
- 内置私有云
## 功能
YunionCloud 内置完备的私有云实现提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
- 为多云Kubernetes提供运行环境
### AI 云
YunionCloud 自身为运行在Kubernetes的云原生应用并且能在多云环境部署运行Kubernetes集群。
* **AI 推理服务**:部署和管理 LLM 推理实例(支持 Ollama、vLLM、SGLang 等),支持 GPU 调度、模型挂载与推理服务地址分配。
* **AI 应用管理**:一站式部署 LLM 应用编排、智能体助手、图像生成等 AI 容器应用。
* **模型库**:统一管理模型来源、版本与缓存,支持多实例复用、离线分发,避免重复下载。
* **模板与镜像**:通过模板定义 CPU/内存/GPU 等资源规格,通过镜像管理容器运行环境,实现标准化交付。
* **GPU 运维**GPU 设备自动探测与注册,支持 NVIDIA/CUDA 环境的统一配置与管理。
欢迎安装部署云联融合云,期待大家的反馈!
支持的 AI 工作负载:
* AI 推理Ollama、vLLM、SGLang
* AI 应用OpenClaw、Dify、ComfyUI、Hermes Agent
### 支持的云平台
## 部署
* 公有云:
* AWS
* Azure
* Google Cloud Platform
* 阿里云
* 华为云
* 腾讯云
* UCloud
* 天翼云
* 移动云
* 京东云
* 火山引擎
* 百度云
* 金山云
* 青云
* Oracle Cloud
* 联通云
* 私有云:
* OpenStack
* ZStack
* Alibaba Cloud Apsara (阿里飞天)
* Huawei HCSO (华为HCSO)
* Nutanix
* BingoCloud
* OceanBase
* 本地基础设施资源:
* 基于 KVM 实现的轻量级私有云
* VMware vSphere vCenter/ESXi
* Proxmox VE
* 裸金属 (IPMI, Redfish API)
* 对象存储 (Minio, Ceph, XSky)
* NAS (Ceph)
请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 YunionCloud 集群。
### 支持的云资源
* 服务器实例、磁盘、网卡、网络、VPC、存储、宿主机、二层网络、快照、快照策略、安全组、弹性 IP、SSH 密钥对、镜像
* 负载均衡实例、监听、后端服务器组、后端服务器、TLS 证书、访问控制
* 对象存储:存储桶、对象
* NAS文件系统、权限组、挂载点
* RDS实例、账号、备份、数据库、参数、权限
* 弹性缓存:实例、账号、备份、参数
* DNSDNS 区域、DNS 记录
* VPCVPC、VPC 对等连接、跨 VPC 网络、NAT 网关、DNAT/SNAT 规则、路由表、路由条目
## 安装部署
请参考文档[安装部署](https://www.cloudpods.org/docs/getting-started/)选择合适的场景部署。
## 文档
* [Cloudpods文档](https://www.cloudpods.org/zh)
- [文档中心](https://docs.yunion.io/)
* [Swagger API文档](https://www.cloudpods.org/zh/docs/swagger/)
- [Swagger API文档](https://docs.yunion.cn/api/)
## 谁在使用Cloudpods
请在[这里](https://github.com/yunionio/cloudpods/issues/11427)查看Cloudpods用户列表。如果你正在使用Cloudpods欢迎回复留下你的信息。谢谢对Cloudpods的支持
## 架构
## 联系我们
![architecture](https://www.yunion.cn/static/frame.png)
* 请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
* TG群: [cloudpods](https://t.me/cloudpods_org)
## 版本历史
请查看[发布日志](https://www.cloudpods.org/docs/release-notes/)和[Changelog](https://www.cloudpods.org/docs/development/changelog/)。
## 贡献
欢迎和感谢任何形式的贡献,不局限于贡献代码,流程细节请查看 [CONTRIBUTING](./CONTRIBUTING_zh.md)。
我们非常欢迎和感谢开发者向项目做贡献,流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md)
## License
Apache license 2.0详情请看 [LICENSE](./LICENSE)。
## AI生成文档
[DeepWiki](https://deepwiki.com/yunionio/cloudpods) 提供了对本项目代码详细和全面的AI解读可以参考。
YunionCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE)

126
README.md
View File

@@ -1,123 +1,55 @@
# Cloudpods
# Yunion Cloud
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[![CircleCI](https://circleci.com/gh/yunionio/yunioncloud.svg?style=svg)](https://circleci.com/gh/yunionio/yunioncloud)
[![Build Status](https://travis-ci.com/yunionio/yunioncloud.svg?branch=master)](https://travis-ci.com/yunionio/yunioncloud/branches)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/yunioncloud)](https://goreportcard.com/report/github.com/yunionio/yunioncloud)
[English](./README.md) | [简体中文](./README-CN.md)
### [README in Chinese](./README-CN.md)
## What is Cloudpods?
## What is Yunion Cloud?
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
Yunion Cloud is an open source unified-IaaS cloud platform.
Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform developed with Golang, i.e. Cloudpods is *a cloud on clouds*. Cloudpods is able to manage not only on-premise KVM/baremetals, but also resources from many cloud accounts across many cloud providers. It hides the differences of underlying cloud providers and exposes one set of APIs that allow programatically interacting with these many clouds.
As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion Cloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
Cloudpods also provides **AI Cloud**, a unified management platform for large language model (LLM) inference and AI container applications, helping enterprises deploy, schedule, and operate AI workloads on a single platform, seamlessly integrated with the Cloudpods private cloud / multi-cloud resource ecosystem.
As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion Cloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
## Who needs Cloudpods?
Many may consider Yunion Cloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
* Those who need a simple solution to virtualize a few physical servers into a private cloud
* Those who need a compact and fully automatic baremetal lift-cycle management solution
* Those who want to turn a VMware vSphere virtualization cluster into a private cloud
* Those who need a cohesive view of both public and private cloud in a hybrid cloud setup
* Those who need a centric portal to access multiple accounts from multiple public clouds
* Those who is currently using a single cloud account, but will not lose the possibility to adopt multicloud strategy
* Those who need to deploy and manage LLM inference services and AI container applications with GPU support
Yunion Cloud is working on abstracting APIs for the following resources:
## Features
* Compute, including virtual machines, images, etc.
* Storage, including disks, snapshots, object storages, etc.
* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
* Accouting and billing, etc.
* ...
See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
over the following many cloud providers:
### AI Cloud
* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
* Private clouds, including OpenStack, etc.
* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
* **AI Inference Services**: Deploy and manage LLM inference instances (Ollama, vLLM, SGLang, and more) with GPU scheduling, model mounting, and inference service address allocation.
* **AI Application Management**: One-stop deployment of LLM application orchestration, agent assistants, image generation, and other AI container applications.
* **Model Library**: Unified management of model sources, versions, and caches, supporting multi-instance reuse and offline distribution.
* **Templates and Images**: Define resource specifications (CPU/memory/GPU) through templates, manage container runtime environments through images.
* **GPU Operations**: Automatic GPU device detection and registration, unified NVIDIA/CUDA environment configuration and management.
You are welcome to install and try Yunion Cloud. Looking forward to your feedback.
Supported AI workloads:
* AI Inference: Ollama, vLLM, SGLang
* AI Applications: OpenClaw, Dify, ComfyUI, Hermes Agent
## Installation
### Supported cloud providers
* Public Clouds:
* AWS
* Azure
* Google Cloud Platform
* Alibaba Cloud
* Huawei Cloud
* Tencent Cloud
* UCloud
* Ctyun (China Telecom)
* ECloud (China Mobile)
* JDCloud
* Volcengine
* Baidu Cloud
* Kingsoft Cloud
* QingCloud
* Oracle Cloud
* China Unicom Cloud
* Private Clouds:
* OpenStack
* ZStack
* Alibaba Cloud Apsara
* Huawei HCSO
* Nutanix
* BingoCloud
* OceanBase
* On-premise resources:
* Lightweight private cloud built on KVM
* VMware vSphere vCenter/ESXi
* Proxmox VE
* Baremetals (IPMI, Redfish API)
* Object storages (Minio, Ceph, XSky)
* NAS (Ceph)
### Supported resources
* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
* Object Storage: buckets, objects
* NAS: file_systems, access_groups, mount_targets
* RDS: instances, accounts, backups, databases, parameters, privileges
* Elastic Cache: instances, accounts, backups, parameters
* DNS: DNS zones, DNS records
* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
## Getting started
Please refer to the document [Getting Started](https://www.cloudpods.org/en/docs/getting-started/) to select the appropriate scenario for installation.
Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
## Documentations
* [Cloudpods Documents](https://www.cloudpods.org/en)
- [Yunion Cloud Documents](https://docs.yunion.io/)
* [Swagger API](https://www.cloudpods.org/en/docs/swagger/)
- [Swagger API](https://docs.yunion.cn/apiv2/)
## Architecture
## Who is using Cloudpods?
Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) for the user list of Cloudpods. If you are using Cloudpods, you are welcome to leave your information by responding the issue. Thank you for your support.
## Contact
* See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
* Telegram: [cloudpods](https://t.me/cloudpods_org)
## Changelog
See [Release Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
![architecture](https://www.yunion.cn/static/frame.png)
## Contribution
You are welcome to do any kind of contribution to the project. Please refer to [CONTRIBUTING](./CONTRIBUTING.md) for guidelines.
You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
## License
Apache License 2.0. See [LICENSE](./LICENSE).
## AI-generated doc
[DeepWiki](https://deepwiki.com/yunionio/cloudpods) provides an amazing AI-generated doc of this project, you may refer to it for more detailed and comprehensive understanding of codes.
Apache License 2.0. See [LICENSE](./LICENSE)

View File

@@ -1 +0,0 @@
DESCRIPTION="Yunion Cloud AI Proxy Service"

View File

@@ -36,12 +36,6 @@ fi
. $ROOT/vars
BUILDROOT=$(mktemp -d 2>/dev/null || mktemp -d -t 'yunion')
function cleanup {
rm -rf "$BUILDROOT"
echo "Deleted temp working directory $BUILDROOT"
}
# register the cleanup function to be called on the EXIT signal
trap cleanup EXIT
echo "Build root ${BUILDROOT}"
@@ -50,12 +44,7 @@ echo "Build root ${BUILDROOT}"
if [ -z "$VERSION" ]; then
TAG=$(git describe --abbrev=0 --tags || echo testing)
VERSION=${TAG/\//-}
if [[ "$VERSION" =~ ^v0. ]]; then
VERSION=${VERSION/v0./}
elif [[ "$VERSION" =~ ^v ]]; then
VERSION=${VERSION/v/}
fi
VERSION=${VERSION//-/.}
VERSION=${VERSION/v/}
fi
RELEASE=`date +"%y%m%d%H"`
@@ -79,8 +68,6 @@ echo "# Yunion RPM spec
%global pkgname yunion-$PKG
%global homedir /var/run/%{owner}
%global use_systemd $SERVICE
%global debug_package %{nil}
%global __strip /usr/bin/eu-strip
Name: %{pkgname}
Version: $VERSION
@@ -112,87 +99,41 @@ if [ -d $ROOT/root ]; then
rsync -a $ROOT/root/ \$RPM_BUILD_ROOT
fi
%pre" > $SPEC_FILE
if [ -f $ROOT/preinst ]; then
cat $ROOT/preinst >> $SPEC_FILE
else
echo "
%pre
%if %{use_systemd}
getent group %{owner} >/dev/null || /usr/sbin/groupadd -r %{owner}
getent passwd %{owner} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d %{homedir} -M -g %{owner} %{owner}
%endif
" >> $SPEC_FILE
fi
echo "
%post" >> $SPEC_FILE
if [ -f $ROOT/postinst ]; then
cat $ROOT/postinst >> $SPEC_FILE
else
echo "
%post
%if %{use_systemd}
mkdir -p /var/run/%{owner}
chown -R %{owner}:%{owner} /var/run/%{owner}
/usr/bin/systemctl preset %{pkgname}.service >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo "
%preun" >> $SPEC_FILE
if [ -f $ROOT/prerm ]; then
cat $ROOT/prerm >> $SPEC_FILE
else
echo "
%preun
%if %{use_systemd}
/usr/bin/systemctl --no-reload disable %{pkgname}.service >/dev/null 2>&1 || :
/usr/bin/systemctl stop %{pkgname}.service >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo "
%postun" >> $SPEC_FILE
if [ -f $ROOT/postrm ]; then
cat $ROOT/postrm >> $SPEC_FILE
else
echo "
%postun
%if %{use_systemd}
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
%endif
" >> $SPEC_FILE
fi
echo -n "
%files
%doc
$BIN_PATH/$PKG
" >> $SPEC_FILE
for b in $EXTRA_BINS; do
echo $BIN_PATH/$b >> $SPEC_FILE
done
$(for b in $EXTRA_BINS; do echo $BIN_PATH/$b; done)
" > $SPEC_FILE
if [ -d $ROOT/root/ ]; then
find $ROOT/root/ -type f | sed -e "s:$ROOT/root::g" >> $SPEC_FILE
fi
TARGET=
case "$GOARCH" in
"arm64" | "aarch64" | "arm")
TARGET="--target aarch64-redhat-linux"
;;
"amd64" | "x86" | "i686" | "i386" | "x86_64")
TARGET="--target x86_64-redhat-linux"
;;
"riscv64")
TARGET="--target riscv64-linux"
;;
esac
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE $TARGET
rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE
find $RPM_DIR -type f | while read f; do
d="$(dirname "$f")"
@@ -200,3 +141,5 @@ find $RPM_DIR -type f | while read f; do
mkdir -p "$d"
cp $f $d
done
rm -fr $BUILDROOT

View File

@@ -35,6 +35,24 @@ fi
. $ROOT/vars
if [ -z "$VERSION" ]; then
TAG=$(git describe --abbrev=0 --tags || echo 000000)
VERSION=${TAG/\//-}
VERSION=${VERSION/v/}
fi
RELEASE=`date +"%y%m%d%H"`
FULL_VERSION=$VERSION-$RELEASE
BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
rm -rf $BUILDROOT
mkdir -p $BUILDROOT/DEBIAN
mkdir -p $BUILDROOT/$BIN_PATH
cp -rf $BIN $BUILDROOT/$BIN_PATH
cp -rf $ROOT/root/* $BUILDROOT/
echo "Build root ${BUILDROOT}"
case $(uname -m) in
x86_64)
CURRENT_ARCH=amd64
@@ -42,134 +60,17 @@ case $(uname -m) in
aarch64)
CURRENT_ARCH=arm64
;;
riscv64)
CURRENT_ARCH=riscv64
;;
esac
if [[ -n "$GOARCH" ]]; then
case "$GOARCH" in
"arm64" | "arm" | "aarch64")
CURRENT_ARCH="arm64"
;;
"x86" | "x86_64" | "i686" | "i386" | "amd64")
CURRENT_ARCH="amd64"
;;
"riscv64")
CURRENT_ARCH="riscv64"
;;
esac
fi
if [ -z "$VERSION" ]; then
TAG=$(git describe --abbrev=0 --tags || echo 000000)
VERSION=${TAG/\//-}
VERSION=${VERSION/v/}
VERSION=${VERSION/master-/}
fi
RELEASE=`date +"%y%m%d%H"`
FULL_VERSION=$VERSION-$RELEASE
BUILDROOT=$OUTPUT_DIR/yunion-${PKG}-${FULL_VERSION}_${CURRENT_ARCH}
function cleanup {
rm -rf "$BUILDROOT"
echo "Deleted temp working directory $BUILDROOT"
}
# register the cleanup function to be called on the EXIT signal
trap cleanup EXIT
rm -rf $BUILDROOT
mkdir -p $BUILDROOT/DEBIAN
mkdir -p $BUILDROOT/$BIN_PATH
cp -rf $BIN $BUILDROOT/$BIN_PATH
if [ -d $ROOT/root ]; then
cp -rf $ROOT/root/* $BUILDROOT/
fi
echo "Build root ${BUILDROOT}"
echo "Package: yunion-$PKG
echo "Package: yunion-$1
Version: $FULL_VERSION
Section: base
Priority: optional
Architecture: $CURRENT_ARCH
Maintainer: wanyaoqi@yunionyun.com
Description: $DESCRIPTION" > $BUILDROOT/DEBIAN/control
if [ ${#REQUIRES[@]} -gt 0 ]; then
DEPS=$(IFS=, ; echo "${REQUIRES[*]}")
echo "Depends: $DEPS" >> $BUILDROOT/DEBIAN/control
fi
Description: Yunion $1
" > $BUILDROOT/DEBIAN/control
chmod 0755 $BUILDROOT/DEBIAN/control
cat $BUILDROOT/DEBIAN/control
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/preinst
if [ -f $ROOT/preinst ]; then
cat $ROOT/preinst >> $BUILDROOT/DEBIAN/preinst
else
if [ "$SERVICE" == "yes" ] && [ -n "$OWNER" ]; then
echo "
getent group ${OWNER} >/dev/null || /usr/sbin/groupadd -r ${OWNER}
getent passwd ${OWNER} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d /home/${OWNER} -M -g ${OWNER} ${OWNER}
" >> $BUILDROOT/DEBIAN/preinst
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/preinst
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/postinst
if [ -f $ROOT/postinst ]; then
cat $ROOT/postinst >> $BUILDROOT/DEBIAN/postinst
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl preset yunion-${PKG}.service >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/postinst
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/postinst
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/prerm
if [ -f $ROOT/prerm ]; then
cat $ROOT/prerm >> $BUILDROOT/DEBIAN/prerm
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl --no-reload disable yunion-${PKG}.service >/dev/null 2>&1 || :
/usr/bin/systemctl stop yunion-${PKG}.service >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/prerm
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/prerm
echo "#!/bin/bash
" > $BUILDROOT/DEBIAN/postrm
if [ -f $ROOT/postrm ]; then
cat $ROOT/postrm >> $BUILDROOT/DEBIAN/postrm
else
if [ "$SERVICE" == "yes" ]; then
echo "
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 ||:
" >> $BUILDROOT/DEBIAN/postrm
fi
fi
chmod 0755 $BUILDROOT/DEBIAN/postrm
dpkg-deb --build $BUILDROOT
case "$CURRENT_ARCH" in
"amd64")
DSTARCH="x86_64"
;;
"arm64")
DSTARCH="aarch64"
;;
"riscv64")
DSTARCH="riscv64"
;;
esac
mkdir -p ${OUTPUT_DIR}/${DSTARCH}
mv ${BUILDROOT}.deb ${OUTPUT_DIR}/${DSTARCH}/
dpkg-deb --build $BUILDROOT

View File

@@ -1,19 +0,0 @@
#!/bin/bash
set -e
BASHRC=/etc/profile.d/climc.sh
grep -q rcadmin $BASHRC || echo 'source /etc/yunion/rcadmin' >> $BASHRC
source $BASHRC
climc sshkeypair-inject --admin --target-dir /root/
mkdir -p /etc/dropbear
mkdir -p /var/run/dropbear
test -f /etc/dropbear/dropbear_rsa_host_key || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
dropbear -RFEjk -G root -p 22

View File

@@ -1,22 +0,0 @@
export PATH=/opt/yunion/bin:$PATH
if [ -f /etc/profile.d/bash_completion.sh ]; then
source /etc/profile.d/bash_completion.sh
fi
test -f /etc/yunion/rcadmin && source /etc/yunion/rcadmin
if [ -n "$OS_AUTH_TOKEN" ]; then
test -n "$OS_USERNAME" && unset OS_USERNAME
test -n "$OS_PASSWORD" && unset OS_PASSWORD
test -n "$OS_DOMAIN_NAME" && unset OS_DOMAIN_NAME
test -n "$OS_ACCESS_KEY" && unset OS_ACCESS_KEY
test -n "$OS_SECRET_KEY" && unset OS_SECRET_KEY
fi
source <(climc --completion bash)
source <(kubectl completion bash)
echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
echo "Please exec 'climc' to get started"
echo ""

View File

@@ -47,11 +47,6 @@ do
climc server-purge $i > /dev/null
done
for i in $(climc server-list --admin --limit 2048 --system --filter "backup_host_id.equals($HOSTID)" | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
do
climc server-delete-backup $i > /dev/null
done
echo "3. Clean disks on $HOSTNAME($HOSTID)"
for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')

View File

@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" ID="_1e55eaf7-5cb9-4601-b557-e322fdfb2baf" entityID="urn:federation:MicrosoftOnline">
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<Reference URI="#_1e55eaf7-5cb9-4601-b557-e322fdfb2baf">
<Transforms>
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<DigestValue>fA33hUaj24/8F8bArDIkH6CpX0k=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>p/rlVWxLRIYiHozzWUgsjmQ5ItMZ/ITeEOg/edeo50l7qU8wLM9JD55EHoLpVvxImBcCfY1CxKdq3s1o9Up1jvEcH9KjfYZea1q8hzTkQdt7F2XvxoqDFRLvVwyHHJjygaEvFRXXxml7IDgDx9ScSRhQeGUlTGhI9eAFSaGkChM/FPnmekZ3ngSwbVf4FsTLIArxMqEnV0lXNMTr5NHQ6VL5wZ/cHLNCkkBoY0qWyv2hnYiZiXa4TKjpAN+8QF5GDPv/0ExJwe+aoRAQhdBzhBUICQdQd+v3Rb5SuX++iVfmf4IPMqj8CK4uK7iYXNLCGEO8oFR2KlK/zBpHzw6yCQ==</SignatureValue>
<KeyInfo>
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
</X509Data>
</KeyInfo>
</Signature>
<SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
<X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf"/>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf" index="0" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.microsoftonline.com/login.srf" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.microsoftonline.com/login.srf" index="2"/>
</SPSSODescriptor>
<Extensions>
<alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
</Extensions>
</EntityDescriptor>

View File

@@ -1,35 +0,0 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.volcengine.com/">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDJjCCAg6gAwIBAgIUF3lH8/cdlQeyPBqt066RFnt3cI4wDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UEAxMadXJuOnZvbGNlbmdpbmU6d2Vic2VydmljZXMwHhcNMjMwODA4MDIzNzI4WhcNMzMwODIxMTYwMDAwWjAlMSMwIQYDVQQDExp1cm46dm9sY2VuZ2luZTp3ZWJzZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPZ+nhODpFTe+A8PbuZYA5XDQ04WckV1A5U90tKaaUX5uKLUYfDtFA1TwMO/qG87LU/0Pxs4FhgZJkUOeBHkyYzzXZQvtfsJ9frcKkcTjX/WF4XJyitXCULSjhcclMS3gOqeI/Mo3P90KutfhNli/mAHQJaRsuPFG4ZwBusbUo8i5sqBqt/Sg8JapH7DjEU2mN1165o59gavPGSByPeEuu28EkivVFcI7Jox5ztwgMrOYY+pYP9GeSurzpyLq3CfvvahTsAJjuHDHTTnYNcq/I3VOap/y4cOU6vgxcQvBmgb+CBvGldjn0em3BIn5meQwuB6jfQ7kqBaO1PRD1nhDTMCAwEAAaNOMEwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vbmV4dXMtcHJvZHVjdGlvbi5ieXRlZGFuY2UubmV0L3BjYS9vY3NwMA0GCSqGSIb3DQEBCwUAA4IBAQBxySDr9TPJxRN+otrFDaV8HSeFKUUSO3+r8bEVAXmS+xUsdUOZbaf2r/g+eKrW58dpn+iBWTAAKug9Jwe5KVGqB7G5r2r6k/eI5dvv5r/Fr5T7NppRCXKQTQiAhrrVlqttsagPztJ6LmVAcm4sh4Ckx99FgibQCbT/zui+c6IUyEQcVIwtmoPANl3K2Yn85t+G+Cu9xxXY0JPlZcUHntHg0R0PUWc3LuzLXnff7JWEzPyhMUBLpQk5BltxuD5cTGCA6WafJuBTAqkt48VN0MFTP5c5m3PJFz8Ro1GLY8hw1uhUEx28DKBkQSGpkZNx0oJXETIDpSBfD0dHWBvZQPd0</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
<AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.volcengine.com/saml/sso"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">Volcengine Single Sign-On</ServiceName>
<RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/Identity" FriendlyName="Identity"/>
<RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/SessionName" FriendlyName="SessionName"/>
<RequestedAttribute isRequired="false" Name="https://www.volcengine.com/SAML/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Volcengine, Inc.</OrganizationName>
<OrganizationDisplayName xml:lang="en">Volcengine</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.volcengine.com</OrganizationURL>
</Organization>
</EntityDescriptor>

View File

@@ -1,3 +0,0 @@
INTERFACE=""
INTERFACE_IP=""
RELAY=""

View File

@@ -1,22 +0,0 @@
[Unit]
Description=Yunion Cloud DHCP Relay Agent
Documentation=https://docs.yunion.cn
After=network-online.target
Wants=network-online.target
After=network.target
[Service]
Type=simple
EnvironmentFile=-/etc/sysconfig/yunion_dhcprelay
User=root
Group=root
ExecStart=/opt/yunion/bin/dhcprelay --interface "$INTERFACE" --ip "$IP" --relay "$RELAY"
WorkingDirectory=/opt/yunion/bin
KillMode=process
Restart=always
RestartSec=30
LimitNOFILE=500000
LimitNPROC=500000
[Install]
WantedBy=multi-user.target

View File

@@ -1,2 +0,0 @@
DESCRIPTION="Yunion Tiny DHCP Relay Server"
SERVICE="yes"

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/aiproxy /opt/yunion/bin/aiproxy

View File

@@ -1,8 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
# https://github.com/yunionio/telegraf/blob/yn-release-1.36/Makefile.yn#L28
# install playbook and telegraf install pkg
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/playbook /opt/yunion/playbook
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.2
ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

View File

@@ -1,31 +1,12 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
LABEL maintainer="Yousong Zhou <zhouyousong@yunionyun.com>"
ENV TZ="UTC"
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
# openssh-client, for ansible ssh connection
# git, ca-certificates, for fetching ansible roles
RUN set -x \
&& apk update \
&& apk add openssh-client \
&& apk add sshpass \
&& apk add py3-pip \
&& apk add py3-paramiko \
&& apk add tzdata git ca-certificates
RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client
RUN apk add --no-cache --virtual .build-dependencies \
libffi-dev openssl-dev python3-dev build-base py-setuptools rust cargo mariadb-dev
# ansible should be installed
# after setuptools and wheel
RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED
RUN pip3 install -U pip setuptools wheel \
&& pip3 install mysqlclient pywinrm \
&& pip3 install 'ansible<=9.0.0' \
&& apk del --no-network .build-dependencies \
&& rm -rf /root/.cache /root/.cargo /var/cache/apk/*
&& apk update \
&& apk add openssh-client \
&& apk add ansible \
&& apk add tzdata git ca-certificates \
&& rm -rf /var/cache/apk/*

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway
ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/apimap /opt/yunion/bin/apimap

View File

@@ -1,8 +1,9 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20260724.0
FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.2
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
RUN mkdir -p /opt/yunion/bin
ENV TZ="UTC"
ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent

View File

@@ -1,89 +1,35 @@
#RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
#RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v4.0.0-20251203.0 as yunionos
FROM registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
RUN yum install -y https://iso.yunion.cn/3.6/rpms/packages/host/baremetal-pxerom-1.1.0-20072810.x86_64.rpm
FROM registry.cn-beijing.aliyuncs.com/cloudpods/centos:8 as grub-stage
FROM frolvlad/alpine-glibc:glibc-2.28
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
RUN dnf install -y grub2*
# make grub_booti386 firmware
RUN grub2-mkimage -d /usr/lib/grub/i386-pc/ -O i386-pc-pxe -o /root/grub_booti386 -p '/grub' pxe tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal biosdisk
# make grub_bootx64 firmware
RUN grub2-mkimage -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi -o /root/grub_bootx64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
# make grub_arm64 firmware
RUN grub2-mkimage -d /usr/lib/grub/arm64-efi/ -O arm64-efi -o /root/grub_arm64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
RUN mkdir -p /tftp/grub
RUN cp /root/grub_booti386 /tftp
RUN cp -rf /usr/lib/grub/i386-pc /tftp/grub
RUN cp /root/grub_bootx64.efi /tftp
RUN cp -rf /usr/lib/grub/x86_64-efi /tftp/grub
RUN cp /root/grub_arm64.efi /tftp
RUN cp -rf /usr/lib/grub/arm64-efi /tftp/grub
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
RUN mkdir -p /opt/yunion/bin
RUN apk update && \
apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils librados librbd && \
apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /opt/cloud/yunion/baremetal
# udpate latest pci.ids
RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
#COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
#COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
#COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
#COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
# copy grub file
COPY --from=grub-stage /tftp/grub_booti386 /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub_bootx64.efi /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub_arm64.efi /opt/cloud/yunion/baremetal
COPY --from=grub-stage /tftp/grub /opt/cloud/yunion/baremetal/grub
# copy boot files from yunionos
COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/aarch64/kernel /opt/cloud/yunion/baremetal/kernel_aarch64
COPY --from=yunionos /yunionos/aarch64/initramfs /opt/cloud/yunion/baremetal/initramfs_aarch64
COPY --from=yunionos /yunionos/riscv64/kernel /opt/cloud/yunion/baremetal/kernel_riscv64
COPY --from=yunionos /yunionos/riscv64/initramfs /opt/cloud/yunion/baremetal/initramfs_riscv64
# TODO: syslinux firmwares should removed in future
COPY --from=yunionos /yunionos/x86_64/isolinux.bin /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/bootia32.efi /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/bootx64.efi /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/chain.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.e32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/ldlinux.e64 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/libcom32.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/libutil.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/lpxelinux.0 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/menu.c32 /opt/cloud/yunion/baremetal
COPY --from=yunionos /yunionos/x86_64/pxelinux.0 /opt/cloud/yunion/baremetal
COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal

View File

@@ -1,7 +1,5 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:3.22.2-2
FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
ADD ./build/climc/root/opt /opt
RUN cp /opt/yunion/scripts/motd/climc.sh /etc/profile.d/climc.sh && ln -sf /etc/profile.d/climc.sh /root/.bashrc
ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

View File

@@ -1,24 +1,16 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TARGETARCH
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="Asia/Shanghai"
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
rm -rf /var/cache/apk/*
RUN usermod --shell /bin/bash root
RUN curl https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ENV PATH="/opt/yunion/bin:${PATH}"
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,24 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TARGETARCH
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="Asia/Shanghai"
RUN mkdir -p /opt/yunion/bin
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
rm -rf /var/cache/apk/*
RUN usermod --shell /bin/bash root
RUN curl -L https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent
ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
COPY ./build/cloudid/root/opt/ /opt/
ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

View File

@@ -1,8 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
RUN mkdir -p /etc/yunion/data/
ADD ./_output/alpine-build/bin/cloudmon \
/opt/yunion/bin/

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet
ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy

View File

@@ -1,6 +1,6 @@
# registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0
FROM debian:trixie
FROM debian:10
RUN apt update && apt install -y alien

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool
ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool

View File

@@ -1,6 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/dhcprelay /opt/yunion/bin/dhcprelay
ENV PATH $PATH:/opt/yunion/bin
WORKDIR /opt/yunion/bin

View File

@@ -1,3 +1,5 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
COPY ./build/esxi-agent/root/opt/ /opt/
ADD ./_output/alpine-build/bin/esxi-agent /opt/yunion/bin/esxi-agent

View File

@@ -1,5 +1,6 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

View File

@@ -1,7 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:3.22.2-0
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN apk add --no-cache s3fs-fuse

View File

@@ -1,360 +0,0 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
#
#
# Dockerfile for guacamole-server
#
# The Alpine Linux image that should be used as the basis for the guacd image
ARG ALPINE_BASE_IMAGE=3.22.2
# The target architecture of the build. Valid values are "ARM" and "X86". By
# default, this is detected automatically.
ARG BUILD_ARCHITECTURE
# The number of processes that may run simultaneously during the build. By
# default, this is detected automatically.
ARG BUILD_JOBS
# The directory that will house the guacamole-server source during the build
ARG BUILD_DIR=/tmp/guacamole-server
# FreeRDP version (default to version 2)
ARG FREERDP_VERSION=2
# The final install location for guacamole-server and all dependencies. NOTE:
# This value is hard-coded in the entrypoint. Any change to this value must be
# propagated there.
ARG PREFIX_DIR=/opt/guacamole
#
# Automatically select the latest versions of each core protocol support
# library (these can be overridden at build time if a specific version is
# needed)
#
ARG WITH_FREERDP="${FREERDP_VERSION}(\.\d+)+"
ARG WITH_LIBSSH2='libssh2-\d+(\.\d+)+'
ARG WITH_LIBTELNET='\d+(\.\d+)+'
ARG WITH_LIBVNCCLIENT='LibVNCServer-\d+(\.\d+)+'
ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
ARG WITH_GUACAMOLE_SERVER='\d+(\.\d+)+'
#
# Default build options for each core protocol support library, as well as
# guacamole-server itself (these can be overridden at build time if different
# options are needed)
#
ARG FREERDP_ARM_OPTS=""
ARG FREERDP_OPTS="\
-DBUILTIN_CHANNELS=OFF \
-DCHANNEL_URBDRC=OFF \
-DWITH_ALSA=OFF \
-DWITH_CAIRO=ON \
-DWITH_CHANNELS=ON \
-DWITH_CLIENT=ON \
-DWITH_CUPS=OFF \
-DWITH_DIRECTFB=OFF \
-DWITH_FFMPEG=OFF \
-DWITH_FUSE=OFF \
-DWITH_GSM=OFF \
-DWITH_GSSAPI=OFF \
-DWITH_IPP=OFF \
-DWITH_JPEG=ON \
-DWITH_KRB5=ON \
-DWITH_LIBSYSTEMD=OFF \
-DWITH_MANPAGES=OFF \
-DWITH_OPENH264=OFF \
-DWITH_OPENSSL=ON \
-DWITH_OSS=OFF \
-DWITH_PCSC=OFF \
-DWITH_PKCS11=OFF \
-DWITH_PULSE=OFF \
-DWITH_SERVER=OFF \
-DWITH_SERVER_INTERFACE=OFF \
-DWITH_SHADOW_MAC=OFF \
-DWITH_SHADOW_X11=OFF \
-DWITH_SWSCALE=OFF \
-DWITH_WAYLAND=OFF \
-DWITH_X11=OFF \
-DWITH_X264=OFF \
-DWITH_XCURSOR=ON \
-DWITH_XEXT=ON \
-DWITH_XI=OFF \
-DWITH_XINERAMA=OFF \
-DWITH_XKBFILE=ON \
-DWITH_XRENDER=OFF \
-DWITH_XTEST=OFF \
-DWITH_XV=OFF \
-DCMAKE_CXX_FLAGS=-Wno-incompatible-pointer-types \
-DCMAKE_C_FLAGS=-Wno-incompatible-pointer-types \
-DWITH_ZLIB=ON"
ARG FREERDP_X86_OPTS=""
ARG GUACAMOLE_SERVER_ARM_OPTS=""
ARG GUACAMOLE_SERVER_OPTS="\
--disable-guaclog \
CPPFLAGS=-Wno-error=deprecated-declarations"
ARG GUACAMOLE_SERVER_X86_OPTS=""
ARG GUACAMOLE_SERVER_UNKNOWN_OPTS=""
ARG LIBSSH2_ARM_OPTS=""
ARG LIBSSH2_OPTS="\
-DBUILD_EXAMPLES=OFF \
-DBUILD_SHARED_LIBS=ON"
ARG LIBSSH2_X86_OPTS=""
ARG LIBTELNET_ARM_OPTS=""
ARG LIBTELNET_OPTS="\
--disable-static \
--disable-util"
ARG LIBTELNET_X86_OPTS=""
ARG LIBVNCCLIENT_ARM_OPTS=""
ARG LIBVNCCLIENT_OPTS=""
ARG LIBVNCCLIENT_X86_OPTS=""
ARG LIBWEBSOCKETS_ARM_OPTS=""
ARG LIBWEBSOCKETS_OPTS="\
-DDISABLE_WERROR=ON \
-DLWS_WITHOUT_SERVER=ON \
-DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_TEST_CLIENT=ON \
-DLWS_WITHOUT_TEST_PING=ON \
-DLWS_WITHOUT_TEST_SERVER=ON \
-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
-DLWS_WITH_STATIC=OFF"
ARG LIBWEBSOCKETS_X86_OPTS=""
#
# Base builder image that will be used by subsequent build stages, including
# for building dependencies of guacamole-server.
#
FROM alpine:${ALPINE_BASE_IMAGE} AS builder
ARG BUILD_DIR
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
# Install build dependencies
RUN apk add \
autoconf \
automake \
build-base \
cairo-dev \
cjson-dev \
cmake \
cunit-dev \
git \
grep \
krb5-dev \
libjpeg-turbo-dev \
libpng-dev \
libtool \
libwebp-dev \
make \
openssl-dev \
pango-dev \
pulseaudio-dev \
sdl2-dev \
sdl2_ttf-dev \
util-linux-dev
ARG GUAC_VER=1.6.0
RUN git clone --branch=${GUAC_VER} https://github.com/apache/guacamole-server.git ${BUILD_DIR}
#
# Build dependency: libssh2
#
FROM builder AS libssh2
ARG BUILD_DIR
ARG LIBSSH2_ARM_OPTS
ARG LIBSSH2_OPTS
ARG LIBSSH2_X86_OPTS
ARG PREFIX_DIR
ARG WITH_LIBSSH2
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBSSH2" \
"https://github.com/libssh2/libssh2"
#
# Build dependency: libtelnet
#
FROM builder AS libtelnet
ARG BUILD_DIR
ARG LIBTELNET_ARM_OPTS
ARG LIBTELNET_OPTS
ARG LIBTELNET_X86_OPTS
ARG PREFIX_DIR
ARG WITH_LIBTELNET
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBTELNET" \
"https://github.com/seanmiddleditch/libtelnet"
#
# Build dependency: libvncclient
#
FROM builder AS libvncclient
ARG BUILD_DIR
ARG LIBVNCCLIENT_ARM_OPTS
ARG LIBVNCCLIENT_OPTS
ARG LIBVNCCLIENT_X86_OPTS
ARG PREFIX_DIR
ARG WITH_LIBVNCCLIENT
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBVNCCLIENT" \
"https://github.com/LibVNC/libvncserver"
#
# Build dependency: libwebsockets
#
FROM builder AS libwebsockets
ARG BUILD_DIR
ARG LIBWEBSOCKETS_ARM_OPTS
ARG LIBWEBSOCKETS_OPTS
ARG LIBWEBSOCKETS_X86_OPTS
ARG PREFIX_DIR
ARG WITH_LIBWEBSOCKETS
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "LIBWEBSOCKETS" \
"https://github.com/warmcat/libwebsockets"
#
# Build dependency: FreeRDP
#
FROM builder AS freerdp
ARG BUILD_DIR
ARG FREERDP_ARM_OPTS
ARG FREERDP_OPTS
ARG FREERDP_X86_OPTS
ARG PREFIX_DIR
ARG WITH_FREERDP
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "FREERDP" \
"https://github.com/FreeRDP/FreeRDP"
#
# STAGE 7: Collect dependencies built by previous stages and build
# guacamole-server.
#
FROM builder AS guacamole-server
ARG BUILD_DIR
ARG FREERDP_VERSION
ARG GUACAMOLE_SERVER_ARM_OPTS
ARG GUACAMOLE_SERVER_UNKNOWN_OPTS
ARG GUACAMOLE_SERVER_OPTS
ARG GUACAMOLE_SERVER_X86_OPTS
ARG PREFIX_DIR
ARG WITH_GUACAMOLE_SERVER
# Copy dependencies built in previous stages
COPY --from=freerdp ${PREFIX_DIR} ${PREFIX_DIR}
COPY --from=libssh2 ${PREFIX_DIR} ${PREFIX_DIR}
COPY --from=libtelnet ${PREFIX_DIR} ${PREFIX_DIR}
COPY --from=libvncclient ${PREFIX_DIR} ${PREFIX_DIR}
COPY --from=libwebsockets ${PREFIX_DIR} ${PREFIX_DIR}
# Use guacamole-server source from build context
COPY --from=builder ${BUILD_DIR} ${BUILD_DIR}
RUN ${BUILD_DIR}/src/guacd-docker/bin/autobuild.sh "GUACAMOLE_SERVER" "${BUILD_DIR}"
# Determine location of the FREERDP library based on the version.
ARG FREERDP_LIB_PATH=${PREFIX_DIR}/lib/freerdp${FREERDP_VERSION}
# Record the packages of all runtime library dependencies
RUN ${BUILD_DIR}/src/guacd-docker/bin/list-dependencies.sh \
${PREFIX_DIR}/sbin/guacd \
${PREFIX_DIR}/lib/libguac-client-*.so \
${FREERDP_LIB_PATH}/*guac*.so \
> ${PREFIX_DIR}/DEPENDENCIES
#
# STAGE 8: Final, runtime image.
#
# Use same Alpine version as the base for the runtime image
FROM alpine:${ALPINE_BASE_IMAGE} AS runtime
ARG PREFIX_DIR
ARG BUILD_DIR
# Copy build artifacts into this stage
COPY --from=guacamole-server ${PREFIX_DIR} ${PREFIX_DIR}
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN cat ${PREFIX_DIR}/DEPENDENCIES
# Bring runtime environment up to date and install runtime dependencies
RUN apk add --no-cache \
ca-certificates \
font-noto-cjk \
ghostscript \
netcat-openbsd \
shadow \
terminus-font \
ttf-dejavu \
ttf-liberation \
util-linux-login && \
xargs apk add --no-cache < ${PREFIX_DIR}/DEPENDENCIES
# Runtime environment
ENV LC_ALL=C.UTF-8
ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
# Checks the operating status every 5 minutes with a timeout of 5 seconds
HEALTHCHECK --interval=5m --timeout=5s CMD nc -z 127.0.0.1 4822 || exit 1
# Create a new user guacd
ARG UID=1000
ARG GID=1000
RUN groupadd --gid $GID guacd
RUN useradd --system --create-home --shell /sbin/nologin --uid $UID --gid $GID guacd
# Run with user guacd
USER guacd
# Expose the default listener port
EXPOSE 4822
COPY --from=guacamole-server ${BUILD_DIR}/src/guacd-docker/bin/entrypoint.sh /opt/guacamole/
#COPY
ENTRYPOINT [ "/opt/guacamole/entrypoint.sh" ]

View File

@@ -1,8 +1,9 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
ENV TZ="UTC"
ENV TZ Asia/Shanghai
RUN apk add librados librbd
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

View File

@@ -1,9 +1,9 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.5.11
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:0.6
LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
ENV TZ="UTC"
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/host-deployer /opt/yunion/bin/host-deployer
ADD ./_output/centos-build/bin/host-deployer /opt/yunion/bin/host-deployer

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/host-health /opt/yunion/bin/host-health

View File

@@ -1,6 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/host-image /opt/yunion/bin/host-image

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone
ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone

View File

@@ -1,9 +1,4 @@
FROM alpine:3.22.2
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TARGETARCH
FROM alpine:3.11
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
RUN apk update && apk add curl android-tools && rm -rf /var/cache/apk/*
RUN curl -L https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
RUN apk update && apk add kubectl && rm -rf /var/cache/apk/*

View File

@@ -1,8 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.5
LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/lbagent /opt/yunion/bin/lbagent

View File

@@ -1,35 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
LABEL maintainer="Jian QIU <qiujian@yunion.cn>"
ENV TZ="UTC"
ENV GOPATH=/root/go
RUN sed -i 's!v3.20/!v3.22/!g' /etc/apk/repositories
RUN set -x \
&& apk update \
&& apk upgrade \
&& apk add --no-cache bash haproxy keepalived iptables \
&& apk add --no-cache --virtual .build-deps \
build-base \
make \
go \
git \
gcc \
libc-dev \
libgcc \
linux-headers
RUN set -x \
&& mkdir -p $GOPATH/src/github.com/yyyar $GOPATH/bin \
&& cd $GOPATH/src/github.com/yyyar \
&& git clone --depth 1 https://github.com/yyyar/gobetween.git \
&& cd gobetween \
&& make deps \
&& make build \
&& cp bin/gobetween /bin/gobetween \
&& rm -fr $GOPATH \
&& apk del .build-deps \
&& rm -rf /var/cache/apk/*

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/llm /opt/yunion/bin/llm

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/mcp-server /opt/yunion/bin/mcp-server

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
COPY ./build/monitor/root/opt/ /opt/
ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor
ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
COPY ./build/notify/root/opt/ /opt/
ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify

View File

@@ -1,14 +1,13 @@
# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
FROM alpine:3.22.1
FROM alpine:3.11
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN apk update && \
apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

View File

@@ -1,13 +0,0 @@
FROM alpine:3.15.4
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN apk update && \
apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
rm -rf /var/cache/apk/*

View File

@@ -1,13 +0,0 @@
FROM alpine:3.22.2
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN apk update && \
apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
rm -rf /var/cache/apk/*

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
COPY ./build/region/root/opt/ /opt/
ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway
ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway

View File

@@ -1,3 +0,0 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ADD ./_output/alpine-build/bin/scheduledtask /opt/yunion/bin/scheduledtask

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler
ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v4.0.0-20251112.0
FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
ADD ./_output/alpine-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin
ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

View File

@@ -1,11 +1,15 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
RUN apk update && \
apk add --no-cache qemu-img && \
apk add --no-cache tzdata ca-certificates qemu-img && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ENV TZ Asia/Shanghai
# add executable file torrent
# make cmd/torrent
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,7 +1,6 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-1
LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
ENV TZ="UTC"
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:3.22.2-1
FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2
ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole
ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole

View File

@@ -1,10 +1,12 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:3.22.2-1
FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
ENV TZ Asia/Shanghai
RUN mkdir -p /opt/yunion/bin
RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates bash && \
RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
rm -rf /var/cache/apk/*
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

View File

@@ -1,3 +1,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf

View File

@@ -1,83 +1,3 @@
REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
DOCKER_BUILD = docker build -t $(REGISTRY)
DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64,linux/riscv64 --push -t $(REGISTRY)
DOCKER_BUILDX_BM = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
debian10-base:
docker buildx build --platform linux/arm64,linux/amd64 --push \
-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
ONECLOUD_BASE_VERSION = v0.3-3.13.5
ONECLOUD_BASE_VERSION_3-15-4 = v3.15.4-0
ONECLOUD_BASE_VERSION_3-22-2 = 3.22.2-0
onecloud-base:
$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
onecloud-base-3-15-4:
$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
onecloud-base-3-22-2:
$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-22-2) -f ./Dockerfile.onecloud-base-3-22-2 .
ANSIBLESERVER_BASE = 3.22.2-0
ansibleserver-base:
$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
CLIMC_BASE_VERSION = 20230731.5
CLIMC_BASE_VERSION_3-22-2 = 3.22.2-2
climc-base:
$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
climc-base-3-22-2:
$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION_3-22-2) -f ./Dockerfile.climc-base-3-22-2 .
KUBECTL_VERSION_3-22-2 = 3.22.2-1
kubectl:
$(DOCKER_BUILDX)/kubectl:$(KUBECTL_VERSION_3-22-2) -f ./Dockerfile.kubectl .
WEBCONSOLE_BASE_VERSION_3-22-2 = 3.22.2-1
webconsole-base:
$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION_3-22-2) -f ./Dockerfile.webconsole-base .
BAREMETAL_BASE_VERSION = v0.3.9-20260724.0
FEDORA_RISCV64_VERSION = 42
fedora-riscv64-base:
wget -q https://dl.fedoraproject.org/pub/alt/risc-v/release/$(FEDORA_RISCV64_VERSION)/Container/riscv64/images/Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar.xz && \
xz -d Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar.xz && \
skopeo copy oci-archive:Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar docker-daemon:fedora-riscv64:$(FEDORA_RISCV64_VERSION) && \
rm -f Fedora-Container-Base-Generic-$(FEDORA_RISCV64_VERSION).20250414-8635a3a5bfcd.riscv64.oci.tar
baremetal-base-riscv: fedora-riscv64-base
$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base-riscv .
#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
# TODO: support riscv64 for baremetal-base
baremetal-base:
$(DOCKER_BUILDX_BM)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
TORRENT_VERSION = 20210815.0
TORRENT_VERSION_3-22-2 = 3.22.2-0
torrent:
$(DOCKER_BUILDX)/torrent:$(TORRENT_VERSION) -f ./Dockerfile.torrent .
GLANCE_BASE_VERSION = v0.0.1
GLANCE_BASE_VERSION_3-22-2 = 3.22.2-0
glance-base:
$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
glance-base-3-22-2:
$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION_3-22-2) -f ./Dockerfile.glance-base .
LBAGENT_BASE_VERSION = v0.0.5
lbagent-base:
$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
GUACD_VERSION=1.6.0
guacd:
$(DOCKER_BUILDX)/guacd:$(GUACD_VERSION) -f ./Dockerfile.guacd .

View File

@@ -1,17 +0,0 @@
#!/bin/bash
set -e
BASHRC=/root/.bashrc
source $BASHRC
climc sshkeypair-inject --admin
mkdir -p /etc/dropbear
mkdir -p /var/run/dropbear
dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
dropbear -RFEjk -G root -p 22

View File

@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.2-go-1.24.9-0 AS build
FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN mkdir -p /root/go/src/yunion.io/x/onecloud
@@ -7,11 +7,12 @@ COPY . /root/go/src/yunion.io/x/onecloud
WORKDIR /root/go/src/yunion.io/x/onecloud
RUN make cmd/host
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
ENV TZ="UTC"
ENV TZ Asia/Shanghai
RUN apk add librados librbd
RUN mkdir -p /opt/yunion/bin
COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host

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