Compare commits

..

766 Commits

Author SHA1 Message Date
屈轩
dd50edcbee fix(region): sync cloud project log (#17199) 2023-05-30 22:58:19 +08:00
wanyaoqi
a86d650129 fix(host): miss return on syncDiskConf (#17201)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-30 22:57:37 +08:00
Zexi Li
becfedcf7a fix(climc): release upgrade method (#17196) 2023-05-30 22:57:19 +08:00
Zexi Li
cf13801f44 Merge pull request #17181 from ioito/automated-cherry-pick-of-#17180-upstream-release-3.10
Automated cherry pick of #17180: fix(region): vpc purge
2023-05-30 17:41:50 +08:00
Zexi Li
6a67d88c23 Merge pull request #17188 from swordqiu/automated-cherry-pick-of-#17187-upstream-release-3.10
Automated cherry pick of #17187: fix: apigateway endpoint empty error
2023-05-30 17:40:55 +08:00
Zexi Li
5d9e4a53a0 Merge pull request #17192 from wanyaoqi/automated-cherry-pick-of-#17191-upstream-release-3.10
Automated cherry pick of #17191: fix(region): isolated device model add properties hot pluggable
2023-05-30 17:40:27 +08:00
Zexi Li
3becea76c7 Merge pull request #17185 from ioito/automated-cherry-pick-of-#17184-upstream-release-3.10
Automated cherry pick of #17184: fix(region): server list filter by ips
2023-05-30 17:39:27 +08:00
wanyaoqi
070db4887e fix(region): isolated device model add properties hot pluggable
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-30 15:23:35 +08:00
Qiu Jian
9a6069a96b fix: apigateway endpoint empty error 2023-05-30 11:19:35 +08:00
ioito
12f94559f1 fix(region): server list filter by ips 2023-05-29 20:31:34 +08:00
ioito
c755f3d40d fix(region): vpc purge 2023-05-29 16:46:06 +08:00
Zexi Li
a2c05f5f90 Merge pull request #17172 from wanyaoqi/automated-cherry-pick-of-#17171-upstream-release-3.10
Automated cherry pick of #17171: fix(host): adapt arm host no l3 cache but has l1/l2
2023-05-29 11:31:48 +08:00
Zexi Li
2755623ca8 Merge pull request #17174 from wanyaoqi/automated-cherry-pick-of-#17173-upstream-release-3.10
Automated cherry pick of #17173: fix(region): request host set auto migrate use hostId
2023-05-29 11:31:08 +08:00
Zexi Li
a6b15244d7 Merge pull request #17176 from wanyaoqi/automated-cherry-pick-of-#17175-upstream-release-3.10
Automated cherry pick of #17175: fix(region): check host update cmtbound on hugepage host
2023-05-29 11:30:34 +08:00
wanyaoqi
91947a5c16 fix(region): check host update cmtbound on hugepage host
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-29 11:13:56 +08:00
wanyaoqi
9303c35719 fix(region): request host set auto migrate use hostId 2023-05-29 10:23:27 +08:00
wanyaoqi
3876ab0f82 fix(host): adapt arm host no l3 cache but has l1/l2
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-26 22:59:43 +08:00
Jian Qiu
0fc89fad85 fix: resource short desc for elasticcache and natgateway (#17170)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-26 18:55:48 +08:00
Jian Qiu
a804818f82 fix: make cron day job happen earlier (#17167)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-26 17:02:17 +08:00
Jian Qiu
cf5833be81 fix: resource short desc (#17165)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-26 17:01:20 +08:00
Zexi Li
63b9933da6 Merge pull request #17161 from wanyaoqi/automated-cherry-pick-of-#17160-upstream-release-3.10
Automated cherry pick of #17160: fix(host): get pci controller type
2023-05-26 15:23:57 +08:00
wanyaoqi
7881393fb5 fix(host): get pci controller type
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-25 20:45:42 +08:00
Zexi Li
b636cf0f71 Merge pull request #17157 from gouqi11/automated-cherry-pick-of-#17156-upstream-release-3.10
Automated cherry pick of #17156: fix(keystone): fix refreshScopeResourceCount timeout
2023-05-25 20:12:19 +08:00
马鸿飞
61396da15e fix(keystone): fix refreshScopeResourceCount timeout 2023-05-25 15:24:43 +08:00
wanyaoqi
18719d3df1 fix(host): arm cdrom hotplug (#17151)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-25 06:47:32 +08:00
Zexi Li
1a0ddef9f0 feat(climc): make cloud-provider-clirc supports output format (#17147) 2023-05-24 19:01:17 +08:00
Zexi Li
e6b87c3d29 feat(climc): support output yaml format (#17145) 2023-05-24 19:00:52 +08:00
wanyaoqi
dd8ca4b919 fix(host): compatible host no l3 cache (#17121)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-24 06:25:55 +08:00
屈轩
d3ca7d2c1c fix(region): support shutdown mode (#17138) 2023-05-24 06:25:01 +08:00
wanyaoqi
97de8772c0 fix(host): hotplug pcie device use pcie root port (#17130) 2023-05-24 06:24:36 +08:00
Zexi Li
6519ad3e7b Merge pull request #17141 from ioito/automated-cherry-pick-of-#17140-upstream-release-3.10
Automated cherry pick of #17140: fix(region): support aws assign public ip with network
2023-05-24 00:05:32 +08:00
ioito
724ef6d16a fix(region): support aws assign public ip with network 2023-05-23 23:33:13 +08:00
Zexi Li
1669e4d542 Merge pull request #17136 from ioito/automated-cherry-pick-of-#17135-upstream-release-3.10
Automated cherry pick of #17135: fix(region): aws tag sync
2023-05-23 21:16:48 +08:00
ioito
6b67c52fdd fix(region): aws tag sync 2023-05-23 19:44:29 +08:00
Zexi Li
b03081dda2 Merge pull request #17126 from ioito/automated-cherry-pick-of-#17125-upstream-release-3.10
Automated cherry pick of #17125: fix(region): index order
2023-05-23 11:24:50 +08:00
ioito
1a2d2bafb0 fix(region): index order 2023-05-23 11:00:03 +08:00
gzericlee
47f04f296f feat(bingocloud): add bingoiam for oauth2 (#17084)
Co-authored-by: 李锐 <lirui@bingosoft.net>
2023-05-20 02:13:09 +08:00
wanyaoqi
e847b90566 fix(host): record live migrate resume task (#17093)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-20 02:12:47 +08:00
Jian Qiu
a7284d3cde fix: lbagent fail to start due to empty prioty and interface (#17117)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-20 02:11:19 +08:00
wanyaoqi
7b05bc3c92 fix(host): pciroot not assigned in switch case (#17102)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-20 02:10:25 +08:00
wanyaoqi
6769987981 fix(host): don't init pcie to pci bridge on pci extend disabled (#17115)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-20 02:10:03 +08:00
Zexi Li
bed1649474 fix(baremetal): skip running sysinit.sh when arch is aarch64 (#17104) 2023-05-19 17:34:36 +08:00
Zexi Li
7cf9a5e810 Merge pull request #17109 from gouqi11/automated-cherry-pick-of-#17108-upstream-release-3.10
Automated cherry pick of #17108: fxi(scheduledtask): skip task when scheduledtask.labels is empty
2023-05-19 17:30:41 +08:00
马鸿飞
4d111925df fxi(scheduledtask): skip task when scheduledtask.labels is empty 2023-05-19 15:51:39 +08:00
Zexi Li
960be32bec Merge pull request #17100 from gouqi11/automated-cherry-pick-of-#17098-upstream-release-3.10
Automated cherry pick of #17098: fix(keystone): user pwd expired notify bug fix
2023-05-19 12:06:34 +08:00
马鸿飞
016593d4c2 fix(keystone): user pwd expired notify bug fix 2023-05-19 12:03:19 +08:00
Zexi Li
9a51ce72c0 Merge pull request #17097 from ioito/automated-cherry-pick-of-#17096-upstream-release-3.10
Automated cherry pick of #17096: fix(climc): notify v2
2023-05-19 11:28:56 +08:00
ioito
a37149ecc9 fix(climc): notify v2 2023-05-19 11:09:12 +08:00
Zexi Li
d939a0bc5a Merge pull request #17078 from ioito/automated-cherry-pick-of-#17077-upstream-release-3.10
Automated cherry pick of #17077: fix(apigateway): image upload with properties
2023-05-19 10:49:41 +08:00
Zexi Li
e40e00b0b2 Merge pull request #17091 from ioito/automated-cherry-pick-of-#17090-upstream-release-3.10
Automated cherry pick of #17090: fix(region): openstack disk reset
2023-05-19 10:49:15 +08:00
Zexi Li
9e8da7b9cf Merge pull request #17064 from wanyaoqi/automated-cherry-pick-of-#17037-upstream-release-3.10
Automated cherry pick of #17037: feat(region,host): custom pci device type
2023-05-19 10:42:13 +08:00
ioito
533c761a2f fix(region): openstack disk reset 2023-05-18 19:35:25 +08:00
Jian Qiu
57bd0b059c fix: allow bootstrap role policy assignment without violation check (#17088)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-18 19:29:15 +08:00
Zexi Li
ce97fd0a65 Merge pull request #17076 from ioito/automated-cherry-pick-of-#17075-upstream-release-3.10
Automated cherry pick of #17075: fix(region): disable ping debug
2023-05-18 18:07:59 +08:00
Zexi Li
ad4722ecf5 Merge pull request #17081 from ioito/automated-cherry-pick-of-#17080-upstream-release-3.10
Automated cherry pick of #17080: fix(region): validate delete region
2023-05-18 18:07:02 +08:00
Zexi Li
321ec38d5d Merge pull request #17058 from gouqi11/automated-cherry-pick-of-#17057-upstream-release-3.10
Automated cherry pick of #17057: fix(region): snapshot code tidy
2023-05-18 18:06:25 +08:00
Zexi Li
0599ad6e6d Merge pull request #17086 from gouqi11/automated-cherry-pick-of-#17085-upstream-release-3.10
Automated cherry pick of #17085: fix(notify): fix feishu getAccessTokenFailed err
2023-05-18 18:05:18 +08:00
马鸿飞
10e0b1007e fix(notify): fix feishu getAccessTokenFailed err 2023-05-18 17:34:36 +08:00
ioito
873b2d58c4 fix(region): validate delete region 2023-05-18 16:09:37 +08:00
ioito
a190dbd8dd fix(apigateway): image upload with properties 2023-05-18 15:09:38 +08:00
ioito
6524a4864c fix(region): disable ping debug 2023-05-18 11:19:05 +08:00
Zexi Li
de84c4b8ad Merge pull request #17074 from gouqi11/automated-cherry-pick-of-#17060-upstream-release-3.10
Automated cherry pick of #17060: fix(notify): add func to get recevier subscription
2023-05-18 11:00:33 +08:00
马鸿飞
7a35416cd3 fix(notify): add func to get recevier subscription 2023-05-18 10:37:11 +08:00
Zexi Li
06fdb33e67 Merge pull request #17073 from wanyaoqi/automated-cherry-pick-of-#17072-upstream-release-3.10
Automated cherry pick of #17072: fix(host): fix arm topo lib ghw
2023-05-18 10:32:53 +08:00
wanyaoqi
dcdc7696a2 fix(region): list normal guests 2023-05-18 10:19:04 +08:00
wanyaoqi
56de7bd206 fix(host): fix arm topo lib ghw
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-18 10:09:34 +08:00
Zexi Li
0f0a5f34e4 Merge pull request #17067 from swordqiu/automated-cherry-pick-of-#17066-upstream-release-3.10
Automated cherry pick of #17066: fix: disable policy update when enable three member system
2023-05-18 02:17:31 +08:00
Zexi Li
6570552a10 Merge pull request #17070 from wanyaoqi/automated-cherry-pick-of-#17069-upstream-release-3.10
Automated cherry pick of #17069: fix(host): support arm host tcg qemu
2023-05-18 02:17:06 +08:00
Zexi Li
423c3a228e Merge pull request #17053 from wanyaoqi/automated-cherry-pick-of-#17052-upstream-release-3.10
Automated cherry pick of #17052: fix(region): guest restart network task params
2023-05-18 02:16:14 +08:00
wanyaoqi
88a4a835d5 fix(host): support arm host tcg qemu
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-18 00:32:33 +08:00
Qiu Jian
cb131ebf7d fix: disable policy update when enable three member system 2023-05-17 23:36:37 +08:00
wanyaoqi
b961ac5aee feat(region,host): custom pci device type 2023-05-17 17:24:54 +08:00
马鸿飞
4b46b483ab fix(region): snapshot code tidy 2023-05-17 10:52:13 +08:00
Zexi Li
3848411984 Merge pull request #17056 from gouqi11/automated-cherry-pick-of-#17055-upstream-release-3.10
Automated cherry pick of #17055: fix(excelutils): 取消负数标红
2023-05-16 19:38:47 +08:00
马鸿飞
def6a08c13 fix(excelutils): 取消负数标红 2023-05-16 19:36:25 +08:00
wanyaoqi
f827889d4d fix(region): guest restart network task params
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-16 15:03:29 +08:00
Zexi Li
40d691f497 Merge pull request #17046 from gouqi11/automated-cherry-pick-of-#17041-upstream-release-3.10
Automated cherry pick of #17041: fix(notify): add some template translate
2023-05-16 11:35:11 +08:00
Zexi Li
9a9dce85a0 Merge pull request #17048 from swordqiu/automated-cherry-pick-of-#17047-upstream-release-3.10
Automated cherry pick of #17047: fix: prevent policy violate when assigning policy to roles
2023-05-16 11:12:20 +08:00
屈轩
2838fdceb3 fix(region): secgroup rule sync with lock (#17051) 2023-05-16 10:55:06 +08:00
Qiu Jian
6d6cdbddbc fix: prevent policy violate when assigning policy to roles 2023-05-15 21:19:03 +08:00
马鸿飞
4a603c5d12 fix(notify): add some template translate 2023-05-15 21:10:12 +08:00
Zexi Li
388d000310 Merge pull request #17045 from ioito/automated-cherry-pick-of-#17044-upstream-release-3.10
Automated cherry pick of #17044: fix(region): vendor update
2023-05-15 20:11:54 +08:00
ioito
375d63103f fix(region): vendor update 2023-05-15 20:00:41 +08:00
Zexi Li
eda5d3223f feat(apimap): fetch vpcagent net topo info from DB (#17023) 2023-05-15 14:47:27 +08:00
Jian Qiu
f8734e4ab6 fix: options of the maximal number of roles of a user in project (#17034)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2023-05-14 08:35:09 +08:00
屈轩
9d54a1cfa7 fix(region): optimized snapshot list (#17014) 2023-05-13 07:53:09 +08:00
wanyaoqi
78fd4cb0d4 fix(host): guest sync update cdrom bootindex (#17026)
generate qemu cmdline check cdrom path before generate bootindex params

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-13 07:52:12 +08:00
wanyaoqi
8c27227d9a fix(host): check disk pci device is nil on init disks addrs (#17031)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-13 07:51:52 +08:00
屈轩
8408ac8383 fix(region): optimized sku sync (#17029) 2023-05-13 07:51:03 +08:00
Zexi Li
24e04ba84c Merge pull request #17017 from wanyaoqi/automated-cherry-pick-of-#17016-upstream-release-3.10
Automated cherry pick of #17016: fix(host): guest name has space
2023-05-12 10:32:33 +08:00
wanyaoqi
fa7934cc96 fix(host): guest name has space 2023-05-11 17:48:26 +08:00
Zexi Li
6fc152b653 Merge pull request #17013 from gouqi11/automated-cherry-pick-of-#17011-upstream-release-3.10
Automated cherry pick of #17011: fix(notify): fix notify webconsole
2023-05-11 16:18:05 +08:00
Zexi Li
df3b70b263 Merge pull request #17012 from gouqi11/automated-cherry-pick-of-#17008-upstream-release-3.10
Automated cherry pick of #17008: fix(region): add cleanSnapshotDate option
2023-05-11 16:17:21 +08:00
马鸿飞
9fceb5e521 fix(region): add cleanSnapshotDate option 2023-05-11 15:52:45 +08:00
马鸿飞
f5b8b5a476 fix(notify): fix notify webconsole 2023-05-11 14:15:53 +08:00
屈轩
cf2404a9e0 fix(region): show host info when cache image (#16999) 2023-05-11 11:03:25 +08:00
wanyaoqi
a5739a6597 fix(host): check running guest kvm off option (#16989) 2023-05-11 11:02:40 +08:00
Jian Qiu
d446886437 fix: policy tag filters not effect for shared resources (#17005)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-11 11:00:36 +08:00
gouqi11
cdd616a67c fix(region): add cronjob to cleaning snapshot (#17006)
Co-authored-by: 马鸿飞 <mahongfei@yunion.cn>
2023-05-11 10:59:46 +08:00
Zexi Li
d598c6d710 Merge pull request #16992 from wanyaoqi/automated-cherry-pick-of-#16991-upstream-release-3.10
Automated cherry pick of #16991: fix(region): set sku maxmem size 1024G
2023-05-10 18:05:10 +08:00
Zexi Li
d1be28b740 Merge pull request #16994 from zexi/monitor-query-timeout
fix(monitor): adjust query timeout to 5 mins
2023-05-10 18:01:37 +08:00
Zexi Li
82f312ebb6 fix(monitor): adjust query timeout to 5 mins 2023-05-10 13:00:25 +08:00
wanyaoqi
da181bc3ca fix(region): set sku maxmem size 1024G
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-10 10:53:57 +08:00
Zexi Li
49f1c4f418 Merge pull request #16975 from ioito/automated-cherry-pick-of-#16973-upstream-release-3.10
Automated cherry pick of #16973: fix(region): optimized vpc-list
2023-05-10 09:58:37 +08:00
wanyaoqi
fa7fc2fbe5 fix(host): hide kvm only gpu guests (#16977)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-09 14:45:44 +08:00
Zexi Li
b4ed622c48 Merge pull request #16980 from ioito/automated-cherry-pick-of-#16979-upstream-release-3.10
Automated cherry pick of #16979: fix(region): elastic cache purge
2023-05-09 09:20:09 +08:00
Zexi Li
df6d93d285 Merge pull request #16984 from swordqiu/automated-cherry-pick-of-#16983-upstream-release-3.10
Automated cherry pick of #16983: fix: usage handler nil check revisit
2023-05-09 09:19:26 +08:00
Qiu Jian
f0379dc515 fix: usage handler nil check revisit 2023-05-08 20:50:17 +08:00
ioito
0380aef8ec fix(region): elastic cache purge 2023-05-08 16:05:24 +08:00
ioito
c5c59032bf fix(region): optimized vpc-list 2023-05-08 15:11:37 +08:00
Zexi Li
db5bcf94fa Merge pull request #16970 from swordqiu/automated-cherry-pick-of-#16969-upstream-release-3.10
Automated cherry pick of #16969: fix: three member policy adjustment 20230507
2023-05-08 10:29:15 +08:00
Zexi Li
fd5fc30c63 Merge pull request #16963 from ioito/automated-cherry-pick-of-#16962-upstream-release-3.10
Automated cherry pick of #16962: fix(glance): support filter image by os archs
2023-05-08 10:28:18 +08:00
Zexi Li
92652eab1d Merge pull request #16958 from wanyaoqi/automated-cherry-pick-of-#16957-upstream-release-3.10
Automated cherry pick of #16957: fix(host): don't return error on disk snap chain params miss
2023-05-08 10:26:29 +08:00
Zexi Li
1eafde7f91 Merge pull request #16967 from swordqiu/automated-cherry-pick-of-#16966-upstream-release-3.10
Automated cherry pick of #16966: fix: domain tag filter not working
2023-05-08 10:25:17 +08:00
Qiu Jian
ad1cc70909 fix: three member policy adjustment 20230507 2023-05-08 03:16:59 +08:00
Qiu Jian
edbcb92088 fix: domain tag filter not working 2023-05-08 02:25:19 +08:00
ioito
5ea9c26677 fix(glance): support filter image by os archs 2023-05-06 15:23:16 +08:00
wanyaoqi
a99bcd13f1 fix(host): don't return error on disk snap chain miss 2023-05-06 14:17:22 +08:00
Zexi Li
a673906288 Merge pull request #16954 from ioito/automated-cherry-pick-of-#16953-upstream-release-3.10
Automated cherry pick of #16953: fix(region): skip empty resource metric pull
2023-05-06 12:15:19 +08:00
ioito
db976a6512 fix(region): skip empty resource metric pull 2023-05-06 10:57:11 +08:00
Zexi Li
3e78208328 Merge pull request #16951 from wanyaoqi/automated-cherry-pick-of-#16950-upstream-release-3.10
Automated cherry pick of #16950: fix(region,host): migrate with out chain snapshots
2023-05-06 10:16:01 +08:00
wanyaoqi
bd4f9dd2cf fix(region,host): migrate with out chain snapshots
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-05-06 01:39:58 +08:00
Zexi Li
aed854edf6 Merge pull request #16949 from ioito/automated-cherry-pick-of-#16948-upstream-release-3.10
Automated cherry pick of #16948: fix(region): host status
2023-05-05 21:24:50 +08:00
ioito
9a290f12c1 fix(region): host status 2023-05-05 20:20:17 +08:00
Zexi Li
794e0b151c Merge pull request #16945 from ioito/automated-cherry-pick-of-#16944-upstream-release-3.10
Automated cherry pick of #16944: fix(region): allow query capabilities
2023-05-05 17:12:25 +08:00
Zexi Li
87f36191e1 Merge pull request #16941 from ioito/automated-cherry-pick-of-#16940-upstream-release-3.10
Automated cherry pick of #16940: fix(region): cloudpods secgroup rule
2023-05-05 17:11:57 +08:00
Zexi Li
853d7caf9d Merge pull request #16931 from ioito/automated-cherry-pick-of-#16930-upstream-release-3.10
Automated cherry pick of #16930: fix(region): optimized guest and cachedimage list speed
2023-05-05 17:10:55 +08:00
Zexi Li
920fc94f91 Merge pull request #16946 from ioito/hotfix/qx-aws-redis-tag
fix(region): vendor update for aws redis tag
2023-05-05 17:02:39 +08:00
ioito
e363f729ac fix(region): vendor update for aws redis tag 2023-05-05 17:00:33 +08:00
ioito
7adefec371 fix(region): allow query capabilities 2023-05-05 16:20:17 +08:00
Zexi Li
426071aa54 Merge pull request #16943 from zexi/automated-cherry-pick-of-#16936-upstream-release-3.10
Automated cherry pick of #16936: feat(climc): create k8s cluster v1.22.9
2023-05-05 16:13:33 +08:00
Zexi Li
c780616e43 feat(climc): create k8s cluster v1.22.9 2023-05-05 16:13:00 +08:00
wanyaoqi
b53926b8a6 fix(region): get cdrom details (#16928) 2023-05-05 15:07:43 +08:00
Zexi Li
f9c71874b6 fix(monitor): truncated JSONObject of alert model (#16934) 2023-05-05 14:43:14 +08:00
屈轩
c1285be160 fix(region): aws redis tags (#16938) 2023-05-05 14:42:22 +08:00
ioito
420ad0bcc1 fix(region): cloudpods secgroup rule 2023-05-05 11:44:58 +08:00
ioito
bad28dc7fd fix(region): optimized guest and cachedimage list speed 2023-05-04 14:22:23 +08:00
Jian Qiu
84b6b97ba8 fix: vm desc missing cdrom config (#16926)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-05-01 23:02:12 +08:00
Zexi Li
5e4abf5708 Merge pull request #16924 from swordqiu/automated-cherry-pick-of-#16923-upstream-release-3.10
Automated cherry pick of #16923: fix: do not init keystone project admin user
2023-04-28 15:32:07 +08:00
Qiu Jian
693244ad93 fix: do not init keystone admin user 2023-04-28 15:17:08 +08:00
Zexi Li
d94bfa6bbb Merge pull request #16922 from gouqi11/automated-cherry-pick-of-#16899-upstream-release-3.10
Automated cherry pick of #16899: fix(notify): refresh workwx token
2023-04-28 14:40:20 +08:00
马鸿飞
574c10ef49 fix(notify): refresh workwx token 2023-04-28 14:38:04 +08:00
Zexi Li
cf9351ec7c Merge pull request #16921 from ioito/automated-cherry-pick-of-#16920-upstream-release-3.10
Automated cherry pick of #16920: fix(region): secgroup sync
2023-04-28 13:56:59 +08:00
ioito
f9178f77c5 fix(region): secgroup sync 2023-04-28 13:28:58 +08:00
Zexi Li
22fa5923dc feat(README): update installation content (#16916) 2023-04-28 12:00:54 +08:00
Zexi Li
b4e00dec25 Merge pull request #16911 from swordqiu/automated-cherry-pick-of-#16907-upstream-release-3.10
Automated cherry pick of #16907: fix: auth getStats should ignore no permission error
2023-04-28 10:28:27 +08:00
屈轩
54bb667932 fix(region): optimized storage-list (#16910) 2023-04-27 23:06:46 +08:00
Qiu Jian
ff8ea8a4cb fix: auth getStats should ignore no permission error 2023-04-27 21:36:58 +08:00
Zexi Li
149040ce97 Merge pull request #16863 from wanyaoqi/automated-cherry-pick-of-#16845-upstream-release-3.10
Automated cherry pick of #16845: feat(region,host): storage backend lvm and nvme
2023-04-27 21:07:39 +08:00
Zexi Li
8b79cbec9d Merge pull request #16892 from ioito/automated-cherry-pick-of-#16891-upstream-release-3.10
Automated cherry pick of #16891: fix(region): vendor update
2023-04-27 21:06:47 +08:00
Zexi Li
a5544675f0 Merge pull request #16904 from zexi/monitor-list-debug
fix(monitor,apihelper): list storages without details
2023-04-27 19:37:09 +08:00
Zexi Li
080fa90d70 fix(monitor,apihelper): list storages without details 2023-04-27 19:21:05 +08:00
Zexi Li
56baabffdc Merge pull request #16898 from gouqi11/automated-cherry-pick-of-#16879-upstream-release-3.10
Automated cherry pick of #16879: fix(notify): add mobile accept ext
2023-04-27 16:16:23 +08:00
马鸿飞
2f17482e4f fix(notify): add mobile accept ext 2023-04-27 15:11:25 +08:00
gouqi11
b74df1913a fix(cloudcommon): add crud note (#16877)
Co-authored-by: 马鸿飞 <mahongfei@yunion.cn>
2023-04-27 14:35:07 +08:00
屈轩
138d248aa0 fix(region): add table index (#16895) 2023-04-27 14:34:02 +08:00
ioito
42e855c5aa fix(region): vendor update 2023-04-27 10:07:13 +08:00
Zexi Li
7da3e98ca3 Merge pull request #16874 from wanyaoqi/automated-cherry-pick-of-#16873-upstream-release-3.10
Automated cherry pick of #16873: fix(host): compatible ouler
2023-04-27 09:37:41 +08:00
Zexi Li
48470f0cc1 Merge pull request #16889 from zexi/automated-cherry-pick-of-#16888-upstream-release-3.10
Automated cherry pick of #16888: fix(scheduler): skip load esxi network free-port cache
2023-04-27 09:36:11 +08:00
Zexi Li
027bde1f51 fix(scheduler): skip load esxi network free-port cache 2023-04-27 09:26:36 +08:00
Jian Qiu
874b0f5134 fix: project set admin user (#16876)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-04-26 08:20:59 +08:00
wanyaoqi
f52d361b2a fix(host): compatible with python3
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-25 22:47:26 +08:00
wanyaoqi
a16f1177ba fix(host): check subgroup enabled on cgroup init
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-25 22:47:26 +08:00
Zexi Li
c0920a4993 Merge pull request #16860 from zexi/monitor-stats-panic
fix(monitor): panic of StatisticHandler
2023-04-25 10:03:07 +08:00
Zexi Li
9be1984aee Merge pull request #16858 from zexi/automated-cherry-pick-of-#16857-upstream-release-3.10
Automated cherry pick of #16857: fix(region): handle probe-isolated-device error
2023-04-25 10:02:43 +08:00
wanyaoqi
c9b35bd9fd feat(region,host): lvm storage backend
support use lvm volume group as storage backend.

host config example:
lvm_volume_groups:
- storage1
2023-04-25 00:34:40 +08:00
wanyaoqi
392ec553ec feat(region,host): nvme device passthrough 2023-04-25 00:34:40 +08:00
Zexi Li
c5ae2647d5 fix(monitor): panic of StatisticHandler 2023-04-24 19:58:34 +08:00
Zexi Li
a18313cd2e fix(region): handle probe-isolated-device error 2023-04-24 19:52:30 +08:00
Zexi Li
3c7da64f41 Merge pull request #16853 from gouqi11/automated-cherry-pick-of-#16852-upstream-release-3.10
Automated cherry pick of #16852: fix(notify): fix email verify empty error
2023-04-24 17:15:05 +08:00
马鸿飞
75c546d788 fix(notify): fix email verify empty error 2023-04-24 16:53:45 +08:00
Zexi Li
54e598a548 Merge pull request #16849 from wanyaoqi/automated-cherry-pick-of-#16848-upstream-release-3.10
Automated cherry pick of #16848: fix(region):  check disk purge  get host error is sql.ErrNoRows
2023-04-24 15:21:10 +08:00
wanyaoqi
c5d61a8c35 fix(region): check disk purge get host error is sql.ErrNoRows
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-24 10:51:17 +08:00
Zexi Li
5830716205 Merge pull request #16843 from ioito/automated-cherry-pick-of-#16842-upstream-release-3.10
Automated cherry pick of #16842: fix(cloudmon): h3c rds monitor
2023-04-21 18:29:18 +08:00
ioito
7790332fe0 fix(cloudmon): h3c rds monitor 2023-04-21 17:38:51 +08:00
Zexi Li
1653936d88 Merge pull request #16836 from wanyaoqi/automated-cherry-pick-of-#16835-upstream-release-3.10
Automated cherry pick of #16835: fix(host): arm node failed get numa architecture use ghw lib
2023-04-21 10:04:16 +08:00
wanyaoqi
f5f3dfd315 fix(host): arm node failed get numa architecture use ghw lib
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-20 23:37:05 +08:00
Zexi Li
f33fc03c33 Merge pull request #16834 from gouqi11/automated-cherry-pick-of-#16833-upstream-release-3.10
Automated cherry pick of #16833: fix(notify): add subcontact fail details
2023-04-20 20:47:11 +08:00
马鸿飞
99c78ee38b fix(notify): add subcontact fail details 2023-04-20 20:32:11 +08:00
Zexi Li
31680b205b Merge pull request #16826 from ioito/automated-cherry-pick-of-#16825-upstream-release-3.10
Automated cherry pick of #16825: fix(region): log with account disconnect reason
2023-04-20 13:24:25 +08:00
Zexi Li
a46fcf7de5 Merge pull request #16821 from wanyaoqi/automated-cherry-pick-of-#16820-upstream-release-3.10
Automated cherry pick of #16820: fix(host): fix machine type before generate cpu desc
2023-04-20 13:23:28 +08:00
Zexi Li
1e650da2ce Merge pull request #16829 from ioito/automated-cherry-pick-of-#16828-upstream-release-3.10
Automated cherry pick of #16828: fix(region): vendor update for aws region
2023-04-20 13:22:53 +08:00
ioito
78978ee207 fix(region): vendor update for aws region 2023-04-20 11:29:28 +08:00
ioito
1cfe1537ba fix(region): log with account disconnect reason 2023-04-20 10:37:56 +08:00
wanyaoqi
4cb10b405f fix(host): fix machine type before generate cpu desc
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-20 09:28:23 +08:00
Zexi Li
bf5e09c649 Merge pull request #16819 from ioito/automated-cherry-pick-of-#16818-upstream-release-3.10
Automated cherry pick of #16818: fix(region): proxmox host ip
2023-04-19 11:37:10 +08:00
ioito
d0fa493fdc fix(region): proxmox host ip 2023-04-19 11:28:17 +08:00
Zexi Li
7ae029e16b Merge pull request #16814 from zexi/monitor-disable-query-sig
fix(monitor): disable query signature defaultly
2023-04-19 10:08:54 +08:00
Zexi Li
cd410ba27e fix(monitor): disable query signature defaultly 2023-04-19 10:05:17 +08:00
Zexi Li
c9428031d0 Merge pull request #16807 from ioito/automated-cherry-pick-of-#16791-upstream-release-3.10
Automated cherry pick of #16791: fix(cloudmon): support skip pull azure memory and disk usage metric
2023-04-18 15:28:05 +08:00
Zexi Li
b1c1763386 Merge pull request #16811 from gouqi11/automated-cherry-pick-of-#16809-upstream-release-3.10
Automated cherry pick of #16809: fix(notify): fix receiver create bug
2023-04-18 15:27:30 +08:00
马鸿飞
450571268c fix(notify): fix receiver create bug 2023-04-18 15:25:22 +08:00
ioito
da4b222537 fix(cloudmon): support skip pull azure memory and disk usage metric 2023-04-18 13:47:49 +08:00
Zexi Li
f9b87906ee Merge pull request #16742 from zexi/update-vendor-0417
fix(vendor): update vendor for v3.10
2023-04-17 23:37:26 +08:00
Zexi Li
3c877e90a5 fix(vendor): update vendor for v3.10 2023-04-17 23:33:52 +08:00
Zexi Li
14e25e4be0 Merge pull request #16480 from ioito/automated-cherry-pick-of-#16463-upstream-release-3.10
Automated cherry pick of #16463: fix: avoid panic when sync vmware host
2023-04-17 23:18:14 +08:00
ioito
15d9468102 fix: avoid panic when sync vmware host 2023-04-17 10:06:53 +08:00
Zexi Li
442634c971 Merge pull request #16472 from wanyaoqi/automated-cherry-pick-of-#16471-upstream-release-3.10
Automated cherry pick of #16471: fix(host): update cpudesc on cpu hotpluged
2023-04-14 19:34:17 +08:00
wanyaoqi
392ad723c9 fix(host): update cpudesc on cpu hotpluged
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-14 17:43:27 +08:00
Jian Qiu
025848d1fa Automated cherry pick of #16467: fix: update vendor 20230413 (#16468)
* fix: update vendor 20230413

* fix: update vendor

---------

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-04-14 02:41:26 +08:00
Zexi Li
421f030eb3 Merge pull request #16462 from gouqi11/automated-cherry-pick-of-#16461-upstream-release-3.10
Automated cherry pick of #16461: fix(region): fixModelarts
2023-04-13 17:41:54 +08:00
mhf
36925b058b fix(region): fixModelarts 2023-04-13 16:40:33 +08:00
Zexi Li
c4d7faa11c Merge pull request #16459 from zexi/automated-cherry-pick-of-#16458-upstream-release-3.10
Automated cherry pick of #16458: fix(monitor): wrong tag filter when get metric measurement
2023-04-13 11:56:47 +08:00
Zexi Li
e1cb09c25f fix(monitor): wrong tag filter when get metric measurement 2023-04-13 11:39:41 +08:00
Zexi Li
2c51c7709e Merge pull request #16436 from zexi/automated-cherry-pick-of-#16434-upstream-release-3.10
Automated cherry pick of #16434: feat(region): set kvm storage instance capability
2023-04-13 10:09:07 +08:00
Zexi Li
ba2d24709f Merge pull request #16448 from wanyaoqi/automated-cherry-pick-of-#16447-upstream-release-3.10
Automated cherry pick of #16447: fix(host): set default live migrate bandwidth unlimited
2023-04-13 10:08:03 +08:00
Zexi Li
e371724257 Merge pull request #16449 from ioito/automated-cherry-pick-of-#16440-upstream-release-3.10
Automated cherry pick of #16440: fix(glance): support esxi glance debug on macos
2023-04-13 10:07:41 +08:00
Zexi Li
3a0149a2e5 Merge pull request #16445 from ioito/automated-cherry-pick-of-#16444-upstream-release-3.10
Automated cherry pick of #16444: fix(region): support import private k8s
2023-04-12 20:47:37 +08:00
Zexi Li
e6903eaec6 Merge pull request #16442 from ioito/automated-cherry-pick-of-#16441-upstream-release-3.10
Automated cherry pick of #16441: fix(region): sync purge vpc
2023-04-12 20:46:19 +08:00
Zexi Li
92de0f5a26 Merge pull request #16452 from gouqi11/automated-cherry-pick-of-#16451-upstream-release-3.10
Automated cherry pick of #16451: fix(excelutils): 添加千位分隔常量
2023-04-12 19:13:17 +08:00
mhf
d14ec18df3 fix(excelutils): 添加千位分隔常量 2023-04-12 19:06:11 +08:00
ioito
bd9b5a0f25 fix(glance): support esxi glance debug on macos 2023-04-12 17:52:00 +08:00
wanyaoqi
b94b3a9397 fix(host): set default live migrate bandwidth unlimited
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-04-12 17:23:10 +08:00
ioito
757fc19cad fix(region): support import private k8s 2023-04-12 16:36:34 +08:00
ioito
17fab36c48 fix(region): sync purge vpc 2023-04-12 15:27:14 +08:00
Jian Qiu
d8a30ac2d9 fix: clickhouse parttion expression of divide inconstent 3.9 (#16438)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-04-12 12:04:10 +08:00
Zexi Li
33d3620526 feat(region): set kvm storage instance capability 2023-04-12 10:18:10 +08:00
Zexi Li
a86265c642 Merge pull request #16430 from ioito/automated-cherry-pick-of-#16429-upstream-release-3.10
Automated cherry pick of #16429: fix: only request error show time
2023-04-11 22:17:24 +08:00
ioito
a70a144a5b fix: only request error show time 2023-04-11 22:03:17 +08:00
Zexi Li
9625de44ba Merge pull request #16425 from ioito/automated-cherry-pick-of-#16424-upstream-release-3.10
Automated cherry pick of #16424: fix(common): show request time with rfc3339
2023-04-11 21:15:10 +08:00
Zexi Li
08cfdfaea5 Merge pull request #16402 from gouqi11/automated-cherry-pick-of-#16401-upstream-release-3.10
Automated cherry pick of #16401: feature(region): add resource order
2023-04-11 21:05:20 +08:00
Zexi Li
6dba362a79 Merge pull request #16428 from gouqi11/automated-cherry-pick-of-#16423-upstream-release-3.10
Automated cherry pick of #16423: fix(excelutils): 添加按列修改单元格格式方法
2023-04-11 21:04:03 +08:00
mhf
fdd0cd900f fix(excelutils): 添加按列修改单元格格式方法 2023-04-11 21:01:54 +08:00
ioito
2990e604a1 fix(common): show request time with rfc3339 2023-04-11 20:55:39 +08:00
Zexi Li
45a5af600a Merge pull request #16422 from ioito/automated-cherry-pick-of-#16421-upstream-release-3.10
Automated cherry pick of #16421: fix: vendor update
2023-04-11 19:57:27 +08:00
ioito
c2b68bb26b fix: vendor update 2023-04-11 19:47:25 +08:00
Zexi Li
75b0ff52a5 Merge pull request #16418 from ioito/automated-cherry-pick-of-#16417-upstream-release-3.10
Automated cherry pick of #16417: fix(common): log time zone and format
2023-04-11 18:28:15 +08:00
ioito
7c2ea8fa4b fix(common): log time zone and format 2023-04-11 17:24:34 +08:00
Zexi Li
e1b29f7de9 Merge pull request #16415 from ioito/automated-cherry-pick-of-#16414-upstream-release-3.10
Automated cherry pick of #16414: fix(common): log time with time zone
2023-04-11 15:02:06 +08:00
Zexi Li
50a1004d19 Merge pull request #16409 from ioito/automated-cherry-pick-of-#16408-upstream-release-3.10
Automated cherry pick of #16408: fix(common): show exception with remote addr and duration
2023-04-11 14:59:56 +08:00
Zexi Li
bc3941e737 Merge pull request #16412 from ioito/automated-cherry-pick-of-#16411-upstream-release-3.10
Automated cherry pick of #16411: fix(keystone): avoid panic when sync scope reosurce
2023-04-11 14:57:52 +08:00
Zexi Li
69a0f05063 Merge pull request #16404 from ioito/automated-cherry-pick-of-#16403-upstream-release-3.10
Automated cherry pick of #16403: fix(region): optimized cloudprovider list
2023-04-11 14:55:25 +08:00
ioito
2840d5d5c3 fix(common): log time with time zone 2023-04-11 14:36:18 +08:00
ioito
a6ca50a105 fix(common): show exception with remote addr and duration 2023-04-11 13:44:47 +08:00
ioito
ee5f6d3c53 fix(keystone): avoid panic when sync scope reosurce 2023-04-11 10:50:26 +08:00
Jian Qiu
3ac9e04874 fix: lbagent ovn options shoule not in common (#16407)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-04-11 09:34:33 +08:00
ioito
c81c0017b8 fix(region): optimized cloudprovider list 2023-04-10 19:13:11 +08:00
mhf
6ef4f9db91 feature(region): add resource order 2023-04-10 18:04:58 +08:00
Zexi Li
4662794e9c Merge pull request #16396 from ioito/automated-cherry-pick-of-#16395-upstream-release-3.10
Automated cherry pick of #16395: fix(region): remove useless server sku
2023-04-10 17:17:33 +08:00
Zexi Li
3aa2076f9c Merge pull request #16398 from zexi/devtool-panic
fix(devtool): panic occurred cause of nil ctx
2023-04-10 17:16:48 +08:00
Zexi Li
67ff54f6b5 fix(devtool): panic occurred cause of nil ctx 2023-04-10 17:10:38 +08:00
Zexi Li
26c942c792 Merge pull request #16390 from wanyaoqi/automated-cherry-pick-of-#16389-upstream-release-3.10
Automated cherry pick of #16389: fix(host): recover page size on hugepage disabled
2023-04-10 10:53:16 +08:00
ioito
c3ed398eec fix(region): remove useless server sku 2023-04-10 10:51:51 +08:00
wanyaoqi
c3611f0dc3 fix(host): recover page size on hugepage disabled 2023-04-08 13:02:32 +08:00
Zexi Li
8e4dd0867c Merge pull request #16388 from ioito/automated-cherry-pick-of-#16387-upstream-release-3.10
Automated cherry pick of #16387: fix: vendor update
2023-04-07 19:27:20 +08:00
ioito
5ee5647513 fix: vendor update 2023-04-07 18:58:15 +08:00
Zexi Li
fbdbacbaa4 Merge pull request #16385 from ioito/automated-cherry-pick-of-#16384-upstream-release-3.10
Automated cherry pick of #16384: fix(region): vendor update for openstack nic
2023-04-07 18:45:05 +08:00
Zexi Li
817928d712 Merge pull request #16382 from ioito/automated-cherry-pick-of-#16381-upstream-release-3.10
Automated cherry pick of #16381: fix(webconsole): avoid panic when send stats request
2023-04-07 18:20:10 +08:00
Zexi Li
a78c18d8a1 Merge pull request #16378 from zexi/automated-cherry-pick-of-#16377-upstream-release-3.10
Automated cherry pick of #16377: fix(region): not set default data when batch creating disks
2023-04-07 18:19:36 +08:00
ioito
fa7eb5026f fix(region): vendor update for openstack nic 2023-04-07 17:58:41 +08:00
ioito
c987d3f5f0 fix(webconsole): avoid panic when send stats request 2023-04-07 17:14:49 +08:00
Zexi Li
99314f4c6e fix(region): not set default data when batch creating disks 2023-04-07 11:03:28 +08:00
Zexi Li
5f1a10f583 Merge pull request #16375 from ioito/automated-cherry-pick-of-#16374-upstream-release-3.10
Automated cherry pick of #16374: fix(region): openstack keypair
2023-04-07 10:59:05 +08:00
ioito
b43881a51d fix(region): openstack keypair 2023-04-07 10:23:00 +08:00
Zexi Li
49fa6a5470 Merge pull request #16372 from ioito/automated-cherry-pick-of-#16371-upstream-release-3.10
Automated cherry pick of #16371: fix(region): azure china user create
2023-04-07 01:01:18 +08:00
Zexi Li
d923dfb146 Merge pull request #16363 from zexi/automated-cherry-pick-of-#16358-upstream-release-3.10
Automated cherry pick of #16358: fix(baremetal): panic occured when using SSD as raid PD
2023-04-07 01:00:57 +08:00
Zexi Li
152a186c1f Merge pull request #16366 from ioito/automated-cherry-pick-of-#16311-upstream-release-3.10
Automated cherry pick of #16311: fix(region): support fast sync cloud resources
2023-04-07 01:00:15 +08:00
ioito
c0f131bb40 fix(region): azure china user create 2023-04-06 22:02:21 +08:00
屈轩
1dd0be9591 fix(region): vender update (#16368) 2023-04-06 20:39:47 +08:00
ioito
d2d92f845a fix(region): support fast sync cloud resources 2023-04-06 18:51:22 +08:00
Zexi Li
9d01ba9719 fix(baremetal): panic occured when using SSD as raid PD 2023-04-06 18:02:27 +08:00
Zexi Li
136c26d40d Merge pull request #16361 from ioito/automated-cherry-pick-of-#16360-upstream-release-3.10
Automated cherry pick of #16360: fix(cloudmon): bingo metric
2023-04-06 18:02:04 +08:00
ioito
33cebbbd34 fix(cloudmon): bingo metric 2023-04-06 17:49:38 +08:00
Zexi Li
ab408e0ed9 Merge pull request #16354 from ioito/automated-cherry-pick-of-#16353-upstream-release-3.10
Automated cherry pick of #16353: fix(cloudmon): esxi disk usage
2023-04-06 16:24:52 +08:00
ioito
10f9c6ba5a fix(cloudmon): esxi disk usage 2023-04-06 15:31:01 +08:00
Zexi Li
db20ba8f22 Merge pull request #16339 from ioito/automated-cherry-pick-of-#16334-upstream-release-3.10
Automated cherry pick of #16334: Automated cherry pick of #16311: fix(region): support fast sync cloud resources
2023-04-06 15:22:09 +08:00
Zexi Li
b438efc138 Merge pull request #16334 from ioito/automated-cherry-pick-of-#16311-upstream-release-3.10
Automated cherry pick of #16311: fix(region): support fast sync cloud resources
2023-04-06 15:21:55 +08:00
Zexi Li
a1923658bd Merge pull request #16349 from swordqiu/automated-cherry-pick-of-#16348-upstream-release-3.10
Automated cherry pick of #16348: fix: allow set project-id auto-crate-project of cloudaccount
2023-04-06 11:17:52 +08:00
Zexi Li
7223f948fb Merge pull request #16352 from swordqiu/automated-cherry-pick-of-#16351-upstream-release-3.10
Automated cherry pick of #16351: fix: allow async setup brvpc mtu
2023-04-06 11:17:02 +08:00
Qiu Jian
b3d83671fb fix: allow async setup brvpc mtu 2023-04-06 00:10:28 +08:00
Qiu Jian
d180b3165a fix: allow set project-id auto-crate-project of cloudaccount 2023-04-05 16:41:17 +08:00
Zexi Li
436928ca6d Merge pull request #16342 from swordqiu/automated-cherry-pick-of-#16340-upstream-release-3.10
Automated cherry pick of #16340: fix: distinct field with subquery
2023-04-05 11:18:51 +08:00
Zexi Li
f23b7e5a6e Merge pull request #16344 from swordqiu/automated-cherry-pick-of-#16343-upstream-release-3.10
Automated cherry pick of #16343: fix: send email queue to cc
2023-04-05 11:18:09 +08:00
Zexi Li
d4a4ce9f79 Merge pull request #16347 from swordqiu/automated-cherry-pick-of-#16346-upstream-release-3.10
Automated cherry pick of #16346: fix: auth context with service name
2023-04-05 11:17:06 +08:00
Zexi Li
88a4630c52 Merge pull request #16345 from gouqi11/automated-cherry-pick-of-#16341-upstream-release-3.10
Automated cherry pick of #16341:  fix(region): fix modelarts createFailed
2023-04-05 11:16:27 +08:00
Qiu Jian
0123c0a8e8 fix: auth context with service name 2023-04-04 20:46:06 +08:00
mhf
27ffebdc6f fix(region): fix modelarts createFailed 2023-04-04 19:14:30 +08:00
Qiu Jian
6737a72701 fix: send email queue to cc 2023-04-04 18:49:58 +08:00
Qiu Jian
d0027a9808 fix: distinct field with subquery 2023-04-04 17:48:28 +08:00
ioito
4300328e57 fix(region): support fast sync cloud resources 2023-04-04 14:36:55 +08:00
屈轩
295a8cd5ec fix(region): sync esxi disk access path (#16336) 2023-04-04 09:51:27 +08:00
ioito
b5cf895dee fix(region): support fast sync cloud resources 2023-04-03 16:27:55 +08:00
Zexi Li
9dcbeecd94 Merge pull request #16331 from zexi/monitor-server-api
fix(monitor): eip fields are missed in details
2023-04-03 14:45:41 +08:00
Zexi Li
649ead2c32 fix(monitor): eip fields are missed in details 2023-04-03 14:14:20 +08:00
Zexi Li
f8a871f8fb Merge pull request #16328 from swordqiu/automated-cherry-pick-of-#16327-upstream-release-3.10
Automated cherry pick of #16327: fix: host remove netif also remove baremnetal server netif
2023-04-03 13:33:36 +08:00
Qiu Jian
b264eb38d4 fix: host remove netif also remove baremnetal server netif 2023-04-03 11:24:54 +08:00
Jian Qiu
c43b39e6ad fix: minor fixes 20230403 (#16325)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-04-03 09:28:13 +08:00
Zexi Li
2c47afeb7c Merge pull request #16323 from gouqi11/automated-cherry-pick-of-#16322-upstream-release-3.10
Automated cherry pick of #16322: fix(cloudmon): add slb key
2023-04-01 11:01:29 +08:00
mhf
8546ac3466 fix(cloudmon): add slb key 2023-04-01 10:19:08 +08:00
Zexi Li
62706fa3a3 Merge pull request #16307 from wanyaoqi/automated-cherry-pick-of-#16306-upstream-release-3.10
Automated cherry pick of #16306: fix(host): set desc nics queues and vectors on live migrate
2023-03-31 01:42:25 +08:00
Zexi Li
a70c9c3542 Merge pull request #16315 from zexi/k8s-blacklist-opt
fix(keystone): add kubeserver running_mode option to blacklist
2023-03-31 01:41:43 +08:00
Zexi Li
5ebc18478a Merge pull request #16302 from wanyaoqi/automated-cherry-pick-of-#16301-upstream-release-3.10
Automated cherry pick of #16301: fix(region): delete gpu device only on guest pending delete
2023-03-31 01:41:33 +08:00
Zexi Li
86ac9f6869 fix(keystone): add kubeserver running_mode option to blacklist 2023-03-31 01:39:22 +08:00
Zexi Li
1c5a2a5db3 Merge pull request #16313 from gouqi11/automated-cherry-pick-of-#16312-upstream-release-3.10
Automated cherry pick of #16312: fix(base): add modulebase unmarshal err
2023-03-29 23:02:25 +08:00
mhf
ef35c464fa fix(base): add modulebase unmarshal err 2023-03-29 22:56:56 +08:00
Zexi Li
925124866f Merge pull request #16304 from swordqiu/automated-cherry-pick-of-#16303-upstream-release-3.10
Automated cherry pick of #16303: fix: simplify i18n table
2023-03-29 19:20:48 +08:00
Zexi Li
838fd36eea Merge pull request #16310 from gouqi11/automated-cherry-pick-of-#16309-upstream-release-3.10
Automated cherry pick of #16309: fix(cloudmon): add Slb metrics
2023-03-29 19:19:31 +08:00
mhf
1092af760c fix(cloudmon): add Slb metrics 2023-03-29 17:23:40 +08:00
wanyaoqi
a0d0b7249e fix(host): set desc nics queues and vectors on live migrate 2023-03-29 13:39:47 +08:00
Qiu Jian
06901ecb52 fix: simplify i18n table 2023-03-29 00:49:43 +08:00
wanyaoqi
060770b3c0 fix(region): delete gpu device only on guest pending delete
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-28 23:24:39 +08:00
Zexi Li
e6088c4c6a Merge pull request #16300 from ioito/automated-cherry-pick-of-#16299-upstream-release-3.10
Automated cherry pick of #16299: fix(cloudmon): h3c monitor
2023-03-28 17:41:33 +08:00
ioito
14da255469 fix(cloudmon): h3c monitor 2023-03-28 17:31:18 +08:00
Zexi Li
68d72a758b Merge pull request #16296 from zexi/fix-test
fix(cloudmon): import format
2023-03-28 10:00:23 +08:00
Zexi Li
d31b4c576f fix(cloudmon): import format 2023-03-28 09:58:09 +08:00
Zexi Li
ec11d6beaf Merge pull request #16295 from ioito/automated-cherry-pick-of-#16294-upstream-release-3.10
Automated cherry pick of #16294: fix(cloudmon): support h3c metric pull
2023-03-28 09:55:35 +08:00
ioito
77955cfdc1 fix(cloudmon): support h3c metric pull 2023-03-27 22:29:42 +08:00
Zexi Li
7685e8252f Merge pull request #16291 from zexi/automated-cherry-pick-of-#16290-upstream-release-3.10
Automated cherry pick of #16290: fix(monitor): update rds tags
2023-03-27 12:21:20 +08:00
Zexi Li
18f12109d7 fix(monitor): update rds tags 2023-03-27 12:20:07 +08:00
Jian Qiu
73a1d13ec3 fix: minor fixes (#16288)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-27 00:56:04 +08:00
Zexi Li
5f0f938216 Merge pull request #16286 from ioito/automated-cherry-pick-of-#16285-upstream-release-3.10
Automated cherry pick of #16285: fix(region): h3c regional network
2023-03-26 23:38:00 +08:00
ioito
18336e1957 fix(region): h3c regional network 2023-03-26 19:30:28 +08:00
gouqi11
32dbed23c8 fix(region): add guest description (#16283) 2023-03-23 21:35:38 +08:00
Zexi Li
4291479ea0 Merge pull request #16278 from ioito/automated-cherry-pick-of-#16277-upstream-release-3.10
Automated cherry pick of #16277: fix(cloudmon): add apsara eip metric
2023-03-23 15:04:34 +08:00
ioito
b7e78352e4 fix(cloudmon): add apsara eip metric 2023-03-23 14:22:50 +08:00
Zexi Li
b759b7b3ae Merge pull request #16274 from ioito/automated-cherry-pick-of-#16273-upstream-release-3.10
Automated cherry pick of #16273: fix(region): hcs url
2023-03-22 20:41:08 +08:00
Zexi Li
baf747b553 Merge pull request #16276 from gouqi11/automated-cherry-pick-of-#16275-upstream-release-3.10
Automated cherry pick of #16275: fix(notify): fix notify email double send
2023-03-22 20:38:53 +08:00
mhf
c9bae1db4e fix(notify): fix notify email double send 2023-03-22 20:33:23 +08:00
ioito
6362787f5a fix(region): hcs url 2023-03-22 17:51:56 +08:00
Zexi Li
222d267da7 Merge pull request #16270 from zexi/automated-cherry-pick-of-#16269-upstream-release-3.10
Automated cherry pick of #16269: feat(monitor): add extral server tags
2023-03-22 14:01:02 +08:00
Zexi Li
26d7ccecd1 feat(monitor): add extral server tags 2023-03-22 12:27:46 +08:00
Zexi Li
3bc29ba695 Merge pull request #16254 from wanyaoqi/automated-cherry-pick-of-#16253-upstream-release-3.10
Automated cherry pick of #16253: fix(region,host): block jobs progress refactor
2023-03-21 01:59:53 +08:00
gouqi11
00a0797f77 fix(region): addModelartsDeleteLoaclTask (#16262) 2023-03-20 23:52:53 +08:00
Zexi Li
b205b930ce Merge pull request #16250 from swordqiu/automated-cherry-pick-of-#16249-upstream-release-3.10
Automated cherry pick of #16249: fix(region): not sync update netinterface wire_id when merge wires
2023-03-20 10:13:33 +08:00
Zexi Li
7da424a525 Merge pull request #16256 from wanyaoqi/automated-cherry-pick-of-#16255-upstream-release-3.10
Automated cherry pick of #16255: fix(region): get catalog data by region id
2023-03-20 10:12:03 +08:00
Zexi Li
80f2fa16e8 Merge pull request #16259 from wanyaoqi/automated-cherry-pick-of-#16258-upstream-release-3.10
Automated cherry pick of #16258: fix(vpcagent): import ovn package in vpcagent service.go
2023-03-20 10:11:23 +08:00
wanyaoqi
f029eccbf9 fix(vpcagent): import ovn package in vpcagent service.go
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-20 10:00:28 +08:00
wanyaoqi
38bcbd8a53 fix(region): get catalog data by region id
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-19 21:53:46 +08:00
wanyaoqi
3bc7f732de fix(region,host): block jobs progress refactor
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-19 21:23:05 +08:00
Qiu Jian
fd4f83a8b5 fix(region): not sync update netinterface wire_id when merge wires 2023-03-17 22:23:45 +08:00
Jian Qiu
fa82d0643a fix: avoid dup sync table revisit (#16247)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-16 22:22:51 +08:00
wanyaoqi
230a914f5d fix(host): kvm detect and iommu probe (#16244)
- use lsmod check kvm modules on /dev/kvm exist
- don't check grub params "intel_iommu=on" on kvm_intel not loaded

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-16 22:20:36 +08:00
Zexi Li
20e6a62397 Merge pull request #16239 from zexi/automated-cherry-pick-of-#16238-upstream-release-3.10
Automated cherry pick of #16238: fix(monitor): set wrong resType when query
2023-03-16 16:03:50 +08:00
Zexi Li
b62e098d93 fix(monitor): set wrong resType when query 2023-03-15 20:26:56 +08:00
Zexi Li
2e6a3b75fa Merge pull request #16236 from gouqi11/automated-cherry-pick-of-#16235-upstream-release-3.10
Automated cherry pick of #16235: fix(notify): fixEmailQueueBug
2023-03-15 16:38:31 +08:00
mhf
8b6eccf56a fix(notify): fixEmailQueueBug 2023-03-15 16:36:26 +08:00
Zexi Li
2196d27835 Merge pull request #16221 from bingocmp/automated-cherry-pick-of-#16220-upstream-release-3.10
Automated cherry pick of #16220: feat:support for setting custom resource-id
2023-03-15 10:25:42 +08:00
Zexi Li
7c7a7787dd Merge pull request #16226 from swordqiu/automated-cherry-pick-of-#16225-upstream-release-3.10
Automated cherry pick of #16225: fix: fail to create vm with guest_image
2023-03-15 10:12:41 +08:00
Zexi Li
ca203fffe3 Merge pull request #16232 from wanyaoqi/automated-cherry-pick-of-#16231-upstream-release-3.10
Automated cherry pick of #16231: fix(host): download sparse file truncate first
2023-03-15 10:11:58 +08:00
屈轩
e50290b3c5 fix(region): vender update (#16229) 2023-03-14 21:56:23 +08:00
wanyaoqi
59567c3b15 fix(host-health): simplify host health main.go (#16223)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-14 21:53:35 +08:00
wanyaoqi
a803ee1e75 fix(host): download sparse file truncate first
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-14 20:56:21 +08:00
Qiu Jian
b3b9ea2b3f fix: fail to create vm with guest_image 2023-03-14 20:16:25 +08:00
Zexi Li
90673698e9 Merge pull request #16217 from wanyaoqi/automated-cherry-pick-of-#16189-upstream-release-3.10
Automated cherry pick of #16189: fix(region,host): host health misc fix
2023-03-14 12:33:45 +08:00
李锐
3c5a26c7a2 feat:support for setting custom resource-id 2023-03-14 11:21:56 +08:00
Zexi Li
5495489ab0 Merge pull request #16218 from gouqi11/automated-cherry-pick-of-#16216-upstream-release-3.10
Automated cherry pick of #16216: fix(notify): aliyunSmsdriver
2023-03-13 17:51:14 +08:00
mhf
28d9bb77ad fix(notify): aliyunSmsdriver 2023-03-13 17:41:16 +08:00
wanyaoqi
8d18ede79d fix(region,host): host health misc fix
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-13 17:28:32 +08:00
Zexi Li
82391fba04 Merge pull request #16210 from ioito/automated-cherry-pick-of-#16209-upstream-release-3.10
Automated cherry pick of #16209: fix(region): aws dns zone name
2023-03-13 14:55:21 +08:00
Zexi Li
99c08dae39 Merge pull request #16213 from swordqiu/automated-cherry-pick-of-#16212-upstream-release-3.10
Automated cherry pick of #16212: fix: minor fixes 20230313
2023-03-13 14:54:16 +08:00
Qiu Jian
08f76f5320 fix: minor fixes 20230313 2023-03-13 12:48:02 +08:00
ioito
06e07f6a18 fix(region): aws dns zone name 2023-03-13 11:26:31 +08:00
Jian Qiu
d1e6b14778 fix: add vm integrity check notify (#16206)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-13 09:59:44 +08:00
Jian Qiu
8d3e3e970b fix: prevent duplicate table sync (#16203)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-13 09:08:11 +08:00
Zexi Li
84d851be11 Merge pull request #16201 from wanyaoqi/automated-cherry-pick-of-#16200-upstream-release-3.10
Automated cherry pick of #16200: fix(host): set medium type on storage create
2023-03-12 23:21:45 +08:00
Zexi Li
152189283c Merge pull request #16191 from swordqiu/automated-cherry-pick-of-#16190-upstream-release-3.10
Automated cherry pick of #16190: fix: storecli missing lv device name
2023-03-12 23:20:51 +08:00
Zexi Li
72e950284f Merge pull request #16194 from swordqiu/automated-cherry-pick-of-#16193-upstream-release-3.10
Automated cherry pick of #16193: fix: refine dashboard policy
2023-03-12 23:20:00 +08:00
Zexi Li
507b1486a0 Merge pull request #16197 from swordqiu/automated-cherry-pick-of-#16196-upstream-release-3.10
Automated cherry pick of #16196: feature: compose guest image with existing images
2023-03-12 23:19:12 +08:00
wanyaoqi
75ad656f9d fix(host): set medium type on storage create
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-12 22:47:29 +08:00
Qiu Jian
639f197ceb fix: refine dashboard policy 2023-03-12 15:54:58 +08:00
Qiu Jian
45ce33b553 feature: compose guest image with existing images 2023-03-12 15:28:59 +08:00
Qiu Jian
ab17488711 fix: storecli missing lv device name 2023-03-11 08:43:50 +08:00
Zexi Li
cd07ea1541 Merge pull request #16187 from ioito/automated-cherry-pick-of-#16186-upstream-release-3.10
Automated cherry pick of #16186: fix(region): add h3c
2023-03-10 13:40:02 +08:00
ioito
fb39f6e2fc fix(region): add h3c 2023-03-09 15:49:16 +08:00
Zexi Li
bf68f83c6e Merge pull request #16185 from gouqi11/automated-cherry-pick-of-#16183-upstream-release-3.10
Automated cherry pick of #16183: fix(cloudmon): hcso monitor make mod
2023-03-09 14:54:40 +08:00
Zexi Li
4c1b53f087 Merge pull request #16182 from gouqi11/automated-cherry-pick-of-#16169-upstream-release-3.10
Automated cherry pick of #16169: fix(nofiy): mobileAndEmailBug
2023-03-09 14:54:12 +08:00
mhf
d67a496203 fix(cloudmon): hcso monitor make mod 2023-03-09 14:52:02 +08:00
mhf
f35abb4d7b fix(nofiy): mobileAndEmailBug 2023-03-09 12:01:28 +08:00
Jian Qiu
773cac165c feature: allow network update wire_id (#16125)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-09 11:08:22 +08:00
Zexi Li
b18544a4b2 Merge pull request #16159 from ioito/automated-cherry-pick-of-#16158-upstream-release-3.10
Automated cherry pick of #16158: fix(region): apsara projects sync
2023-03-09 00:08:55 +08:00
Zexi Li
883b8687eb Merge pull request #16176 from ioito/automated-cherry-pick-of-#16175-upstream-release-3.10
Automated cherry pick of #16175: fix(notify): attachment name
2023-03-08 13:13:05 +08:00
Zexi Li
b39235140d Merge pull request #16177 from zexi/sched-forecast-reason
fix(scheduler): storage failed reason isn't showed in forecast result
2023-03-08 13:06:09 +08:00
Zexi Li
41125025db fix(scheduler): storage failed reason isn't showed in forecast result 2023-03-08 13:01:25 +08:00
ioito
3af8d74d92 fix(notify): attachment name 2023-03-08 11:58:49 +08:00
Zexi Li
601b56da74 Merge pull request #16130 from swordqiu/automated-cherry-pick-of-#16129-upstream-release-3.10
Automated cherry pick of #16129: fix: logclient request add service name context
2023-03-08 11:16:05 +08:00
Zexi Li
af644e548e Merge pull request #16168 from ioito/automated-cherry-pick-of-#16167-upstream-release-3.10
Automated cherry pick of #16167: fix(region): lb project id
2023-03-08 11:15:39 +08:00
Zexi Li
d80f855a86 Merge pull request #16163 from zexi/automated-cherry-pick-of-#16161-upstream-release-3.10
Automated cherry pick of #16161: fix(baremetal): not update hypervisor host's status
2023-03-08 11:14:56 +08:00
Jian Qiu
91bc94ac34 fix: zero clean disk add logs (#16172)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-08 09:41:22 +08:00
wanyaoqi
314d2d18d7 fix(host): tls live migrate disable mulitfd (#16156)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-08 04:37:01 +08:00
ioito
045f95cf80 fix(region): lb project id 2023-03-07 17:55:28 +08:00
Zexi Li
67ae249c0d fix(baremetal): not update hypervisor host's status 2023-03-07 16:30:59 +08:00
ioito
0503097df4 fix(region): apsara projects sync 2023-03-07 14:47:43 +08:00
Zexi Li
a04d29983f Merge pull request #16153 from zexi/automated-cherry-pick-of-#16152-upstream-release-3.10
Automated cherry pick of #16152: fix(monitor): balancer pair ignored error
2023-03-07 14:05:08 +08:00
Zexi Li
9251140e17 fix(monitor): balancer pair ignored error 2023-03-07 13:48:52 +08:00
Zexi Li
0d2ff98dd8 Merge pull request #16148 from wanyaoqi/automated-cherry-pick-of-#16147-upstream-release-3.10
Automated cherry pick of #16147: chore: update host and lbagent base image
2023-03-07 10:23:39 +08:00
Zexi Li
3d9afec64a Merge pull request #16146 from gouqi11/automated-cherry-pick-of-#16144-upstream-release-3.10
Automated cherry pick of #16144: fix(cloudmon): add HCSO base monitor
2023-03-07 10:22:37 +08:00
Zexi Li
c70dbd8261 Merge pull request #16150 from wanyaoqi/automated-cherry-pick-of-#16149-upstream-release-3.10
Automated cherry pick of #16149: chore: update ovsdb go mod vendor
2023-03-07 10:22:04 +08:00
wanyaoqi
350a6e8681 chore: update ovsdb go mod vendor
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-07 10:11:37 +08:00
wanyaoqi
d6e7851e7a chore: update host and lbagent base image
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-06 21:35:44 +08:00
mhf
f08db366d5 fix(cloudmon): add HCSO base monitor 2023-03-06 20:02:08 +08:00
Zexi Li
fdd708afad Merge pull request #16133 from ioito/automated-cherry-pick-of-#16132-upstream-release-3.10
Automated cherry pick of #16132: fix(keystone): support user filter by role project
2023-03-06 16:41:01 +08:00
Zexi Li
5bd9a0331a Merge pull request #16135 from gouqi11/automated-cherry-pick-of-#16134-upstream-release-3.10
Automated cherry pick of #16134: fix(notify): alert notification
2023-03-06 16:40:31 +08:00
Zexi Li
e990f0cf03 Merge pull request #16138 from zexi/automated-cherry-pick-of-#16136-upstream-release-3.10
Automated cherry pick of #16136: fix(mcclient): add FetchKeypairBySession method
2023-03-06 16:26:37 +08:00
Zexi Li
b49188e065 fix(mcclient): add FetchKeypairBySession method 2023-03-06 16:25:14 +08:00
mhf
45a1303595 fix(notify): alert notification 2023-03-06 10:57:58 +08:00
ioito
533e6d1d18 fix(keystone): support user filter by role project 2023-03-06 10:30:59 +08:00
QIU Jian
c3f94b60ec fix: logclient request add service name context 2023-03-05 02:42:38 +08:00
Jian Qiu
bb5c1b06c2 fix: hostman StartService() (#16127)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-04 01:44:36 +08:00
Zexi Li
71fd37a7ad Merge pull request #16123 from wanyaoqi/automated-cherry-pick-of-#16122-upstream-release-3.10
Automated cherry pick of #16122: fix(region): set disk default cache mode none
2023-03-03 17:16:42 +08:00
Zexi Li
f17aa2c5be Merge pull request #16120 from ioito/automated-cherry-pick-of-#16118-upstream-release-3.10
Automated cherry pick of #16118: fix(cloudmon): support collect history metric
2023-03-03 17:16:03 +08:00
wanyaoqi
f647e10a6b fix(region): set disk default cache mode none
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-03 15:56:48 +08:00
ioito
89737bc808 fix(cloudmon): support collect history metric 2023-03-03 14:54:55 +08:00
Zexi Li
435d6b7d5a Merge pull request #16097 from ioito/automated-cherry-pick-of-#16096-upstream-release-3.10
Automated cherry pick of #16096: fix(region): openstack compute api version
2023-03-03 10:49:06 +08:00
Zexi Li
17998f248f Merge pull request #16094 from wanyaoqi/automated-cherry-pick-of-#16093-upstream-release-3.10
Automated cherry pick of #16093: fix(host): check shared file storage mount point
2023-03-03 10:44:45 +08:00
Zexi Li
b63d9a5077 Merge pull request #16102 from wanyaoqi/automated-cherry-pick-of-#16101-upstream-release-3.10
Automated cherry pick of #16101: fix(host): dest guest load pci addresses on live migrate
2023-03-03 10:43:33 +08:00
Zexi Li
9891fa1df8 Merge pull request #16111 from wanyaoqi/automated-cherry-pick-of-#16103-upstream-release-3.10
Automated cherry pick of #16103: fix(host): load existing guests desc
2023-03-03 10:42:56 +08:00
Zexi Li
bb0ecb1d61 Merge pull request #16109 from ioito/automated-cherry-pick-of-#16108-upstream-release-3.10
Automated cherry pick of #16108: fix(keystone): filter users by role assignment domain
2023-03-03 10:30:23 +08:00
Zexi Li
069b94c004 Merge pull request #16113 from wanyaoqi/automated-cherry-pick-of-#16112-upstream-release-3.10
Automated cherry pick of #16112: fix(host): start daemon guest on guest not running
2023-03-03 10:30:01 +08:00
Zexi Li
aa05145df1 Merge pull request #16115 from gouqi11/automated-cherry-pick-of-#16114-upstream-release-3.10
Automated cherry pick of #16114: fix(notify):fixInitSubscriberData
2023-03-03 10:29:27 +08:00
mhf
918a6c75b6 fix(notify):fixInitSubscriberData 2023-03-02 20:08:06 +08:00
wanyaoqi
557e576865 fix(host): start daemon guest on guest not running
Check guest status on Start daemon server.
StartGuest on guest status running will restart guest.

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-02 17:53:28 +08:00
wanyaoqi
e0eb120670 fix(host): load existing guests desc
init device desc after load pci infos

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-02 16:07:35 +08:00
ioito
5c44a3586e fix(keystone): filter users by role assignment domain 2023-03-02 14:33:50 +08:00
ioito
ef207237d0 fix(region): openstack compute api version 2023-03-02 11:01:43 +08:00
Jian Qiu
412a5cba64 fix: three member policy system violation check (#16105)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-03-02 08:58:23 +08:00
wanyaoqi
4ba0c694ff fix(host): dest guest load pci addresses on live migrate
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-01 23:21:54 +08:00
wanyaoqi
84d0a0f122 fix(host): check shared file storage mount point
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-03-01 17:39:06 +08:00
Zexi Li
2b433e7a0a Merge pull request #16088 from zexi/monitor-query-page
fix(monitor): rewrite slimit and soffset logic
2023-03-01 17:36:07 +08:00
Zexi Li
5bde56fae6 fix(monitor): rewrite slimit and soffset logic 2023-03-01 17:23:00 +08:00
Zexi Li
58935a0789 Merge pull request #16082 from gouqi11/automated-cherry-pick-of-#16081-upstream-release-3.10
Automated cherry pick of #16081: fix(notify): addMissingActionTranslate
2023-03-01 16:32:02 +08:00
Zexi Li
9f13bbb62c Merge pull request #16080 from gouqi11/automated-cherry-pick-of-#16062-upstream-release-3.10
Automated cherry pick of #16062: fix(notify): bugFix
2023-03-01 16:30:58 +08:00
Zexi Li
999aa1c53b Merge pull request #16086 from zexi/automated-cherry-pick-of-#16085-upstream-release-3.10
Automated cherry pick of #16085: fix(monitor): skip check series options
2023-03-01 16:02:44 +08:00
Zexi Li
1bc52997aa fix(monitor): skip check series options 2023-03-01 15:51:33 +08:00
mhf
fdd23693b7 fix(notify): addMissingActionTranslate 2023-03-01 14:58:31 +08:00
Zexi Li
3fbc48b2d5 Merge pull request #16078 from swordqiu/automated-cherry-pick-of-#16077-upstream-release-3.10
Automated cherry pick of #16077: fix: better prompt info for user failed auth due to invalid idp status
2023-03-01 10:12:08 +08:00
mhf
8a51904875 fix(notify): bugFix 2023-03-01 10:10:40 +08:00
Zexi Li
6a1741baab Merge pull request #16076 from swordqiu/automated-cherry-pick-of-#16075-upstream-release-3.10
Automated cherry pick of #16075: fix: allow add esxi as onecloud lb backend
2023-03-01 10:10:32 +08:00
Qiu Jian
7f165e84a8 fix: better prompt info for user failed auth due to invalid idp status 2023-03-01 01:42:24 +08:00
Qiu Jian
635b0f292c fix: allow add esxi as onecloud lb backend 2023-03-01 00:42:45 +08:00
Zexi Li
e1375a0a10 fix(monitor): query resources according by listing region resources (#16073) 2023-03-01 00:03:44 +08:00
Zexi Li
6b58717024 Merge pull request #16067 from ioito/automated-cherry-pick-of-#16066-upstream-release-3.10
Automated cherry pick of #16066: fix(region): vmware template image size
2023-02-28 23:45:04 +08:00
Zexi Li
f91eb3bdc7 Merge pull request #16064 from wanyaoqi/automated-cherry-pick-of-#16063-upstream-release-3.10
Automated cherry pick of #16063: feat(region): vga gpus
2023-02-28 23:44:27 +08:00
Zexi Li
3fe01318d6 Merge pull request #16070 from wanyaoqi/automated-cherry-pick-of-#16069-upstream-release-3.10
Automated cherry pick of #16069: fix(region): guest change storage
2023-02-28 23:43:23 +08:00
wanyaoqi
36d871aaf9 fix(region): guest change storage
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-28 21:44:51 +08:00
ioito
61d5f7301a fix(region): vmware template image size 2023-02-28 19:49:10 +08:00
wanyaoqi
db2b860a55 feat(region): vga gpus
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-28 18:17:02 +08:00
Zexi Li
0a43a363bf Merge pull request #16060 from gouqi11/automated-cherry-pick-of-#16059-upstream-release-3.10
Automated cherry pick of #16059: fix(notify):fix topic of ChecksumTestFailed Result
2023-02-28 15:18:51 +08:00
mhf
f0e14646e7 fix(notify):fix topic of ChecksumTestFailed Result 2023-02-28 15:13:49 +08:00
屈轩
2542b7a328 fix(region): azure rebuild root error (#16050) 2023-02-27 22:30:08 +08:00
Zexi Li
c0b93022ca fix(climc): add list monitorresource cmd (#16047) 2023-02-27 22:00:56 +08:00
Jian Qiu
595ff8ee5b fix: monitor delete resource panic (#16053)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2023-02-27 21:57:24 +08:00
wanyaoqi
7a85e55651 fix(host): resume suspend guest (#16056)
- check guest status inmigrate
- fix guest launch python script

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-27 21:56:15 +08:00
Zexi Li
c3e359d957 Merge pull request #16036 from gouqi11/automated-cherry-pick-of-#15577-upstream-release-3.10
Automated cherry pick of #15577: fix(notify): refactor notify
2023-02-27 14:37:41 +08:00
Zexi Li
d0d14e5b7a Merge pull request #16038 from swordqiu/automated-cherry-pick-of-#16037-upstream-release-3.10
Automated cherry pick of #16037: fix: climc lbagent create params
2023-02-27 13:46:23 +08:00
Zexi Li
41dc84e987 Merge pull request #16040 from swordqiu/automated-cherry-pick-of-#16039-upstream-release-3.10
Automated cherry pick of #16039: fix: apihelper sync ignore instancegroups without guets
2023-02-27 13:45:43 +08:00
Zexi Li
76806a4b2d Merge pull request #16043 from swordqiu/automated-cherry-pick-of-#16042-upstream-release-3.10
Automated cherry pick of #16042: fix: set eipid after successful eip association
2023-02-27 13:44:38 +08:00
Qiu Jian
b0589bac8c fix: set eipid after successful eip association 2023-02-26 09:15:04 +08:00
Qiu Jian
3436fd52b3 fix: apihelper sync ignore instancegroups without guets 2023-02-26 01:08:58 +08:00
QIU Jian
0ad5158c68 fix: climc lbagent create params 2023-02-24 21:25:35 +08:00
mhf
027f449720 fix notify 2023-02-24 18:39:00 +08:00
Zexi Li
38df9418de Merge pull request #16033 from ioito/automated-cherry-pick-of-#16032-upstream-release-3.10
Automated cherry pick of #16032: fix(region): vm bill type sync
2023-02-24 16:44:55 +08:00
Zexi Li
a070c7d83f Merge pull request #16031 from wanyaoqi/automated-cherry-pick-of-#16030-upstream-release-3.10
Automated cherry pick of #16030: fix(host): disable floppy on machine type isn't pc
2023-02-24 16:44:28 +08:00
ioito
8a20e93a78 fix(region): vm bill type sync 2023-02-24 11:53:01 +08:00
wanyaoqi
9410829f99 fix(host): disable floppy on machine type isn't pc
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-23 22:53:24 +08:00
Zexi Li
2635787341 Merge pull request #15993 from ioito/automated-cherry-pick-of-#15839-upstream-release-3.10
Automated cherry pick of #15839: Feature/implement bingocloud
2023-02-23 19:53:43 +08:00
Jian Qiu
e340e00dad fix: ovn options missing eip and brmapped (#16029)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-02-23 17:14:10 +08:00
Zexi Li
5e3813845d Merge pull request #16026 from ioito/automated-cherry-pick-of-#16025-upstream-release-3.10
Automated cherry pick of #16025: fix(region): aliyun lb tag sync
2023-02-23 00:37:18 +08:00
ioito
81af43cbdf fix(region): aliyun lb tag sync 2023-02-22 16:48:14 +08:00
Zexi Li
47c5fcf021 Merge pull request #16022 from swordqiu/automated-cherry-pick-of-#16021-upstream-release-3.10
Automated cherry pick of #16021: fix: add disable_local_vpc option and auto config ovn for lbagent and host
2023-02-22 15:09:05 +08:00
Qiu Jian
f0a6f56c08 fix: add disable_local_vpc option and auto config ovn for lbagent and host 2023-02-22 14:43:39 +08:00
Zexi Li
f389ef10a0 fix(baremetal): update baremetal base image to support ice module (#16017) 2023-02-21 19:03:48 +08:00
Zexi Li
317ca7db32 Merge pull request #16014 from swordqiu/automated-cherry-pick-of-#16012-upstream-release-3.10
Automated cherry pick of #16012: fix: gen policy extra override policy
2023-02-21 11:25:21 +08:00
Qiu Jian
32f7423dcc fix: gen policy extra override policy 2023-02-20 23:15:31 +08:00
Zexi Li
90b46cb2e1 Merge pull request #16010 from wanyaoqi/automated-cherry-pick-of-#16009-upstream-release-3.10
Automated cherry pick of #16009: fix(esxi-agent): disk temp files recycle
2023-02-20 19:35:04 +08:00
Zexi Li
5f9394956b Merge pull request #16007 from ioito/automated-cherry-pick-of-#16006-upstream-release-3.10
Automated cherry pick of #16006: fix(cloudmon): apsara monitor
2023-02-20 19:33:56 +08:00
Zexi Li
a793ab90fb Merge pull request #16004 from wanyaoqi/automated-cherry-pick-of-#16003-upstream-release-3.10
Automated cherry pick of #16003: fix(region): esxi to kvm nic driver fix
2023-02-20 19:31:33 +08:00
wanyaoqi
bc8b7010ce fix(esxi-agent): disk temp files recycle
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-20 18:34:19 +08:00
ioito
fcefdb8cea fix(cloudmon): apsara monitor 2023-02-20 18:16:53 +08:00
wanyaoqi
6ced09166b fix(region): esxi to kvm nic driver fix
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-20 18:00:24 +08:00
Jian Qiu
b730fb4752 fix: sms login not verify captchar (#15996)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-02-18 18:27:35 +08:00
Jian Qiu
85d784b71e build(deps): bump golang.org/x/net from 0.1.0 to 0.7.0 (#15994)
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.1.0...v0.7.0)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-18 17:54:33 +08:00
Jian Qiu
15c2413aa6 fix: 1. allow remove current user from current project. 2. reset recovery-questions when resetting MFA (#15986)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-02-18 13:04:49 +08:00
Jian Qiu
5ff1ba7517 build(deps): bump github.com/apache/thrift from 0.12.0 to 0.13.0 (#15992)
Bumps [github.com/apache/thrift](https://github.com/apache/thrift) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/apache/thrift/releases)
- [Changelog](https://github.com/apache/thrift/blob/master/CHANGES.md)
- [Commits](https://github.com/apache/thrift/compare/v0.12.0...v0.13.0)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-18 13:03:30 +08:00
Jian Qiu
e7ee4ff4d8 build(deps): bump github.com/Masterminds/goutils from 1.1.0 to 1.1.1 (#15990)
Bumps [github.com/Masterminds/goutils](https://github.com/Masterminds/goutils) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/Masterminds/goutils/releases)
- [Changelog](https://github.com/Masterminds/goutils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Masterminds/goutils/compare/v1.1.0...v1.1.1)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-18 13:03:01 +08:00
李锐
39277c5235 feat(bingocloud):changed some abilities of bingocloud 2023-02-18 12:17:56 +08:00
Jian Qiu
04ab4afd70 fix: hostman setup tuned-adm profile virtual-host (#15989)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-02-18 08:53:56 +08:00
屈轩
86b0106e75 fix(region): vender update for gcp storage (#15981) 2023-02-18 08:51:40 +08:00
屈轩
6be6000183 fix(region): clean storage db (#15946) 2023-02-18 08:49:06 +08:00
wanyaoqi
3821e42484 feat(region,host): support ovs offload. (#15924)
Cloudpods Ovs offload implemention base on SR-IOV support.
IsolatedDevices add field `OvsOffloadInterface`.

Host config add `ovs_offload_nics` to specify which nic enable ovs
offload, and removed flag `disable_sriov_nics` add flag `sriov_nics` to
configure sriov nics.

Tested Hardware: Mellanox ConnectX-5 NICs
2023-02-18 08:48:27 +08:00
Zexi Li
b27dd48214 Merge pull request #15977 from wanyaoqi/automated-cherry-pick-of-#15976-upstream-release-3.10
Automated cherry pick of #15976: fix(region): esxi to kvm clean sched desc disk.storage
2023-02-17 11:56:25 +08:00
wanyaoqi
16c56641b1 fix(region): esxi to kvm clean sched desc disk.storage
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-17 10:04:04 +08:00
Zexi Li
aa8f682998 feat(monitor): add DisableQuerySignatureCheck option (#15975) 2023-02-16 23:57:47 +08:00
Zexi Li
fecf8a340f Merge pull request #15952 from zexi/bm-status-probe
fix(baremetal): only do status probe job when host_type is hypervisor
2023-02-16 22:47:22 +08:00
Zexi Li
9d41757e30 Merge pull request #15957 from zexi/automated-cherry-pick-of-#15955-upstream-release-3.10
Automated cherry pick of #15955: fix(climc): add measurements and databases api of unifiedmonitor
2023-02-16 22:46:44 +08:00
Zexi Li
18933f4db4 Merge pull request #15969 from gouqi11/automated-cherry-pick-of-#15961-upstream-release-3.10
Automated cherry pick of #15961: fix(notify): 添加消息来源
2023-02-16 22:45:45 +08:00
Zexi Li
504deb4728 Merge pull request #15971 from ioito/automated-cherry-pick-of-#15970-upstream-release-3.10
Automated cherry pick of #15970: fix(region): gcp image sync
2023-02-16 18:12:53 +08:00
ioito
9555d1ddf0 fix(region): gcp image sync 2023-02-16 17:18:52 +08:00
mhf
e2a39fe87d fix(notify): 添加消息来源 2023-02-16 15:24:48 +08:00
Zexi Li
119ffcd626 Merge pull request #15967 from zexi/automated-cherry-pick-of-#15966-upstream-release-3.10
Automated cherry pick of #15966: feat(mcclient): allow set default authenticate source
2023-02-16 14:53:15 +08:00
Zexi Li
c2f8cd5bbf feat(mcclient): allow set default authenticate source 2023-02-16 14:38:14 +08:00
Zexi Li
6cde822071 Merge pull request #15959 from wanyaoqi/automated-cherry-pick-of-#15958-upstream-release-3.10
Automated cherry pick of #15958: fix(region): kvm convert to esxi
2023-02-16 13:58:35 +08:00
Zexi Li
db41bf8687 Merge pull request #15963 from wanyaoqi/automated-cherry-pick-of-#15962-upstream-release-3.10
Automated cherry pick of #15962: fix(region): guest change disk storage
2023-02-16 13:57:31 +08:00
wanyaoqi
93d10c4083 fix(region): guest change disk storage
new disk use src disk driver and cache mode.

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-16 13:48:16 +08:00
wanyaoqi
cc99df4d51 fix(region): kvm convert to esxi
complete kvm guest meta info

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-16 11:11:15 +08:00
Zexi Li
d168c059a8 fix(climc): add measurements and databases api of unifiedmonitor 2023-02-15 17:09:11 +08:00
Zexi Li
c5c1f10c36 fix(baremetal): only do status probe job when host_type is hypervisor 2023-02-15 12:44:29 +08:00
Zexi Li
6b2f5f8d0d Merge pull request #15934 from swordqiu/automated-cherry-pick-of-#15933-upstream-release-3.10
Automated cherry pick of #15933: fix: usage filter by policy tags revisit2
2023-02-15 10:09:11 +08:00
Zexi Li
8cfb123fd7 Merge pull request #15949 from wanyaoqi/automated-cherry-pick-of-#15948-upstream-release-3.10
Automated cherry pick of #15948: fix(host-deployer): revert linux efi check
2023-02-15 10:07:45 +08:00
wanyaoqi
1278f76e14 fix(host-deployer): revert linux efi check
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-14 23:21:40 +08:00
Zexi Li
bd2fe6a7f9 Merge pull request #15943 from ioito/automated-cherry-pick-of-#15942-upstream-release-3.10
Automated cherry pick of #15942: fix(region): aws s3 upload failed
2023-02-14 18:03:53 +08:00
ioito
1209a3f38a fix(region): aws s3 upload failed 2023-02-14 17:19:58 +08:00
Zexi Li
da033cf581 Merge pull request #15940 from ioito/automated-cherry-pick-of-#15939-upstream-release-3.10
Automated cherry pick of #15939: fix(cloudmon): huawei read only check
2023-02-14 12:22:30 +08:00
Zexi Li
58fe80e9ee Merge pull request #15937 from zexi/automated-cherry-pick-of-#15936-upstream-release-3.10
Automated cherry pick of #15936: fix(baremetal): duplicate argument task-worker-count
2023-02-14 12:20:14 +08:00
ioito
38c5e67c87 fix(cloudmon): huawei read only check 2023-02-14 12:04:14 +08:00
Zexi Li
b27ba68a8f fix(baremetal): duplicate argument task-worker-count 2023-02-14 11:56:55 +08:00
Qiu Jian
1626e4038c fix: usage filter by policy tags revisit2 2023-02-14 09:32:57 +08:00
Zexi Li
986abb1c4c fix(region): start LoadBalancerBackendSyncTask when needed (#15931) 2023-02-14 01:40:11 +08:00
Zexi Li
f645e89bf9 fix(region): start LoadBalancerBackendSyncTask when needed (#15930) 2023-02-14 01:39:41 +08:00
Zexi Li
df3ae2dc86 Merge pull request #15929 from zexi/automated-cherry-pick-of-#15928-upstream-release-3.10
Automated cherry pick of #15928: fix(build): lbagent-base image
2023-02-13 21:56:03 +08:00
Zexi Li
052fb80ad2 fix(build): lbagent-base image 2023-02-13 21:50:29 +08:00
Zexi Li
671984ece2 Merge pull request #15926 from wanyaoqi/automated-cherry-pick-of-#15925-upstream-release-3.10
Automated cherry pick of #15925: fix(host,baremetal): deploy content action not marshaled
2023-02-13 15:36:53 +08:00
Zexi Li
b8d02146f9 Merge pull request #15923 from ioito/automated-cherry-pick-of-#15922-upstream-release-3.10
Automated cherry pick of #15922: fix(region): change cdn to virtual resource
2023-02-13 15:35:53 +08:00
wanyaoqi
4bf597c338 fix(host,baremetal): deploy content action not marshaled
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-02-13 12:13:52 +08:00
ioito
c7ae577618 fix(region): change cdn to virtual resource 2023-02-13 10:31:30 +08:00
Zexi Li
18e12ccea0 Merge pull request #15921 from swordqiu/automated-cherry-pick-of-#15920-upstream-release-3.10
Automated cherry pick of #15920: feature: project admin user
2023-02-13 10:01:38 +08:00
Qiu Jian
2577c4faf4 feature: project admin user 2023-02-13 03:44:15 +08:00
Jian Qiu
6475a653d1 fix: tablespec add sync method (#15914)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2023-02-09 22:39:16 +08:00
Zexi Li
537ce1e524 Merge pull request #15912 from zexi/automated-cherry-pick-of-#15909-upstream-release-3.10
Automated cherry pick of #15909: fix(region): update kube cluster to kubeserver
2023-02-08 14:02:08 +08:00
Zexi Li
683e2d0faf fix(region): update kube cluster to kubeserver 2023-02-08 13:51:24 +08:00
Zexi Li
ee19e764ee Merge pull request #15908 from swordqiu/automated-cherry-pick-of-#15907-upstream-release-3.10
Automated cherry pick of #15907: fix: lbagent containerize issues
2023-02-08 11:03:16 +08:00
Qiu Jian
9ea346f38a fix: lbagent containerize issues 2023-02-08 10:52:20 +08:00
Zexi Li
fdfc330145 Merge pull request #15903 from ioito/automated-cherry-pick-of-#15902-upstream-release-3.10
Automated cherry pick of #15902: fix(region): cdn domain config
2023-02-06 23:40:03 +08:00
ioito
aecd28db8e fix(region): cdn domain config 2023-02-06 14:03:00 +08:00
wanyaoqi
d06fe13c34 fix(host-metrics): bytes sent overflow (#15900)
bytes_sent recount unexpected, discard the count before new round.

Signed-off-by: wanyaoqi <wanyaoqi@yunion.cn>
2023-02-05 21:53:29 +08:00
屈轩
1cb2c04aa7 fix(region): fake server generate (#15897) 2023-02-03 23:26:24 +08:00
Jian Qiu
65b9b9624e feature: lbagent register (#15895)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-02-03 23:25:56 +08:00
Zexi Li
42579c3681 Merge pull request #15892 from ioito/automated-cherry-pick-of-#15891-upstream-release-3.10
Automated cherry pick of #15891: fix(region): usage with policy tags
2023-02-02 17:14:13 +08:00
Zexi Li
49ea410829 Merge pull request #15886 from ioito/automated-cherry-pick-of-#15885-upstream-release-3.10
Automated cherry pick of #15885: fix(region): dns recordset details
2023-02-02 17:13:23 +08:00
Zexi Li
09a29873d3 Merge pull request #15882 from ioito/automated-cherry-pick-of-#15881-upstream-release-3.10
Automated cherry pick of #15881: fix(cloudmon): project tags for metric
2023-02-02 17:12:10 +08:00
Zexi Li
316c13388b Merge pull request #15880 from ioito/automated-cherry-pick-of-#15879-upstream-release-3.10
Automated cherry pick of #15879: fix(region): lb listener
2023-02-02 17:11:15 +08:00
ioito
54fd5d14dc fix(region): usage with policy tags 2023-02-02 16:36:15 +08:00
ioito
61619fd0b5 fix(region): dns recordset details 2023-02-02 10:56:19 +08:00
ioito
9399a32117 fix(cloudmon): project tags for metric 2023-02-01 19:46:44 +08:00
Zexi Li
49c3027100 optimized(scheduler): reduce sql query of mysql (#15877) 2023-01-31 19:30:37 +08:00
ioito
9cabeb8130 fix(region): lb listener 2023-01-31 18:04:22 +08:00
Zexi Li
b403cd2bf7 Merge pull request #15863 from ioito/automated-cherry-pick-of-#15862-upstream-release-3.10
Automated cherry pick of #15862: fix(region): 避免创建相同配置时使用当前实例的hostname
2023-01-30 22:12:43 +08:00
Zexi Li
d4e42456df Merge pull request #15875 from swordqiu/automated-cherry-pick-of-#15874-upstream-release-3.10
Automated cherry pick of #15874: fix: usage filter by policy tags
2023-01-30 22:12:05 +08:00
Qiu Jian
ce43e74087 fix: usage filter by policy tags 2023-01-30 21:54:13 +08:00
Jian Qiu
58e24266cb fix: climc logs-splitable support monitor notify (#15869)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2023-01-30 17:44:55 +08:00
Jian Qiu
ec166b6b39 fix: vmemsize error prompt (#15866)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2023-01-30 16:24:23 +08:00
rex zhasm
b218b9626b feat(build,test): 新增 dry_run 模式以便夜间测试 (#15861)
Co-authored-by: Zhang Dongliang <zhangdongliang@yunion.cn>
2023-01-30 16:23:35 +08:00
屈轩
ba599353e1 fix(cloudevent): default disable cloudevent sync (#15852) 2023-01-30 16:09:48 +08:00
ioito
3b726f007f fix(region): 避免创建相同配置时使用当前实例的hostname 2023-01-30 15:22:42 +08:00
Zexi Li
52cad64576 Merge pull request #15858 from zexi/automated-cherry-pick-of-#15857-upstream-release-3.10
Automated cherry pick of #15857: fix(codegen): update apis generated by models
2023-01-30 12:23:08 +08:00
Zexi Li
ad48807686 fix(codegen): update apis generated by models 2023-01-30 11:31:11 +08:00
Zexi Li
fcdb8c6077 Merge pull request #15853 from wanyaoqi/fix/host-metrics-panic
fix(host): panic on report diskio
2023-01-30 11:23:53 +08:00
Zexi Li
09baf69847 Merge pull request #15856 from ioito/automated-cherry-pick-of-#15855-upstream-release-3.10
Automated cherry pick of #15855: fix(region): codegen
2023-01-30 11:23:29 +08:00
ioito
9e9b0c9d62 fix(region): codegen 2023-01-30 09:42:22 +08:00
wanyaoqi
0e4ada7e74 fix(host): panic on report diskio
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-29 23:20:35 +08:00
Zexi Li
1c1551aaba Merge pull request #15849 from ioito/automated-cherry-pick-of-#15848-upstream-release-3.10
Automated cherry pick of #15848: fix(region): vm created with public ip
2023-01-29 18:32:11 +08:00
ioito
6797aa58b8 fix(region): vm created with public ip 2023-01-29 16:04:44 +08:00
Jian Qiu
bd03d1647c fix: cloudmon/lbagent api request with app name (#15845)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-29 01:45:12 +08:00
屈轩
85b4aa3492 fix(region): clirc with region (#15843) 2023-01-29 01:40:51 +08:00
wanyaoqi
7ffefdef8f fix(host): structure guest metrics (#15846)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-29 01:39:55 +08:00
Jian Qiu
4d162294c9 fix: disable metadata server monitor for SR-IOV (#15838)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-29 01:36:12 +08:00
Jian Qiu
47f5d4cd58 fix: webconsole ssh user/pass prompt backspace hanlding (#15835)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-29 01:35:25 +08:00
Jian Qiu
7ccd57bd6a fix: prepare esxi host network revisit (#15833)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-29 01:34:39 +08:00
Jian Qiu
64b0dcdc3e fix: parameter get or create rpc (#15831)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-28 22:31:45 +08:00
Zexi Li
4287c3cd95 feat(climc): add action of k8s-cluster-deploy (#15821) 2023-01-18 23:59:57 +08:00
Jian Qiu
999c30dccb fix: clean pending usage when dry run validate_create_data (#15823)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-18 23:37:24 +08:00
屈轩
1ef85f209e fix(esxi): rebuild root by template (#15827) 2023-01-18 23:36:05 +08:00
gouqi11
469b99bc58 fix(notify): add server_panic topic (#15828) 2023-01-18 23:34:32 +08:00
Zexi Li
ea4bf2f79b Merge pull request #15801 from ioito/automated-cherry-pick-of-#15800-upstream-release-3.10
Automated cherry pick of #15800: fix(mcclient): 避免休眠后再次启动后admin token失效, 导致用户登录失败
2023-01-17 17:51:10 +08:00
Zexi Li
07743d7457 Merge pull request #15812 from gouqi11/automated-cherry-pick-of-#15811-upstream-release-3.10
Automated cherry pick of #15811: fix(keystone): serviceAbnormal token fix
2023-01-17 15:07:15 +08:00
Zexi Li
006b5f1a9d Merge pull request #15817 from gouqi11/automated-cherry-pick-of-#15816-upstream-release-3.10
Automated cherry pick of #15816: fix(notify): fix topic enable bug
2023-01-17 15:06:43 +08:00
mhf
429d43d8a6 fix(notify): fix topic enable bug 2023-01-17 14:40:56 +08:00
Zexi Li
51123c531a Merge pull request #15814 from ioito/automated-cherry-pick-of-#15811-upstream-release-3.10
Automated cherry pick of #15811: fix(keystone): serviceAbnormal token fix
2023-01-17 10:46:42 +08:00
mhf
796f3ecf6d fix(keystone): serviceAbnormal token fix 2023-01-17 10:31:02 +08:00
Zexi Li
78fe9fbe08 Merge pull request #15798 from swordqiu/automated-cherry-pick-of-#15797-upstream-release-3.10
Automated cherry pick of #15797: fix: notify sync receivers from keystone
2023-01-16 16:56:16 +08:00
Zexi Li
cd4ae93455 Merge pull request #15806 from ioito/automated-cherry-pick-of-#15805-upstream-release-3.10
Automated cherry pick of #15805: fix(region): vmware migrate vnc
2023-01-16 16:55:04 +08:00
Zexi Li
94e52c7d85 Merge pull request #15777 from gouqi11/automated-cherry-pick-of-#15770-upstream-release-3.10
Automated cherry pick of #15770: fix(notify): 对所有通知默认加入系统管理员接收人
2023-01-16 16:53:21 +08:00
mhf
0914791bba fix(keystone): serviceAbnormal token fix 2023-01-16 16:45:56 +08:00
Zexi Li
aea2ea174c Merge pull request #15808 from gouqi11/automated-cherry-pick-of-#15799-upstream-release-3.10
Automated cherry pick of #15799: fix(notify): 对服务异常添加消息通知
2023-01-16 16:02:20 +08:00
mhf
0ed048a2df fix(notify): 对服务异常添加消息通知 2023-01-16 15:51:05 +08:00
ioito
27128949b5 fix(region): vmware migrate vnc 2023-01-16 15:11:56 +08:00
ioito
93ed1c408c fix(mcclient): 避免休眠后再次启动后admin token失效, 导致用户登录失败 2023-01-16 14:28:59 +08:00
Qiu Jian
866063a7ed fix: notify sync receivers from keystone 2023-01-15 23:08:36 +08:00
屈轩
9a24dd5191 fix(region): unified name sync options (#15741) 2023-01-15 14:50:40 +08:00
wanyaoqi
80332a6e23 fix(region): update guest status on backup guest start complete (#15795)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-15 13:50:48 +08:00
屈轩
3948f6915d fix(notify): send msg with custom brand (#15792) 2023-01-15 13:48:51 +08:00
屈轩
ae78af3a3e fix(region): optimized capability (#15788) 2023-01-15 13:47:22 +08:00
Zexi Li
b1ba088ba6 Merge pull request #15785 from gouqi11/automated-cherry-pick-of-#15780-upstream-release-3.10
Automated cherry pick of #15780: fix(notify): Add topic result
2023-01-14 17:03:20 +08:00
Zexi Li
af2f2ab6a0 Merge pull request #15784 from ioito/automated-cherry-pick-of-#15783-upstream-release-3.10
Automated cherry pick of #15783: fix(region): vender update for vmware timeout
2023-01-14 16:57:25 +08:00
Zexi Li
05d7823d3f Merge pull request #15776 from wanyaoqi/automated-cherry-pick-of-#15773-upstream-release-3.10
Automated cherry pick of #15773: fix(region): qga set password status on failed
2023-01-14 16:56:36 +08:00
mhf
fb89651888 fix(notify): fix server/create bug 2023-01-14 16:23:37 +08:00
ioito
5e78857c9c fix(region): vender update for vmware timeout 2023-01-14 16:23:23 +08:00
Zexi Li
0a0ec6ba5a Merge pull request #15772 from ioito/automated-cherry-pick-of-#15771-upstream-release-3.10
Automated cherry pick of #15771: fix(common): service exception
2023-01-14 11:55:49 +08:00
ioito
0fac7dfebe fix(common): service exception 2023-01-14 10:23:37 +08:00
mhf
e8e125c4b7 fix(notify): 对所有通知默认加入系统管理员接收人 2023-01-13 16:26:08 +08:00
Zexi Li
b8f12b7541 Merge pull request #15775 from ioito/automated-cherry-pick-of-#15774-upstream-release-3.10
Automated cherry pick of #15774: fix(cloudmon): cloudpods load
2023-01-13 15:29:42 +08:00
wanyaoqi
75d7f518a7 fix(region): qga set password status 2023-01-13 15:28:15 +08:00
ioito
89dee93ff3 fix(cloudmon): cloudpods load 2023-01-13 15:24:26 +08:00
Zexi Li
b63858e555 Merge pull request #15769 from ioito/automated-cherry-pick-of-#15768-upstream-release-3.10
Automated cherry pick of #15768: fix(region): vender update for qcloud lb listener
2023-01-13 10:27:53 +08:00
ioito
ea5054eb5b fix(region): vender update for qcloud lb listener 2023-01-12 18:31:55 +08:00
Zexi Li
19da84ad05 Merge pull request #15754 from wanyaoqi/fix/isolated-device-hot-plgu
fix(host): isolated_deivce hotplug check addr
2023-01-12 18:05:54 +08:00
Zexi Li
74160bfce8 Merge pull request #15757 from wanyaoqi/automated-cherry-pick-of-#15756-upstream-release-3.10
Automated cherry pick of #15756: fix(region): network_ip_macs allow update ip and mac
2023-01-12 18:05:34 +08:00
Zexi Li
c6265114d8 Merge pull request #15760 from wanyaoqi/automated-cherry-pick-of-#15759-upstream-release-3.10
Automated cherry pick of #15759: fix(region): auto switch to backup on host down
2023-01-12 18:04:50 +08:00
Zexi Li
701db10083 Merge pull request #15765 from wanyaoqi/automated-cherry-pick-of-#15763-upstream-release-3.10
Automated cherry pick of #15763: fix(region): network_ip_mac update check
2023-01-12 18:02:09 +08:00
wanyaoqi
51762b856e fix(region): network_ip_macs rbac and guestnetwork assign
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-12 17:53:45 +08:00
wanyaoqi
d36f6200ed fix(region): network_ip_mac update 2023-01-12 11:53:29 +08:00
wanyaoqi
2db88dada9 fix(region): auto switch to backup on host down 2023-01-11 21:42:42 +08:00
wanyaoqi
dc6ba455f5 fix(region): network_ip_macs allow update ip and mac
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-11 19:50:49 +08:00
wanyaoqi
946a9fe064 fix(host): isolated_deivce hotplug check addr
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-11 18:02:03 +08:00
Zexi Li
d8ce42f34c Merge pull request #15748 from ioito/automated-cherry-pick-of-#15747-upstream-release-3.10
Automated cherry pick of #15747: fix(region): qcloud lb backend create
2023-01-11 10:37:19 +08:00
Zexi Li
6eee398d0b Merge pull request #15751 from ioito/automated-cherry-pick-of-#15750-upstream-release-3.10
Automated cherry pick of #15750: fix(region): vender update
2023-01-11 10:36:37 +08:00
Zexi Li
c82571930d Merge pull request #15753 from wanyaoqi/automated-cherry-pick-of-#15749-upstream-release-3.10
Automated cherry pick of #15749: feat(region): bind network ip macs
2023-01-11 10:36:07 +08:00
ioito
0ec59d847f fix(region): vender update 2023-01-10 19:03:44 +08:00
wanyaoqi
15dd695506 feat(region): bind network ip macs
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-10 18:16:39 +08:00
ioito
285399afb3 fix(region): qcloud lb backend create 2023-01-10 14:32:29 +08:00
Zexi Li
5822275000 Merge pull request #15738 from ioito/automated-cherry-pick-of-#15737-upstream-release-3.10
Automated cherry pick of #15737: fix(region): hostname validate
2023-01-09 14:31:44 +08:00
Zexi Li
db530f7e42 Merge pull request #15743 from wanyaoqi/automated-cherry-pick-of-#15742-upstream-release-3.10
Automated cherry pick of #15742: fix(host-deployer): windows 2008 Out-File IOException
2023-01-09 14:30:57 +08:00
wanyaoqi
5cb759276d fix(host-deployer): windows 2008 Out-File IOException
debug log cause windows 2008 IOException, multi process open log file.
2023-01-09 14:03:14 +08:00
ioito
b6cdd0fd9e fix(region): hostname validate 2023-01-09 11:17:17 +08:00
Jian Qiu
676c385b94 fix: simplify and accelerate query of notification (#15735)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-08 09:30:02 +08:00
wanyaoqi
4173c51796 feat(host): kvm vcpus bind cpuset on numa nodes and cpu dies (#15733)
- alloc cpuset on guest startup, try to alloc on one numa or cpu die
- fix guest startup task not clean
- fix cgrup tasks not clean
2023-01-08 09:29:25 +08:00
gouqi11
e5b0dad51e add excelutils func (#15736) 2023-01-08 09:28:39 +08:00
屈轩
15865f8d54 fix(region): optimzed zone-list speed (#15730) 2023-01-07 20:56:33 +08:00
Zexi Li
0dde5e7d61 Merge pull request #15726 from ioito/automated-cherry-pick-of-#15725-upstream-release-3.10
Automated cherry pick of #15725: fix(region): vmware migrate
2023-01-06 17:55:58 +08:00
ioito
84d18a0610 fix(region): vmware migrate 2023-01-06 17:45:39 +08:00
Zexi Li
a333e39197 Merge pull request #15722 from ioito/automated-cherry-pick-of-#15721-upstream-release-3.10
Automated cherry pick of #15721: fix(region): vender update
2023-01-06 15:32:12 +08:00
Zexi Li
abd3ce39a4 Merge pull request #15719 from ioito/automated-cherry-pick-of-#15709-upstream-release-3.10
Automated cherry pick of #15709: fix(region): account sync status
2023-01-06 15:31:32 +08:00
ioito
8034d2bc2e fix(region): vender update 2023-01-06 11:21:04 +08:00
ioito
9316432c65 fix(region): account sync status 2023-01-06 10:31:26 +08:00
Jian Qiu
edd4695dbd fix: need more args in CustomizedTotalCount (#15718)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-06 03:33:53 +08:00
wanyaoqi
e11a1a83b3 fix(worker): policy and task worker count configurable (#15714) 2023-01-05 22:58:32 +08:00
Zexi Li
0708093356 Merge pull request #15711 from swordqiu/automated-cherry-pick-of-#15710-upstream-release-3.10
Automated cherry pick of #15710: fix: init shceduler schedinfo project and domain
2023-01-05 17:04:32 +08:00
Qiu Jian
d6b7050991 fix: init shceduler schedinfo project and domain 2023-01-05 16:06:08 +08:00
Zexi Li
0404b5195a fix(notify): update MYSQL_OUT_OF_SYNC template (#15706) 2023-01-05 15:39:05 +08:00
wanyaoqi
9d2697c69a Automated cherry pick of #15690: feat(host): sriov nic monitor (#15691)
* feat(host): sriov nic monitor

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

* fix(host): host metrics check int64 value overflow

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-04 22:09:56 +08:00
Zexi Li
90c540354c Merge pull request #15702 from ioito/automated-cherry-pick-of-#15701-upstream-release-3.10
Automated cherry pick of #15701: fix(region): vender update
2023-01-04 20:01:48 +08:00
ioito
0f66e4bc78 fix(region): vender update 2023-01-04 19:47:54 +08:00
Zexi Li
355b65a631 Merge pull request #15700 from ioito/automated-cherry-pick-of-#15699-upstream-release-3.10
Automated cherry pick of #15699: fix(keystone): avoid panic
2023-01-04 15:44:31 +08:00
Zexi Li
954b7c2803 Merge pull request #15689 from ioito/automated-cherry-pick-of-#15688-upstream-release-3.10
Automated cherry pick of #15688: fix(region): redis sync error optimized
2023-01-04 15:14:13 +08:00
ioito
4e87d4004d fix(keystone): avoid panic 2023-01-04 15:05:36 +08:00
Zexi Li
18be93628a Merge pull request #15693 from ioito/automated-cherry-pick-of-#15692-upstream-release-3.10
Automated cherry pick of #15692: fix(region): aws lb optimized
2023-01-03 23:37:40 +08:00
屈轩
12c02e2b25 fix(keystone): project-show by name with not found error (#15698) 2023-01-03 21:26:23 +08:00
Zexi Li
3900a91bfc Merge pull request #15695 from zexi/automated-cherry-pick-of-#15694-upstream-release-3.10
Automated cherry pick of #15694: fix(scheduler): do migrate checking when hypervisor is not esxi
2023-01-03 18:35:41 +08:00
Zexi Li
1e77fc5617 fix(scheduler): do migrate checking when hypervisor is not esxi 2023-01-03 18:17:09 +08:00
ioito
f08bedbd31 fix(region): aws lb optimized 2023-01-03 18:05:44 +08:00
ioito
05eec11c90 fix(region): redis sync error optimized 2023-01-03 11:36:11 +08:00
Jian Qiu
6a4d0a8624 fix: get user ids by role ids in scope (#15687)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-02 23:45:23 +08:00
Jian Qiu
98c1b5e7db fix: make cloudaccount options visbile in list (#15685)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-02 23:45:12 +08:00
Jian Qiu
89e05503fd feature: list results carry extra total stats (#15683)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2023-01-02 14:39:00 +08:00
gouqi11
edee04fcc7 fix(notify): add some template and notification (#15669) 2023-01-02 12:00:39 +08:00
wanyaoqi
732db665d1 Automated cherry pick of #15618: fix(host): use drive backup sync backup disks (#15664)
* fix(host): use drive backup sync backup disks

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

* fix(region,host): guest backup backend use fetcherfs

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-02 11:59:56 +08:00
wanyaoqi
7577705b60 fix(region): sriov vfio-pci driver manual deploy nic (#15679)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2023-01-02 11:59:13 +08:00
Zexi Li
af7c4f5e23 Merge pull request #15677 from ioito/automated-cherry-pick-of-#15676-upstream-release-3.10
Automated cherry pick of #15676: fix(region): system disk storage type
2022-12-30 16:18:37 +08:00
ioito
08b43deb3b fix(region): system disk storage type 2022-12-30 16:06:15 +08:00
Zexi Li
e4f6722621 Merge pull request #15672 from wanyaoqi/automated-cherry-pick-of-#15671-upstream-release-3.10
Automated cherry pick of #15671: fix(host): detect qemu caps
2022-12-30 15:02:44 +08:00
Zexi Li
c6e2f99691 Merge pull request #15641 from silence934/automated-cherry-pick-of-#15639-upstream-release-3.10
Automated cherry pick of #15639 upstream release 3.10
2022-12-30 15:01:42 +08:00
Zexi Li
e16d51a773 Merge pull request #15674 from zexi/automated-cherry-pick-of-#15673-upstream-release-3.10
Automated cherry pick of #15673: fix(scheduler): reduce calculation of storage's free_capacity
2022-12-30 14:52:56 +08:00
Zexi Li
5d22a4584d fix(scheduler): reduce calculation of storage's free_capacity 2022-12-30 12:40:26 +08:00
wanyaoqi
9e98750429 fix(host): detect qemu caps
ingnore pmemclean output on qemu version 2.12.1

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2022-12-30 12:06:29 +08:00
Jian Qiu
d92ad0b358 fix: project duplicate fix2 (#15667)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2022-12-30 00:27:26 +08:00
Jian Qiu
edc700ccb3 fix: project duplciate name (#15663)
Co-authored-by: QIU Jian <qiujian@yunionyun.com>
2022-12-29 23:36:41 +08:00
屈轩
1aa3f63b6c fix(region): duplicate project sync (#15661) 2022-12-29 23:19:50 +08:00
屈轩
85670ce5f6 fix(region): hostname sync (#15658) 2022-12-29 23:19:26 +08:00
屈轩
5918d17f7b fix(region): qcloud cdn create (#15656) 2022-12-29 23:18:53 +08:00
Zexi Li
8dc56273b4 Merge pull request #15650 from ioito/automated-cherry-pick-of-#15649-upstream-release-3.10
Automated cherry pick of #15649: fix(region): aliyun redis create
2022-12-29 16:26:28 +08:00
Zexi Li
00cd582502 Merge pull request #15652 from zexi/automated-cherry-pick-of-#15651-upstream-release-3.10
Automated cherry pick of #15651: fix(webconsole): not get pod info when fetchK8sEnv
2022-12-29 16:06:56 +08:00
Zexi Li
bad38b83b9 fix(webconsole): not get pod info when fetchK8sEnv 2022-12-29 15:47:59 +08:00
ioito
b5291d3b2a fix(region): aliyun redis create 2022-12-29 15:32:03 +08:00
屈轩
a801882077 fix(region): external project sync (#15648) 2022-12-29 14:57:19 +08:00
Jian Qiu
db3363a356 fix: climc panic 20221228 (#15645)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-29 11:35:36 +08:00
Zexi Li
d33903571a Merge pull request #15637 from swordqiu/automated-cherry-pick-of-#15635-upstream-release-3.10
Automated cherry pick of #15635: fix: limit roles that a user join a project
2022-12-29 10:45:17 +08:00
silence
517647dda3 feat(region):sync kafka tag
fmt
2022-12-28 17:51:20 +08:00
silence
ae0de28ae1 feat(region): sync resource tag 2022-12-28 17:51:20 +08:00
屈轩
89dfa83dda fix(region): vender update (#15634) 2022-12-28 15:37:28 +08:00
Qiu Jian
fbd34228fe fix: limit roles that a user join a project 2022-12-28 15:20:25 +08:00
Zexi Li
06d294b441 Merge pull request #15632 from ioito/automated-cherry-pick-of-#15631-upstream-release-3.10
Automated cherry pick of #15631: fix(region): remove migrate check
2022-12-27 21:01:13 +08:00
Zexi Li
8f81e74900 Merge pull request #15626 from ioito/automated-cherry-pick-of-#15625-upstream-release-3.10
Automated cherry pick of #15625: fix(region): external project sync
2022-12-27 21:00:47 +08:00
Zexi Li
33f51662ea Merge pull request #15628 from ioito/automated-cherry-pick-of-#15627-upstream-release-3.10
Automated cherry pick of #15627: fix(region): lb cert sync
2022-12-27 21:00:07 +08:00
ioito
2b1daa4362 fix(region): remove migrate check 2022-12-27 17:27:26 +08:00
wanyaoqi
ad99d8657a fix(region,host): migrate use source desc file. (#15629) 2022-12-27 16:50:56 +08:00
ioito
ddcc5fa3d0 fix(region): lb cert sync 2022-12-27 15:44:26 +08:00
ioito
448b788f54 fix(region): external project sync 2022-12-27 15:16:51 +08:00
Jian Qiu
38e7b60e06 Automated cherry pick of #15621: fix: remove mutual dependency of cloudmux on onecloud (#15622)
* fix: remove mutual dependency of cloudmux on onecloud

* update vendor

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-27 08:26:25 +08:00
屈轩
ae78a0bb6c fix(region): usage for host storage (#15620) 2022-12-27 01:20:53 +08:00
Jian Qiu
1ce4462ed1 fix: remove dependency of appctx on i18n (#15616)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-23 23:45:02 +08:00
Jian Qiu
2b550a8532 fix: guests short desc add status (#15613)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-23 19:23:13 +08:00
wanyaoqi
6ffa3de191 fix(region): sriov typo (#15610) 2022-12-23 00:58:13 +08:00
屈轩
edf0b00020 fix(region): tags for project mapping (#15606) 2022-12-22 18:42:21 +08:00
Zexi Li
019145df89 Merge pull request #15565 from wanyaoqi/automated-cherry-pick-of-#15473-upstream-release-3.10
Automated cherry pick of #15473: fix(region,host): backup guest
2022-12-22 10:17:29 +08:00
Zexi Li
60bea8872a Merge pull request #15603 from gouqi11/automated-cherry-pick-of-#15602-upstream-release-3.10
Automated cherry pick of #15602: fix(region): fixModelartsCidrDiffBetweenHuaweiAndHCSO
2022-12-21 17:40:39 +08:00
mhf
53fc76a72f fix(region): fixModelartsCidrDiffBetweenHuaweiAndHCSO 2022-12-21 16:46:53 +08:00
Zexi Li
321fb8208e optimize(scheduler): reduce calculation of network free address (#15596)
- only calculate non-emulated host's network on building
- calculate emulated host's network on scheduling
2022-12-20 20:54:42 +08:00
Zexi Li
17f646d742 fix(baremetal): update base image to v0.3.9 (#15599)
ref: https://github.com/yunionio/yunionos/pull/27
2022-12-20 20:40:27 +08:00
wanyaoqi
9c767d97ef fix(host): don't hide kvm cpu feature on nested virt (#15579) 2022-12-20 20:38:57 +08:00
Jian Qiu
fe80cc2f45 fix: prefer id over name when fetching owner id (#15591)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-20 20:37:10 +08:00
Zexi Li
89efac5644 Merge pull request #15584 from ioito/automated-cherry-pick-of-#15583-upstream-release-3.10
Automated cherry pick of #15583: fix(cloudmon): ignore empty metric error
2022-12-20 12:59:29 +08:00
Zexi Li
36cfd67119 Merge pull request #15581 from ioito/automated-cherry-pick-of-#15580-upstream-release-3.10
Automated cherry pick of #15580: fix(region): vender update
2022-12-20 12:58:38 +08:00
ioito
e780547c13 fix(cloudmon): ignore empty metric error 2022-12-19 17:12:20 +08:00
ioito
b3420191dc fix(region): vender update 2022-12-19 14:48:17 +08:00
屈轩
d417aee230 fix(region): vender update (#15560) 2022-12-17 17:27:10 +08:00
屈轩
5888dc6f88 fix(region): sync vm hostname with ascii (#15563) 2022-12-16 16:07:09 +08:00
Zexi Li
5d8b9f86bd Merge pull request #15558 from silence934/automated-cherry-pick-of-#15557-upstream-release-3.10
Automated cherry pick of #15557: fix(cloudmon): collectStatsMetrics ret is nil
2022-12-15 17:02:08 +08:00
Zexi Li
ff9fbbb2ce Merge pull request #15572 from zexi/automated-cherry-pick-of-#15569-upstream-release-3.10
Automated cherry pick of #15569: fix(baremetal): mac address of BMC not found
2022-12-15 16:54:15 +08:00
Zexi Li
965bab1588 Merge pull request #15575 from gouqi11/automated-cherry-pick-of-#15574-upstream-release-3.10
Automated cherry pick of #15574: fix(region): fix sync project bug and add climc choices
2022-12-15 16:50:30 +08:00
mhf
9d3f29a0d7 fix(region): fix sync project bug and add climc choices 2022-12-15 15:25:19 +08:00
Zexi Li
43a885c172 Merge pull request #15570 from gouqi11/automated-cherry-pick-of-#15568-upstream-release-3.10
Automated cherry pick of #15568: fix(cloudmon): remotefile metrice bugfix
2022-12-15 11:48:15 +08:00
Zexi Li
4b39ae2386 fix(baremetal): mac address of BMC not found 2022-12-15 11:32:56 +08:00
mhf
0da3d8b8eb fix(cloudmon): remotefile metrice bugfix 2022-12-15 11:28:52 +08:00
wanyaoqi
b9565408e1 fix(region,host): backup guest refactor 2022-12-14 23:56:49 +08:00
silence
29d6490ff8 fix(cloudmon): collectStatsMetrics ret is nil 2022-12-14 15:40:24 +08:00
Zexi Li
50f6e6d687 Merge pull request #15551 from swordqiu/automated-cherry-pick-of-#15550-upstream-release-3.10
Automated cherry pick of #15550: fix: usb tablet not function for windows 10 guest
2022-12-14 15:33:27 +08:00
Zexi Li
2551bc9e2c Merge pull request #15555 from ioito/automated-cherry-pick-of-#15545-upstream-release-3.10
Automated cherry pick of #15545: fix(region): vender update
2022-12-14 15:31:25 +08:00
ioito
1cf4c3441f fix(region): vender update 2022-12-14 15:01:43 +08:00
Qiu Jian
94b7cdcc2b fix: usb tablet not function for windows 10 guest 2022-12-14 12:08:46 +08:00
wanyaoqi
65295e5bec fix(region): use qcow2 format on raw disk cache image (#15548) 2022-12-13 18:32:39 +08:00
Zexi Li
c17edd7829 Merge pull request #15524 from gouqi11/automated-cherry-pick-of-#15514-upstream-release-3.10
Automated cherry pick of #15514: fix(cloudmon):add cloudpods metric GetDelayDuration
2022-12-12 14:50:33 +08:00
Zexi Li
7d26409efc Merge pull request #15543 from gouqi11/automated-cherry-pick-of-#15541-upstream-release-3.10
Automated cherry pick of #15541: fix(climc): add server option cloudpods
2022-12-12 14:48:36 +08:00
mhf
10e9692ab8 fix(climc): add server option cloudpods 2022-12-12 14:07:05 +08:00
Zexi Li
392118a7ba Merge pull request #15539 from swordqiu/automated-cherry-pick-of-#15537-upstream-release-3.10
Automated cherry pick of #15537: fix: host init before auth
2022-12-12 09:41:57 +08:00
屈轩
fbe892a424 fix(common): optimized metadata list (#15530) 2022-12-11 18:10:29 +08:00
Qiu Jian
9d1996e544 fix: host init before auth 2022-12-11 17:47:30 +08:00
Zexi Li
5d18eded05 Merge pull request #15518 from wanyaoqi/automated-cherry-pick-of-#15509-upstream-release-3.10
Automated cherry pick of #15509: fix(region,host): fix some bugs of server disk change storage
2022-12-09 11:45:26 +08:00
Zexi Li
335fe5d7aa Merge pull request #15527 from ioito/automated-cherry-pick-of-#15526-upstream-release-3.10
Automated cherry pick of #15526: fix(common): limit request
2022-12-09 11:44:06 +08:00
Zexi Li
be5ff80381 Merge pull request #15533 from ioito/automated-cherry-pick-of-#15532-upstream-release-3.10
Automated cherry pick of #15532: fix(cloudmon): storage metric
2022-12-09 11:42:13 +08:00
ioito
5dfe1ae004 fix(cloudmon): storage metric 2022-12-09 11:28:12 +08:00
ioito
79e348688a fix(common): limit request 2022-12-08 15:54:47 +08:00
wanyaoqi
5323898ee1 fix(host): convert migrate set downtime value to float64 (#15475)
* fix(host): convert migrate set downtime value to float64

* fix(host): live migration optimize

Qemu will send `STOP` event on start last time migration, but this
moment migration not completed. So we need wait magration complete.
Configurable Auto converge max cpu throttle.
2022-12-08 15:40:44 +08:00
wanyaoqi
8d5ceb0b73 Automated cherry pick of #15475: fix(host): convert migrate set downtime value to float64 (#15476)
* fix(host): convert migrate set downtime value to float64

* fix(host): live migration optimize

Qemu will send `STOP` event on start last time migration, but this
moment migration not completed. So we need wait magration complete.
Configurable Auto converge max cpu throttle.
2022-12-08 14:45:53 +08:00
wanyaoqi
5c15d23c5e fix(host): don't set ovs interface external id on migrating (#15498)
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
2022-12-08 14:43:32 +08:00
屈轩
24d369a7d2 fix(cloudid): support custom saml user name (#15512) 2022-12-08 14:42:09 +08:00
wanyaoqi
dbd5e03406 fix(host): ceph util timeout (#15516) 2022-12-08 14:41:09 +08:00
wanyaoqi
37966f32e1 fix(region,host): fix some bugs of server disk change storage 2022-12-08 12:07:10 +08:00
Zexi Li
8bd34fda3d Merge pull request #15510 from ioito/automated-cherry-pick-of-#15508-upstream-release-3.10
Automated cherry pick of #15508: feat(region): support hcsop
2022-12-08 10:53:49 +08:00
ioito
55f7404d36 feat(region): support hcsop 2022-12-08 10:44:14 +08:00
Zexi Li
13e2749eb0 Merge pull request #15506 from ioito/automated-cherry-pick-of-#15505-upstream-release-3.10
Automated cherry pick of #15505: fix(cloudid): huawei saml user name
2022-12-07 22:35:48 +08:00
ioito
4f9e08d988 fix(cloudid): huawei saml user name 2022-12-07 11:22:31 +08:00
wanyaoqi
bcbcbdf867 fix(host): update host wire with mac addr (#15501) 2022-12-07 02:20:52 +08:00
Zexi Li
c241dec916 Merge pull request #15495 from ioito/automated-cherry-pick-of-#15494-upstream-release-3.10
Automated cherry pick of #15494: fix(cloudid): vender update
2022-12-07 00:12:55 +08:00
ioito
0d16a97748 fix(cloudid): vender update 2022-12-06 18:28:30 +08:00
Jian Qiu
5fe3ffbf94 fix: notify send email with duplicate attachments (#15493)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-06 15:20:31 +08:00
Zexi Li
4c5ed8b537 Merge pull request #15484 from swordqiu/automated-cherry-pick-of-#15483-upstream-release-3.10
Automated cherry pick of #15483: fix: trigger vpcagent update when starting guest
2022-12-06 01:46:42 +08:00
Jian Qiu
7794cedd1c fix: allow baremetal to specify external tftp server and file (#15490)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-05 23:41:14 +08:00
Zexi Li
600dc0bb9e Merge pull request #15481 from swordqiu/automated-cherry-pick-of-#15480-upstream-release-3.10
Automated cherry pick of #15480: fix: host disable gso for specific nics
2022-12-05 18:19:25 +08:00
Zexi Li
fccccb3c79 Merge pull request #15486 from swordqiu/automated-cherry-pick-of-#15485-upstream-release-3.10
Automated cherry pick of #15485: feature: allow update hostname
2022-12-05 18:16:45 +08:00
Qiu Jian
ad2a12eb31 feature: allow update hostname 2022-12-05 16:16:31 +08:00
Qiu Jian
7fa8c24fb1 fix: trigger vpcagent update when starting guest 2022-12-04 03:00:05 +08:00
Qiu Jian
553c987069 fix: host disable gso for specific nics 2022-12-04 00:55:55 +08:00
屈轩
750818041f fix(region): hcs vpc emulated (#15479) 2022-12-02 10:09:21 +08:00
Jian Qiu
c774bd2ca3 fix: lbagent switch to backup (#15466)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-12-01 01:23:51 +08:00
屈轩
37196c0f3d fix(common): http request timeout (#15467) 2022-12-01 01:23:22 +08:00
Zexi Li
58201ccf85 fix(scheduler): consider storage backend and mediumType size (#15470) 2022-12-01 01:22:23 +08:00
屈轩
eb6322cd4f fix(cloudmon): hcs metric (#15472) 2022-12-01 01:21:56 +08:00
Zexi Li
803f3648fb Merge pull request #15463 from swordqiu/automated-cherry-pick-of-#15462-upstream-release-3.10
Automated cherry pick of #15462: fix: aws sync os_arch
2022-11-30 17:53:50 +08:00
Qiu Jian
16430d8ef7 fix: aws sync os_arch 2022-11-30 01:36:32 +08:00
Zexi Li
f72b903533 Merge pull request #15461 from ioito/automated-cherry-pick-of-#15460-upstream-release-3.10
Automated cherry pick of #15460: fix(region): vender update
2022-11-29 19:37:53 +08:00
ioito
94e3dbad41 fix(region): vender update 2022-11-29 18:43:21 +08:00
gouqi11
e10434ff77 fix(region): fix modelarts create task setStatus (#15456) 2022-11-28 23:58:30 +08:00
gouqi11
1365007ed1 fix(region): add guest power states (#15454) 2022-11-28 23:57:43 +08:00
Zexi Li
5f48c736f8 Merge pull request #15448 from swordqiu/automated-cherry-pick-of-#15439-upstream-release-3.10
Automated cherry pick of #15439: Feature/qj vpcagent sync handler
2022-11-28 19:16:54 +08:00
Zexi Li
2026943c36 Merge pull request #15446 from swordqiu/automated-cherry-pick-of-#15445-upstream-release-3.10
Automated cherry pick of #15445: fix: vmware convert to kvm need check network configuration
2022-11-28 19:16:08 +08:00
Jian Qiu
18d341ea15 fix: lbagent master fixes (#15449)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-11-28 13:09:23 +08:00
Qiu Jian
f8ddb4a211 feature: vpcagent sync handler 2022-11-28 02:28:28 +08:00
Qiu Jian
f8e596fdd6 fix: vmware convert to kvm need check network configuration 2022-11-28 02:20:50 +08:00
Zexi Li
7d4ca95df4 Merge pull request #15443 from gouqi11/automated-cherry-pick-of-#15438-upstream-release-3.10
Automated cherry pick of #15438: fix(region): delete modelart Sku purgeAll.managerId
2022-11-25 20:38:21 +08:00
mhf
40eb0075ec fix(region): delete modelart Sku purgeAll.managerId 2022-11-25 20:33:30 +08:00
Zexi Li
59a1b03d97 Merge pull request #15441 from gouqi11/automated-cherry-pick-of-#15440-upstream-release-3.10
Automated cherry pick of #15440: fix(region): add modelarts sku policy
2022-11-25 15:49:48 +08:00
mhf
06470f23e7 fix(region): add modelarts sku policy 2022-11-25 15:39:47 +08:00
Jian Qiu
c2812f4a5e fix: keep schedtask_label table name (#15435)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
2022-11-25 15:38:44 +08:00
Zexi Li
aae19e7563 Merge pull request #15431 from ioito/automated-cherry-pick-of-#15430-upstream-release-3.10
Automated cherry pick of #15430: fix(region): hcs image import
2022-11-24 10:43:36 +08:00
ioito
1cfb56b087 fix(region): hcs image import 2022-11-24 10:16:59 +08:00
Zexi Li
774b14fbbe Merge pull request #15429 from ioito/automated-cherry-pick-of-#15428-upstream-release-3.10
Automated cherry pick of #15428: fix(region): hcs misc fix
2022-11-23 16:20:08 +08:00
ioito
0c2b5a48aa fix(region): hcs misc fix 2022-11-23 16:05:55 +08:00
17108 changed files with 794309 additions and 6366529 deletions

View File

@@ -7,7 +7,7 @@ jobs:
requires:
- check
docker:
- image: yunion/alpine-build:3.22.0-go-1.24.6-1
- image: yunion/centos-build:go-1.18.3-0
environment:
ONECLOUD_CI_BUILD: "1"

View File

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

View File

@@ -1,20 +1,18 @@
---
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**:
**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`):
-->

View File

@@ -1,7 +1,7 @@
---
name: 文档问题/Document Request
about: 文档相关缺陷改进/Document request to this project
title: '[文档/Docs]'
name: Document Request
about: Document request to this project
title: ''
labels:
- area/docs
- enhancement

View File

@@ -1,7 +1,7 @@
---
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: ''

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

@@ -13,7 +13,8 @@ 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
- release/3.7
- release/3.6
Take a look at "https://www.cloudpods.org/en/docs/contribute/contrib/" to learn how to submit a cherry-pick PR.
-->

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.16
uses: actions/setup-go@v1
with:
go-version: 1.16
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}}"

View File

@@ -18,7 +18,7 @@ You may answer issues at Github and help those who encounter issues when using C
## 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.
You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/contribute/contrib/) for more details on how to contribute codes to Cloudpods.
### Fix Issues
@@ -29,8 +29,8 @@ You may help solve bugs by submiting patches.
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.
* Develop new features for Cloudpods
* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient
## Documentation

View File

@@ -18,7 +18,7 @@ Cloudpods是一款开源的基础设施管理工具软件运行场景复杂
## 贡献代码
我们非常欢迎和感谢开发者向项目提交代码PR流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/docs/development/contrib/).
我们非常欢迎和感谢开发者向项目提交代码PR流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/zh/docs/contribute/contrib/).
### 修复BUG
@@ -27,8 +27,8 @@ Cloudpods是一款开源的基础设施管理工具软件运行场景复杂
### 开发新的功能特性
不仅仅是修复BUG您也可以通过提交代码以改进Cloudpods包括但不限于
* 开发新的功能特性,您可以在[feature issues](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)查找需要的功能
* 重构代码,使得代码更加简洁易读,更加低健壮,或者执行起来更加高效
* 开发新的功能特性,您可以在[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/)找到Cloudpods的功能规划
* 重构代码,使得代码更加简洁易读,更加低健壮,或者执行起来更加高效
## 文档

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 -lgnutls -lnettle -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,7 +81,7 @@ 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 ./...
@@ -84,9 +89,12 @@ vet:
# cmd/esxi-agent: prepare_dir
# CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir
cmd/fetcherfs: prepare_dir
CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
cmd/%: prepare_dir
$(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
@@ -185,7 +207,6 @@ 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 \
@@ -237,7 +258,7 @@ hostdeployer-grpc-gen:
check: fmt-check
check: gendocgo-check
#check: goimports-check
check: goimports-check
#check: vet-check
#check: y18n-check
.PHONY: check
@@ -261,18 +282,22 @@ dep:
@echo "$$depDeprecated"
@$(MAKE) mod
RELEASE_BRANCH:=master
RELEASE_BRANCH:=release/3.10
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
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
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
@@ -324,7 +349,7 @@ image:
.PHONY: image
image-telegraf-raid-plugin:
VERSION=v4.0-20260115.0 GOOS=linux ARCH=all make image telegraf-raid-plugin
VERSION=release-1.6.4 ARCH=all make image telegraf-raid-plugin
%:
@:

View File

@@ -8,7 +8,8 @@ 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:3.16.0-go-1.18.2-0
DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.18.3-0
EnvIf=$(if $($(1)),$(1)=$($(1)))
@@ -28,6 +29,27 @@ 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-$(tmpName) &>/dev/null || true
docker run \
--rm \
--name docker-centos-build-$(tmpName) \
-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-$(tmpName) || true
.PHONY: docker-centos-build
.PHONY: docker-centos-build-stop
define dockerAlpineBuildCmd
set -o xtrace

7
OWNERS
View File

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

View File

@@ -1,17 +1,14 @@
# Cloudpods
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.org/yunionio/cloudpods)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[简体中文](./README-CN.md) | [English](./README.md)
## Cloudpods是什么?
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台,也就是一个云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异对外暴露了一套统一的API允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度提升了管理多云的效率。
Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与 AI 容器应用的统一管理平台,帮助企业在同一平台完成 AI 工作负载的部署、调度与运维,与 Cloudpods 私有云/多云资源体系无缝集成。
Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台,也就是一个云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异对外暴露了一套统一的API允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度提升了管理多云的效率。
## 谁需要Cloudpods?
@@ -20,24 +17,188 @@ Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与
* 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
* 在混合云的场景,能够在一个界面访问私有云和公有云
* 通过一个集中的入口访问分布在多个公有云平台上的多个账号
* 当前只使用一个公有云账号但希望将来使用多云的用户
* 需要部署和管理 LLM 推理服务及 AI 容器应用,并需要 GPU 调度支持的用户
* 当前只使用一个公有云账号但希望将来使用多云的用户
## 功能
请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
### 概览 & UI 展示
### AI 云
<details>
<summary>管理多云资源的功能可以管理大多数的主流云包括私有云例如OpenStack以及公有云例如AWSAzureGCP阿里云华为云和腾讯云等</summary>
<ul>
<li>
<p>云帐号纳管</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
</li>
<li>
<p>云帐号列表</p>
<img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
</li>
<li>
<p>公有云虚拟机列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
</li>
</ul>
</details>
* **AI 推理服务**:部署和管理 LLM 推理实例(支持 Ollama、vLLM、SGLang 等),支持 GPU 调度、模型挂载与推理服务地址分配。
* **AI 应用管理**:一站式部署 LLM 应用编排、智能体助手、图像生成等 AI 容器应用。
* **模型库**:统一管理模型来源、版本与缓存,支持多实例复用、离线分发,避免重复下载。
* **模板与镜像**:通过模板定义 CPU/内存/GPU 等资源规格,通过镜像管理容器运行环境,实现标准化交付。
* **GPU 运维**GPU 设备自动探测与注册,支持 NVIDIA/CUDA 环境的统一配置与管理。
<details>
<summary>
一个可以管理海量KVM虚拟机的轻量级私有云
</summary>
<ul>
<li>
<p>虚拟机列表</p>
<img src="https://i.imgur.com/DbkRUoo.png">
</li>
<li>
<p>虚拟机创建页面</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
</li>
<li>
<p>虚拟机可通过 VNC 或者 SSH 登录</p>
<img src="https://i.imgur.com/m0rkeQ3.png">
</li>
<li>
<p>宿主机列表</p>
<img src="https://imgur.com/i509t5a.png">
</li>
<li>
<p>镜像模板列表</p>
<img src="https://imgur.com/UVFLGi2.png">
</li>
<li>
<p>VPC列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
</li>
<li>
<p>二层网络列表(经典网络)</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
</li>
<li>
<p>IP子网列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
</li>
<li>
<p>弹性公网IP列表VPC网络</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
</li>
<li>
<p>LB列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
</li>
</ul>
</details>
<details>
<summary>
一个能进行物理机全生命周期管理的裸机云
</summary>
<ul>
<li>
<p>物理机列表</p>
<img src="https://i.imgur.com/Jz8b5nC.png">
</li>
<li>
<p>物理机纳管</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
</li>
<li>
<p>安装操作系统</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
</li>
<li>支持 ARM64 的物理机服务器</li>
</ul>
</details>
<details>
<summary>一套完整的多租户认证和访问控制体系</summary>
<ul>
<li>
<p>支持本地sql、LDAP 等认证源</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
</li>
<li>
<p>多租户系统,包括域,项目,组,用户,角色和权限等</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
</li>
</ul>
</details>
<details>
<summary>
实现了VMware vSphere虚拟化集群的自助服务和自动化
</summary>
<ul>
<li>
<p>添加VMware云账号</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
</li>
<li>
<p>VMware云账号列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
</li>
<li>
<p>自动创建二层网络</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
</li>
<li>
<p>自动创建IP子网</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
</li>
<li>
<p>新建VMware虚拟机</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
</li>
</ul>
</details>
<details>
<summary>
允许以统一的联邦身份访问各个云平台的原生控制台的SSO
</summary>
<ul>
<li>
<p>为云账号开启免密登录(以阿里云为例)</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
</li>
<li>
<p>将Cloudpods平台用户添加为免密登录用户</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
</li>
<li>
<p>多云统一登录入口</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
</li>
<li>
<p>多云统一登录-免密登录用户列表</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
</li>
<li>
<p>Cloudpods平台用户免密登录阿里云</p>
</li>
</ul>
</details>
<details>
<summary>
一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
</summary>
</details>
<details>
<summary>
自动将镜像转换为不同云平台需要的格式的多云镜像服务
</summary>
</details>
支持的 AI 工作负载:
* AI 推理Ollama、vLLM、SGLang
* AI 应用OpenClaw、Dify、ComfyUI、Hermes Agent
### 支持的云平台
@@ -52,42 +213,37 @@ Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与
* 天翼云
* 移动云
* 京东云
* 火山引擎
* 百度云
* 金山云
* 青云
* Oracle Cloud
* 联通云
* 私有云:
* OpenStack
* ZStack
* Alibaba Cloud Apsara (阿里飞天)
* Alibaba Cloud Aspara (阿里飞天)
* Huawei HCSO (华为HCSO)
* Nutanix
* BingoCloud
* OceanBase
* 本地基础设施资源:
* 基于 KVM 实现的轻量级私有云
* VMware vSphere vCenter/ESXi
* Proxmox VE
* 裸金属 (IPMI, Redfish API)
* 对象存储 (Minio, Ceph, XSky)
* VMWare vSphere vCenter/ESXi
* Baremetals (IPMI, Redfish API)
* Object storages (Minio, Ceph, XSky)
* NAS (Ceph)
### 支持的云资源
* 服务器实例、磁盘、网卡、网络、VPC、存储、宿主机、二层网络、快照、快照策略、安全组、弹性 IP、SSH 密钥对、镜像
* 负载均衡实例、监听、后端服务器组、后端服务器、TLS 证书、访问控制
* 对象存储:存储桶、对象
* NAS:文件系统、权限组、挂载点
* RDS:实例、账号、备份、数据库、参数、权限
* 弹性缓存:实例、账号、备份、参数
* DNSDNS 区域、DNS 记录
* VPCVPCVPC 对等连接、跨 VPC 网络、NAT 网关、DNAT/SNAT 规则、路由表、路由条目
* 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, TSL 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
## 安装部署
请参考文档[安装部署](https://www.cloudpods.org/docs/getting-started/)选择合适的场景部署
- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone/):在 CentOS 7 或 Debian 10 等发行版里搭建全功能 Cloudpods 服务,可以快速体验**内置私有云**和**多云管理**的功能
- [Kubernetes Helm 安装](https://www.cloudpods.org/zh/docs/quickstart/k8s/):在已有 Kubernetes 集群上通过 Helm 部署一套 Cloudpods CMP 服务,可以体验**多云管理**的功能。
- [Docker Compose 安装](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/):通过 Docker Compose 部署 Cloudpods CMP 服务,可以迅速体验**多云管理**的功能。
- [高可用安装](https://www.cloudpods.org/zh/docs/setup/ha-ce/):在生产环境中使用高可用的方式部署 Cloudpods 服务,包括**内置私有云**和**多云管理**的功能。
## 文档
@@ -101,13 +257,23 @@ Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与
## 联系我们
* 请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
您可以通过如下方式联系我们:
* TG群: [cloudpods](https://t.me/cloudpods_org)
* [服务订阅](https://www.yunion.cn/subscription/index.html)
* 哔哩哔哩: [Cloudpods](https://space.bilibili.com/623431553/)
* 微信: 请扫描如下二维码联系我们
<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
## 版本历史
查看[发布日志](https://www.cloudpods.org/docs/release-notes/)和[Changelog](https://www.cloudpods.org/docs/development/changelog/)
访问[Cloudpods Changelog](https://www.cloudpods.org/zh/docs/changelog/).
## 开发规划
请访问[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/).
## 贡献
@@ -116,7 +282,3 @@ Cloudpods还提供了 **AI 云**一个面向大语言模型LLM推理与
## License
Apache license 2.0,详情请看 [LICENSE](./LICENSE)。
## AI生成文档
[DeepWiki](https://deepwiki.com/yunionio/cloudpods) 提供了对本项目代码详细和全面的AI解读可以参考。

236
README.md
View File

@@ -1,43 +1,208 @@
# Cloudpods
[![CircleCI](https://circleci.com/gh/yunionio/cloudpods.svg?style=svg)](https://circleci.com/gh/yunionio/cloudpods)
[![Build Status](https://travis-ci.com/yunionio/cloudpods.svg?branch=master)](https://travis-ci.com/yunionio/cloudpods/branches)
[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/cloudpods)](https://goreportcard.com/report/github.com/yunionio/cloudpods)
[English](./README.md) | [简体中文](./README-CN.md)
## What is Cloudpods?
<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
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.
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.
## Who needs Cloudpods?
* 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 need a centric portal to access multiple acccounts 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
## Features
See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
### Summary & UI
### AI Cloud
<details>
<summary>
Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
</summary>
<ul>
<li>
<p>Cloud account create form</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
</li>
<li>
<p>Cloud accounts list</p>
<img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
</li>
<li>
<p>Multi public cloud VM list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
</li>
</ul>
</details>
* **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.
<details>
<summary>
A light-weight private cloud that manages KVM hypervisor in scale
</summary>
<ul>
<li>
<p>VM instances list</p>
<img src="https://i.imgur.com/DbkRUoo.png">
</li>
<li>
<p>Create VM instance form</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
</li>
<li>
<p>VNC and SSH login page</p>
<img src="https://i.imgur.com/m0rkeQ3.png">
</li>
<li>
<p>Host list</p>
<img src="https://imgur.com/i509t5a.png">
</li>
<li>
<p>Image template list</p>
<img src="https://imgur.com/UVFLGi2.png">
</li>
<li>
<p>VPC list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
</li>
<li>
<p>Wire list (Classic Network)</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
</li>
<li>
<p>IPsubnet list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
</li>
<li>
<p>Eip list (VPC Network)</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
</li>
<li>
<p>LB list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
</li>
</ul>
</details>
Supported AI workloads:
* AI Inference: Ollama, vLLM, SGLang
* AI Applications: OpenClaw, Dify, ComfyUI, Hermes Agent
<details>
<summary>
A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
</summary>
<ul>
<li>
<p>BareMetal list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/physicalmachinelist.png">
</li>
<li>
<p>Baremetal Management</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
</li>
<li>
<p>Create OS on BareMetal</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
</li>
<li>ARM64 baremetal supported</li>
</ul>
</details>
<details>
<summary>
A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
</summary>
<ul>
<li>
<p>sql, LDAP supported</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
</li>
<li>
<p>Multi-tenancy system, include domain, project, group, user, role, policy</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
</ul>
</details>
<details>
<summary>
VMware vSphere management that enables self-service and automation
</summary>
<ul>
<li>
<p>Add VMware account</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
</li>
<li>
<p>VMware account list</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
</li>
<li>
<p>Automatic creation of wire</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
</li>
<li>
<p>Automatic creation of ipsubnet</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
</li>
<li>
<p>Create a VMware VM instance</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
</li>
</ul>
</details>
<details>
<summary>
Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
</summary>
<ul>
<li>
<p>Enable the SSO login function of the cloud account (aliyun as an example)</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
</li>
<li>
<p>create saml users</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
</li>
<li>
<p>Cloud SSO entry</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
</li>
<li>
<p>Cloud SSO - SSO login user</p>
<img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
</li>
<li>
<p>Sign in to the public cloud platform with SSO</p>
</li>
</ul>
</details>
<details>
<summary>
One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
</summary>
</details>
<details>
<summary>
Multi-cloud image management system that automates image conversion between different cloud providers
</summary>
</details>
### Supported cloud providers
@@ -52,24 +217,15 @@ Supported AI workloads:
* 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
* Alibaba Cloud Aspara
* Huawei HCSO
* Nutanix
* BingoCloud
* OceanBase
* On-premise resources:
* Lightweight private cloud built on KVM
* VMware vSphere vCenter/ESXi
* Proxmox VE
* VMWare vSphere vCenter/ESXi
* Baremetals (IPMI, Redfish API)
* Object storages (Minio, Ceph, XSky)
* NAS (Ceph)
@@ -77,7 +233,7 @@ Supported AI workloads:
### 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
* Load Balancers: instances, listeners, backend groups, backends, TSL certificates, ACLs
* Object Storage: buckets, objects
* NAS: file_systems, access_groups, mount_targets
* RDS: instances, accounts, backups, databases, parameters, privileges
@@ -87,7 +243,11 @@ Supported AI workloads:
## Getting started
Please refer to the document [Getting Started](https://www.cloudpods.org/en/docs/getting-started/) to select the appropriate scenario for installation.
- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone/)Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
- [Kubernetes Helm Installation](https://www.cloudpods.org/zh/docs/quickstart/k8s/)Deploying the Cloudpods CMP service on an existing Kubernetes cluster using Helm and experience the **multi-cloud management** feature.
- [Docker Compose Installation](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)Deploying the Cloudpods CMP service using Docker Compose and quickly experience the **multi-cloud management** feature.
- [High availability installation](https://www.cloudpods.org/zh/docs/setup/ha-ce/)Deploying Cloudpods services in a highly available manner for production environments, including **built-in private cloud** and **multi-cloud management** features.
## Documentations
@@ -102,13 +262,23 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
## Contact
* See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
You may contact us by:
* Telegram: [cloudpods](https://t.me/cloudpods_org)
* [Subscription](https://www.yunion.cn/subscription/index.html)
* Bilibili: [Cloudpods](https://space.bilibili.com/623431553/)
* WeChat: please scan the following QRCode to contact us
<img src="https://www.cloudpods.org/images/contact_me_qr_20210701.png" alt="WeChat QRCode">
## Changelog
See [Release Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
See [Cloudpods Changelog](https://www.cloudpods.org/en/docs/changelog/) for details.
## Roadmap
See [Cloudpods Roadmap](https://www.cloudpods.org/en/docs/roadmap/) for details.
## Contribution
@@ -117,7 +287,3 @@ You are welcome to do any kind of contribution to the project. Please refer to [
## 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.

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}"
@@ -79,8 +73,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 +104,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 +146,5 @@ find $RPM_DIR -type f | while read f; do
mkdir -p "$d"
cp $f $d
done
rm -fr $BUILDROOT

View File

@@ -35,48 +35,14 @@ fi
. $ROOT/vars
case $(uname -m) in
x86_64)
CURRENT_ARCH=amd64
;;
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
BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
rm -rf $BUILDROOT
mkdir -p $BUILDROOT/DEBIAN
mkdir -p $BUILDROOT/$BIN_PATH
@@ -86,90 +52,27 @@ if [ -d $ROOT/root ]; then
cp -rf $ROOT/root/* $BUILDROOT/
fi
echo "Build root ${BUILDROOT}"
echo "Package: yunion-$PKG
case $(uname -m) in
x86_64)
CURRENT_ARCH=amd64
;;
aarch64)
CURRENT_ARCH=arm64
;;
esac
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 +1,3 @@
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,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 @@
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,7 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
# 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
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/playbook /opt/yunion/playbook
COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

View File

@@ -1,31 +1,20 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
LABEL maintainer="Yousong Zhou <zhouyousong@yunionyun.com>"
MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
ENV TZ="UTC"
ENV TZ UTC
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
# 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 sshpass \
&& apk add ansible \
&& apk add py3-pip \
&& apk add tzdata git ca-certificates \
&& rm -rf /var/cache/apk/*
RUN pip3 install pywinrm

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.3.5-1
ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

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.3.5-1
ADD ./_output/alpine-build/bin/apimap /opt/yunion/bin/apimap

View File

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

View File

@@ -1,8 +1,9 @@
#FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
#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/yunionos:v0.1.8-20230221.2 as yunionos
FROM registry.cn-beijing.aliyuncs.com/cloudpods/centos:8 as grub-stage
FROM centos:8 as grub-stage
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-*
@@ -27,9 +28,9 @@ 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
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3-3.13.5
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
MAINTAINER "Zexi Li <zexi.li@icloud.com>"
RUN mkdir -p /opt/yunion/bin
@@ -69,8 +70,6 @@ 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

View File

@@ -1,7 +1,7 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:3.22.2-2
FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
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
RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

View File

@@ -1,24 +1,18 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
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 ipmitool kubectl ceph-common && \
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.3.5-1
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.3.5-1
COPY ./build/cloudid/root/opt/ /opt/
ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

View File

@@ -1,6 +1,6 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
RUN mkdir -p /etc/yunion/data/

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.3.5-1
ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

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.3.5-1
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.3.5-1
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,3 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
ADD ./_output/alpine-build/bin/esxi-agent /opt/yunion/bin/esxi-agent

View File

@@ -0,0 +1,23 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
# openssh-client, for ansible ssh connection
# git, ca-certificates, for fetching ansible roles
RUN set -x \
&& apk update \
&& apk add git \
&& rm -rf /var/cache/apk/*
# install default playbook and install pkg
Run mkdir -p /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_arm64.deb -P /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_amd64.deb -P /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip -P /opt/yunion/ansible-install-pkg
Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_i386.zip -P /opt/yunion/ansible-install-pkg
Run mkdir -p /opt/yunion/playbook
Run mkdir /opt/yunion/playbook/monitor-agent
Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules

View File

@@ -1,5 +1,5 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:v0.0.1
ENV TZ="UTC"
ENV TZ UTC
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

View File

@@ -1,7 +1,5 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
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
RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing

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,8 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.9.0
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.5.0
LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
ENV TZ="UTC"
ENV TZ UTC
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:1.3
LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
ENV TZ="UTC"
ENV TZ UTC
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 +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.3.5-1
ADD ./_output/alpine-build/bin/host-health /opt/yunion/bin/host-health

View File

@@ -1,6 +1,9 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
ENV TZ="UTC"
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/host-image /opt/yunion/bin/host-image
ENV TZ UTC
ADD ./_output/bin/host-image /opt/yunion/bin/host-image
ADD ./_output/bin/.host-image.bin /opt/yunion/bin/.host-image.bin
ADD ./_output/bin/bundles/host-image /opt/yunion/bin/bundles/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.3.5-1
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 +1,8 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.5
FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.4
LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
ENV TZ="UTC"
ENV TZ UTC
RUN mkdir -p /opt/yunion/bin
ADD ./_output/alpine-build/bin/lbagent /opt/yunion/bin/lbagent

View File

@@ -1,12 +1,12 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-2
LABEL maintainer="Jian QIU <qiujian@yunion.cn>"
MAINTAINER "Jian QIU <qiujian@yunion.cn>"
ENV TZ="UTC"
ENV TZ UTC
ENV GOPATH=/root/go
RUN sed -i 's!v3.20/!v3.22/!g' /etc/apk/repositories
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
RUN set -x \
&& apk update \

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.3.5-1
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.3.5-1
COPY ./build/monitor/root/opt/ /opt/
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.3.5-1
COPY ./build/notify/root/opt/ /opt/
ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify

View File

@@ -1,9 +1,9 @@
# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
FROM alpine:3.22.1
FROM alpine:3.13.5
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
ENV TZ UTC
RUN mkdir -p /opt/yunion/bin

View File

@@ -1,8 +1,8 @@
FROM alpine:3.15.4
LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
ENV TZ="UTC"
ENV TZ UTC
RUN mkdir -p /opt/yunion/bin

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.3.5-1
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.3.5-1
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.3.5-1
ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway

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.3.5-1
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.3.5-1
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.1
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,6 +1,10 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
MAINTAINER "Zexi Li <zexi.li@icloud.com>"
# HACK: use v3.14 alpine mirror to upgrade qemu-img
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
RUN apk update && \
apk add --no-cache qemu-img && \

View File

@@ -1,7 +1,7 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-5
FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
LABEL maintainer="Yousong Zhou <zhouyousong@yunion.cn>"
MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
ENV TZ="UTC"
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-1
ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole

View File

@@ -1,10 +1,10 @@
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 UTC
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/*

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.3.5-1
ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf

View File

@@ -1,7 +1,6 @@
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)
DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
debian10-base:
@@ -10,74 +9,58 @@ debian10-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 = v1.1.1
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_VERSION = 20210901
climc-base:
$(DOCKER_BUILDX)/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
docker buildx build --platform linux/arm64,linux/amd64 --push \
-t registry.cn-beijing.aliyuncs.com/yunionio/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_VERSION = v0.2-1
webconsole-base:
$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION_3-22-2) -f ./Dockerfile.webconsole-base .
$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
BAREMETAL_BASE_VERSION = v0.3.9-20260724.0
BAREMETAL_BASE_VERSION = v0.3.9-20230221.2
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_BUILDX)/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 .
FILE_REPO_VERSION = v0.3.3
file-repo:
$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .
LBAGENT_BASE_VERSION = v0.0.5
HOST_IMAGE_VERSION ?= v1.0.2
HOST_IMAGE_NAME = $(REGISTRY)/host-image:$(HOST_IMAGE_VERSION)
host-image:
docker pull $(HOST_IMAGE_NAME)-amd64 --platform amd64
docker pull $(HOST_IMAGE_NAME)-arm64 --platform arm64
docker manifest create $(HOST_IMAGE_NAME) \
$(HOST_IMAGE_NAME)-amd64 \
$(HOST_IMAGE_NAME)-arm64
docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64
docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64
docker manifest push $(HOST_IMAGE_NAME)
LBAGENT_BASE_VERSION = v0.0.3
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:3.16.0-go-1.18.2-0 as build
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN mkdir -p /root/go/src/yunion.io/x/onecloud
@@ -7,11 +7,11 @@ 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.4.0
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
COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host

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
@@ -6,11 +6,13 @@ RUN mkdir -p /root/go/src/yunion.io/x/onecloud
COPY . /root/go/src/yunion.io/x/onecloud
RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
LABEL maintainer="Zexi Li <zexi.li@icloud.com>"
MAINTAINER "Zexi Li <zexi.li@icloud.com>"
RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
# HACK: use v3.14 alpine mirror to upgrade qemu-img
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
RUN apk update && \
apk add --no-cache qemu-img && \

View File

@@ -1,5 +1,5 @@
DESCRIPTION="Yunion Cloud Image Service"
REQUIRES=(
yunion-qemu-4.2.0
yunion-qemu-2.12.1
)

View File

@@ -1,9 +1,9 @@
{{.title}}
策略名称: {{.name}}
触发时间: {{.start_time}}
报警级别: {{.level}}
触发条件: {{.description | unescaped}}
{{if .reason}}报警原因: {{.reason}}
{{end}}报警数量:{{len .matches}}
资源数量:{{len .matches}}
资源名称:{{.resource_name}}
详情地址: {{.web_url}}

View File

@@ -68,7 +68,6 @@
border-bottom: 1px solid #d7d7d7;
}
</style>
{{$match_tags_str := .match_tags_str}}
<body>
<h3 class="title">报警提醒</h3>
<table border="0" cellspacing="0" cellpadding="0" class="table">
@@ -88,19 +87,8 @@
</tr>
<tr>
<td class="td">策略详情:</td>
<td>
{{- range $i, $m := .matches -}}
{{- if $i}}<br/>{{end -}}
{{- $m.condition | unescaped -}}
{{- end -}}
</td>
<td>{{.description}}</td>
</tr>
{{if .reason}}
<tr>
<td class="td">报警原因:</td>
<td>{{.reason}}</td>
</tr>
{{end}}
</table>
<table class="table" style="padding-top: 6px; padding-bottom: 10px;">
<tr>
@@ -120,11 +108,7 @@
<td>名称</td>
<td>IP</td>
<td>平台</td>
<td>指标</td>
<td>触发值</td>
{{if gt (len $match_tags_str) 1}}
<td>标签</td>
{{end}}
</tr>
</thead>
<tbody>
@@ -140,11 +124,7 @@
<td>
{{ index .tags "brand" }}
</td>
<td>{{ $Matche.metric }}</td>
<td>{{ $Matche.value_str }}</td>
{{if gt (len $match_tags_str) 1}}
<td>{{ index $match_tags_str $i }}</td>
{{end}}
<td>{{$Matche.value_str}}</td>
</tr>
{{end}}
</tbody>

View File

@@ -1,9 +1,9 @@
{{.title}}
AlertName: {{.name}}
Time: {{.start_time}}
Level: {{.level}}
TriggerCondition: {{.description | unescaped}}
{{if .reason}}Reason: {{.reason}}
{{end}}AlertCount: {{len .matches}}
ResourceCount: {{len .matches}}
ResourceName: {{.resource_name}}
WebUrl: {{.web_url}}

View File

@@ -68,7 +68,6 @@
border-bottom: 1px solid #d7d7d7;
}
</style>
{{$match_tags_str := .match_tags_str}}
<body>
<h3 class="title">Alert</h3>
<table border="0" cellspacing="0" cellpadding="0" class="table">
@@ -88,19 +87,8 @@
</tr>
<tr>
<td class="td">Strategy details</td>
<td>
{{- range $i, $m := .matches -}}
{{- if $i}}<br/>{{end -}}
{{- $m.condition | unescaped -}}
{{- end -}}
</td>
<td>{{.description}}</td>
</tr>
{{if .reason}}
<tr>
<td class="td">Reason</td>
<td>{{.reason}}</td>
</tr>
{{end}}
</table>
<table class="table" style="padding-top: 6px; padding-bottom: 10px;">
<tr>
@@ -120,11 +108,7 @@
<td>Name</td>
<td>IP</td>
<td>Brand</td>
<td>Metric</td>
<td>Trigger value</td>
{{if gt (len $match_tags_str) 1}}
<td>Tags</td>
{{end}}
</tr>
</thead>
<tbody>
@@ -140,11 +124,7 @@
<td>
{{ index .tags "brand" }}
</td>
<td>{{ $Matche.metric }}</td>
<td>{{ $Matche.value_str }}</td>
{{if gt (len $match_tags_str) 1}}
<td>{{ index $match_tags_str $i }}</td>
{{end}}
<td>{{$Matche.value_str}}</td>
</tr>
{{end}}
</tbody>

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