opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
534 Commits 27 Branches 687 Tags
f331e3917d7eef2efac7ac1f6df3edd7dafffa26
Commit Graph
380 Commits
Author SHA1 Message Date
邱剑 f331e3917d Merge pull request #208 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-network-list-by-region to release/2.1.0 
* commit 'eb77372794804d7f500c188b28ba24ecda6542b3':
  region: network list by cloudregion
 2018-09-14 13:45:35 +08:00
邱剑 398d51b448 Merge pull request #204 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deployment-label to release/2.1.0 
* commit 'a70fee75301c9c71cc4aed7db1faa3e42f9cf183':
  climc: add name filter to k8s list resource
  climc: k8s-deployment-create support labels
 2018-09-14 13:45:15 +08:00
Zexi Li eb77372794 region: network list by cloudregion 2018-09-14 13:26:43 +08:00
Zexi Li a70fee7530 climc: add name filter to k8s list resource 2018-09-14 13:17:48 +08:00
Qiu Jian 1c427f3c1b 修正rebuildroot后API获取的磁盘列表不完整的问题 2018-09-14 11:18:20 +08:00
Zexi Li 3f8604e549 climc: k8s-deployment-create support labels 2018-09-14 11:01:55 +08:00
Qiu Jian 76231936a9 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913 2018-09-14 01:47:12 +08:00
Qiu Jian 447b0b4a1c undo changes to virtualjointbase.go 2018-09-14 01:42:59 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
李泽玺 5b74e3c8e6 Merge pull request #202 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s.v3 to release/2.1.0 
* commit 'f1fec1b49e2d57456f14a0f7f6db4ceec037a4e2':
  climc: k8s options, code refactor
 2018-09-13 18:24:57 +08:00
Zexi Li f1fec1b49e climc: k8s options, code refactor 2018-09-13 15:04:39 +08:00
邱剑 e5c7ad38d4 Merge pull request #198 in YUNIONIO/onecloud from hotfix/rex-20180912-logclient-objid to release/2.1.0 
* commit '8e2d077f2aa9edd6a4ed45da1c664aef2826388c':
  logserver obj-name 默认值
  logserver objid 默认值
 2018-09-13 12:16:48 +08:00
Qiu Jian 013262e25f 修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability 2018-09-13 12:10:29 +08:00
Yousong Zhou dd38b2b53d validators: add Optional() to IValidator for use in ValidateUpdateData() 2018-09-13 02:06:41 +00:00
Yousong Zhou 51307dedc5 mcclient: options: set details=true when --pending-delete-all is specified 
This is required to get values of pending_deleted field
 2018-09-13 02:06:41 +00:00
Yousong Zhou c66e264aff cloudcommon: virtualresource: show pending_deleted field when queried 2018-09-13 02:06:41 +00:00
Yousong Zhou 2ff04e3d97 cloudcommon: virtualresource: optimize list with --field specified 
No functional change
 2018-09-13 02:06:12 +00:00
Zhang Dongliang 8e2d077f2a logserver obj-name 默认值 2018-09-13 06:11:46 +08:00
Zhang Dongliang a4db1e57c3 logserver objid 默认值 2018-09-12 21:51:09 +08:00
邱剑 7c3dd189ba Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7863b7c0850a1a5d3fd206df87c62ddc8b995bde':
  rbd类型disk需要path路径
 2018-09-12 20:23:28 +08:00
邱剑 7863b7c085 Merge pull request #195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk to release/2.0.0 
* commit '2bd249be264fd828b09924ffd630c6717edb9ffa':
  rbd类型disk需要path路径
 2018-09-12 20:23:27 +08:00
邱剑 329cf9aa5a Merge pull request #196 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-20180912 to release/2.1.0 
* commit '860f6b8c0248f9d3951ae6538ae29d1bf81432a4':
  修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
 2018-09-12 20:06:22 +08:00
邱剑 883f321db7 Merge pull request #194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-choise to release/2.0.0 
* commit 'f3b4b4d3146c9ac5b12bad89eb3d48842984aab0':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
邱剑 48dd7ffe37 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '883f321db71934a59d6b789d3febf7d8f5579def':
  避免只使用第一个storage
 2018-09-12 19:29:08 +08:00
