Commit Graph
251 Commits
Author SHA1 Message Date
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
2018-11-10 15:30:31 +08:00
屈轩 84559581d4 避免调度到Azure经典类型主机上 2018-11-10 15:28:22 +08:00
李泽玺 bd548462a4 Merge pull request #452 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-extender to release/2.3.0
* commit '95f49ead841ef7918c5d7d7a96f05806dc13902f':
  scheduler: k8s scheduler extender
2018-11-10 14:32:43 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:05 +08:00
Zexi Li 95f49ead84 scheduler: k8s scheduler extender 2018-11-10 13:27:00 +08:00
邱剑 fb6d1082af Automatic merge from release/2.2.0 -> release/2.3.0
* commit '182db4cd4e16a384be25ad05ffbe63df2a7f3efa':
  跟随主机创建的磁盘,跟随主机删除
  fix: reverseproxy out of fds
2018-11-09 20:40:20 +08:00
屈轩 d73fd87227 跟随主机创建的磁盘,跟随主机删除 2018-11-09 20:30:56 +08:00
Yousong Zhou 9388748e45 pkg: httputils: ParseJSONResponse(): rewrite for clearness
Make it more clear that it's possible the function can return with
body==nil and err==nil
2018-11-08 15:36:24 +00:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +08:00
Qiu Jian 388b793490 修正:增加owner级别权限,放置普通用户可以访问系统资源 2018-11-08 01:36:19 +08:00
邱剑 ad60672977 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '7fb6e0e15ed2d103b81f92ad37243032490a5553':
  修复同步阿里云资源时出现重复资源问题
2018-11-03 19:58:11 +08:00
邱剑 b399237169 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'ad60672977714ed96738f91aef365e96d971050a':
  修复同步阿里云资源时出现重复资源问题
2018-11-03 19:58:11 +08:00
屈轩 09d9990640 修复同步阿里云资源时出现重复资源问题 2018-11-03 18:33:34 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
Qiu Jian 7e463a4644 hack: scheduler ping/version escape auth 2018-11-03 10:21:19 +08:00
邱剑 926fc3a3dd Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
  改进:rpc支持
  make fmt
  remove slice nil check
  fix quota check rbac check logic
  增加 usages get 和 quotas get/update 的RBAC检查
  JointModel support
  改进:model资源支持rbac认证,需要打开enable_rbac选项,默认关闭。非model资源还不支持
2018-10-29 22:22:31 +08:00
Qiu Jian 5a8bd48485 改进:rpc支持 2018-10-29 22:10:00 +08:00
邱剑 88db5a8901 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'bf744d8429dfed9e905ad2b862e73e408f45e1f4':
  snapshot fixs
2018-10-29 19:54:32 +08:00
wanyaoqi 724169ef44 snapshot fixs 2018-10-29 19:41:43 +08:00
邱剑 a4dfaf2b23 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'cf095f2d9dca164f8b4013e6041d282f00705741':
  避免host name使用中文
2018-10-29 16:58:53 +08:00
屈轩 1fbb35ae67 避免host name使用中文 2018-10-29 15:47:59 +08:00
屈轩 d525cea916 避免instance 缓存disk数据 2018-10-29 14:25:31 +08:00
屈轩 2197d918e6 解决冲突 2018-10-29 14:01:10 +08:00
邱剑 b32efafe17 Merge pull request #367 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rewrite-azure to release/2.2.0
* commit 'e2b4f45dca1a6ec21295adb44962840476da31c1':
  避免异步任务一直不返回
  删除不必要的代码
  rebase release/2.2.0
  减少API调用次数
  重写Azure
2018-10-29 11:00:12 +08:00
邱剑 37978fc883 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '767626c3f1019098a5ed476392bed36f4aac1d4f':
  静态配置经纬度信息
2018-10-27 19:34:20 +08:00
Qiu Jian 11dddd8ad3 remove slice nil check 2018-10-27 19:12:38 +08:00
屈轩 1c8fec9446 静态配置经纬度信息 2018-10-27 18:15:37 +08:00
屈轩 e2b4f45dca 避免异步任务一直不返回 2018-10-27 16:16:34 +08:00
屈轩 0962456647 删除不必要的代码 2018-10-27 15:19:16 +08:00
Qiu Jian d0fef591f1 改进:model资源支持rbac认证,需要打开enable_rbac选项,默认关闭。非model资源还不支持 2018-10-27 14:34:09 +08:00
邱剑 93ddd2b26f Merge pull request #356 in YUNIONIO/onecloud from feature/rex-20181024-add-websocket-module to release/2.3.0
* commit '49d7bcb8f9cbd61f9461eac2b1784048a3f0c859':
  go fmt
  在 onecloud 环境增加 websocket client 的接口
  移除不需要的 import
  删除不需要的代码
  为websocket服务注册resource 模块、climc 命令行接口
2018-10-26 20:16:13 +08:00
屈轩 73ed665bbd rebase release/2.2.0 2018-10-25 20:40:19 +08:00
屈轩 0089cc17be Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into hotfix/qx-rewrite-azure 2018-10-25 20:38:45 +08:00
屈轩 f63ee0b716 减少API调用次数 2018-10-25 20:35:18 +08:00
Zhang Dongliang 49d7bcb8f9 go fmt 2018-10-25 19:36:26 +08:00
Zhang Dongliang 743655fca3 在 onecloud 环境增加 websocket client 的接口 2018-10-25 19:30:06 +08:00
屈轩 9971d6cf88 重写Azure 2018-10-24 10:30:24 +08:00
Qiu Jian 1cb96585bc Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181023-2.3.0 2018-10-23 22:31:47 +08:00
wanyaoqi a3a5259505 add disk type in snapshots 2018-10-23 22:07:04 +08:00
Yousong Zhou 4f0b4ec7c9 govet: treewide
# yunion.io/x/onecloud/pkg/lbagent/utils
  pkg/lbagent/utils/configdir.go:134: unreachable code
  # yunion.io/x/onecloud/pkg/mcclient/modules
  pkg/mcclient/modules/mod_domains.go:243: Sprintf format %s has arg len(result.Data) of wrong type int
  # yunion.io/x/onecloud/pkg/lbagent/models
  pkg/lbagent/models/reflect.go:68: Errorf call needs 1 arg but has 2 args
  # yunion.io/x/onecloud/pkg/cloudcommon/db
  pkg/cloudcommon/db/db_dispatcher.go:1064: Sprintf call needs 1 arg but has 2 args
  # yunion.io/x/onecloud/pkg/scheduler/core
  pkg/scheduler/core/context.go:579: assignment copies lock value to dataItem.Networks: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/scheduler/data_manager
  pkg/scheduler/data_manager/candidate_manager.go:353: Errorf format %#v reads arg #1, but call has 0 args
  # yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/baremetal
  pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go:145: call of u.SetFiltedData copies lock value: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/guest
  pkg/scheduler/algorithm/predicates/guest/network_predicate.go:207: call of u.SetFiltedData copies lock value: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/cloudcommon/db/lockman
  pkg/cloudcommon/db/lockman/inmemory_test.go:49: loop variable id captured by func literal
  # yunion.io/x/onecloud/pkg/util/seclib2
  pkg/util/seclib2/seclib.go:56: unreachable code
  # yunion.io/x/onecloud/cmd/climc/shell
  cmd/climc/shell/alarmlogs.go:46: result of fmt.Errorf call not used
  # yunion.io/x/onecloud/pkg/util/aliyun
  pkg/util/aliyun/disk.go:267: Errorf format %s has arg size of wrong type int64
  pkg/util/aliyun/image.go:93: Sprintf format %s reads arg #1, but call has 0 args
  # yunion.io/x/onecloud/pkg/compute/models
  pkg/compute/models/cachedimages.go:161: Errorf format %d has arg imgId of wrong type string
  pkg/compute/models/disks.go:1274: Errorln call has possible formatting directive %s
  pkg/compute/models/guests.go:1749: Infof format %s has arg self.IsOwner(userCred) of wrong type bool
  pkg/compute/models/hosts.go:1134: Debugf format %s has arg storage of wrong type *models.SStorage
  pkg/compute/models/hosts.go:1135: Debugf format %s has arg self of wrong type *models.SHost
  # yunion.io/x/onecloud/pkg/util/azure
  pkg/util/azure/instance.go:536: unreachable code
  pkg/util/azure/network.go:128: unreachable code
  pkg/util/azure/storage.go:69: unreachable code
  # yunion.io/x/onecloud/pkg/util/azure/shell
  pkg/util/azure/shell/disk.go:20: unreachable code
  pkg/util/azure/shell/network.go:55: unreachable code
2018-10-22 12:33:41 +00:00
Yousong Zhou 5dd5767d94 govet: treewide struct tag fix
govet complains of the form

	struct field tag `required:true` not compatible with reflect.StructTag.Get: bad syntax for struct tag value
2018-10-22 12:31:12 +00:00
Qiu Jian 75752dc915 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-1-2.3.0
Conflicts:
	pkg/compute/models/guests.go
2018-10-22 15:27:31 +08:00
Zhang Dongliang 3d7723499d 云服务器关联安全组后,操作日志记录内容应该是“关联安全组” 2018-10-22 15:20:56 +08:00
Qiu Jian 73eff73289 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-2.3.0
Conflicts:
	pkg/httperrors/httperrors.go
2018-10-22 12:29:07 +08:00
Qiu Jian 4d1d4e56fd 修正:worker timeout之后需要从worker
manager中移除,不再占用worker的数量限额,否则timeout之后,并不能解决整个服务被卡住的问题
2018-10-22 01:38:52 +08:00
Zhang Dongliang 06f588ad64 go fmt 2018-10-19 16:08:11 +08:00
邱剑 d45e19231a Merge pull request #298 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-dynamic-schedtag to release/2.3.0
* commit 'cda404573cef53326e119dadca51dced877c9835':
  condition parser support in, len, strlen methods
  minor updates
  upgrade to go1.11
  minor updates
  cloudprovider show tenant info
  fix: scheduler cloudprovider ProjectId typo
  fix fmt
  scheduler: dynamicschedtags support
  parser improvement
  Minor fixes
  minor fixes
  Add manager_tenant_id to host details
  修正:cloudprovider/cloudacount的代码recode
  改进:增加schedpolicy和dynamicschedtag支持
2018-10-19 11:43:11 +08:00
Qiu Jian cda404573c condition parser support in, len, strlen methods 2018-10-19 02:06:07 +08:00
Qiu Jian 0ee3de5ef8 minor updates 2018-10-19 00:01:18 +08:00