Qiu Jian 860f6b8c02 修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
屈轩 2bd249be26 rbd类型disk需要path路径 2018-09-12 17:08:25 +08:00
屈轩 f3b4b4d314 避免只使用第一个storage 2018-09-12 16:12:47 +08:00
邱剑 f15f944e04 Merge pull request #193 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-cached-image to release/2.1.0 
* commit '063a7c1b00c691ff25223ff1d2f3755a4ae9ae5a':
  避免storagecachedimage数据库操作时panic
 2018-09-12 15:34:32 +08:00
屈轩 063a7c1b00 避免storagecachedimage数据库操作时panic 2018-09-12 15:30:35 +08:00
邱剑 e8cf494496 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5087a48e8e3720f8666972f55946c81c277db2aa':
  避免append同一个network
 2018-09-12 15:21:45 +08:00
屈轩 45c7f7345d 避免append同一个network 2018-09-12 15:17:27 +08:00
邱剑 12b1ef939e Merge pull request #183 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-lockman-enable-inmemery-lock to release/2.1.0 
* commit '0a29b0add76df86c0d5081db809631c22d728bf1':
  remove binary
  增加：镜像缓存加锁，避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
 2018-09-12 14:54:15 +08:00
邱剑 41a806cc8c Merge pull request #189 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-filter-guest-by-eip to release/2.1.0 
* commit '9a8d0e77a9794e9b52d8eb2b77ff8a00ec7da42a':
  增加：guests支持with_eip=true和without_eip=true两个过滤条件
 2018-09-12 14:53:52 +08:00
邱剑 8ff02cfd90 Merge pull request #187 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'af0603d6db82f884552644b3b78f02c8e6ffae56':
  mcclient: options: accomodate time.Time type
  mcclient: options: allow listing all resources including pending_deleted
  validators: rework error handling
  validators: StringMultiChoicesValidator: add test case
 2018-09-12 14:09:24 +08:00
邱剑 2449eb333f Merge pull request #190 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webconsole-shell to release/2.1.0 
* commit '1fba463cda118632c522b4bf3ee5330e2bfd5c4f':
  - use sh to connect k8s pod - ensure required binaries exist
 2018-09-12 14:08:55 +08:00
邱剑 f831c8daea Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '4288cd0c33d7f19efc6862d178765e96a841fc5b':
  climc: server deploy and save-image auto_start
 2018-09-12 14:07:07 +08:00
Zexi Li f90c7dce3f climc: server deploy and save-image auto_start 2018-09-12 13:46:17 +08:00
Zexi Li 1fba463cda - use sh to connect k8s pod 
- ensure required binaries exist
 2018-09-12 11:00:08 +08:00
Yousong Zhou af0603d6db mcclient: options: accomodate time.Time type 2018-09-12 01:26:52 +00:00
Yousong Zhou d98e3b325f mcclient: options: allow listing all resources including pending_deleted 2018-09-12 01:26:52 +00:00
Yousong Zhou cc70be165f validators: rework error handling 
- Return httperrors by default (return ValidateError when testing)
 - Special casing sql.ErrNoRows for model not found
 2018-09-12 01:26:52 +00:00
Yousong Zhou 2b691c5dbd validators: StringMultiChoicesValidator: add test case 2018-09-12 01:26:52 +00:00
Qiu Jian 9a8d0e77a9 增加：guests支持with_eip=true和without_eip=true两个过滤条件 2018-09-12 02:02:06 +08:00
邱剑 a1b67853de Merge pull request #175 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deploy-from-file to release/2.1.0 
* commit '32adce2d02d4cc820ccafc9a0cfb4f6227ec5b15':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:06 +08:00
邱剑 e2b3cbd1d0 Merge pull request #185 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cloud-region-usage to release/2.1.0 
* commit 'c860812e9179dbeb1c3dbf26628e5dddd1f05566':
  region: cloudregion usage
 2018-09-11 21:53:57 +08:00
邱剑 5516983e02 Merge pull request #184 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-sync to release/2.1.0 
* commit 'b7be94f2d265c93df941fa98a35a15ca5b6f8154':
  同步云盘名称
 2018-09-11 21:52:20 +08:00
Qiu Jian 0a29b0add7 remove binary 2018-09-11 21:51:10 +08:00
Qiu Jian a6d8ee1173 增加：镜像缓存加锁，避免批量创建时重复上传镜像 2018-09-11 21:40:31 +08:00
wanyaoqi 07ef04aae2 support filter attached disk 2018-09-11 19:44:00 +08:00
Zexi Li c860812e91 region: cloudregion usage 2018-09-11 18:15:40 +08:00