opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

climc: deploy k8s cluster on kinds of hypervisor

Browse Source
This commit is contained in:
Zexi
2019-07-03 19:58:01 +08:00
parent 2f7086e17b
commit 74d55a1160
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/k8s/machine.go
+1 -1
View File
@@ -24,7 +24,7 @@ var (
func init() {
KubeMachines = NewResourceManager("kubemachine", "kubemachines",
NewResourceCols("role", "first_node", "cluster", "provider", "resource_type", "status", "address"),
NewResourceCols("role", "first_node", "cluster", "provider", "resource_type", "status", "address", "hypervisor"),
NewColumns())
modules.Register(KubeMachines)
}
pkg/mcclient/options/k8s/cluster.go
+9 -7
View File
@@ -73,11 +73,12 @@ func (o ClusterCreateOptions) Params() *jsonutils.JSONDict {
}
type AddMachineOptions struct {
Machine []string `help:"Machine create desc, e.g. host01:baremetal:controlplane"`
MachineNet string `help:"Machine net config"`
MachineDisk string `help:"Machine root disk size, e.g. 100G"`
MachineCpu int `help:"Machine cpu count"`
MachineMemory string `help:"Machine memory size, e.g. 1G"`
Machine []string `help:"Machine create desc, e.g. host01:baremetal:controlplane"`
MachineNet string `help:"Machine net config"`
MachineDisk string `help:"Machine root disk size, e.g. 100G"`
MachineCpu int `help:"Machine cpu count"`
MachineMemory string `help:"Machine memory size, e.g. 1G"`
MachineHypervisor string `help:"Machine hypervisor, e.g. kvm, openstack"`
}
type KubeClusterCreateOptions struct {
@@ -95,7 +96,7 @@ type KubeClusterCreateOptions struct {
AddMachineOptions
}
func parseMachineDesc(desc string, disk string, netConf string, ncpu int, memorySize string) (*MachineCreateOptions, error) {
func parseMachineDesc(desc string, disk string, netConf string, ncpu int, memorySize string, hypervisor string) (*MachineCreateOptions, error) {
matchType := func(p string) bool {
switch p {
case "baremetal", "vm":
@@ -133,6 +134,7 @@ func parseMachineDesc(desc string, disk string, netConf string, ncpu int, memory
mo.Cpu = ncpu
mo.Memory = memorySize
mo.Net = netConf
mo.Hypervisor = hypervisor
return mo, nil
}
@@ -254,7 +256,7 @@ func (o AddMachineOptions) Params() (*jsonutils.JSONArray, error) {
return machineObjs, nil
}
for _, m := range o.Machine {
machine, err := parseMachineDesc(m, o.MachineDisk, o.MachineNet, o.MachineCpu, o.MachineMemory)
machine, err := parseMachineDesc(m, o.MachineDisk, o.MachineNet, o.MachineCpu, o.MachineMemory, o.MachineHypervisor)
if err != nil {
return nil, err
}
pkg/mcclient/options/k8s/machine.go
+11 -9
View File
@@ -24,15 +24,16 @@ import (
)
type MachineCreateOptions struct {
CLUSTER string `help:"Cluster id"`
ROLE string `help:"Machine role" choices:"node|controlplane"`
Type string `help:"Resource type" choices:"vm|baremetal" json:"resource_type"`
Instance string `help:"VM or host instance id" json:"resource_id"`
Name string `help:"Name of node"`
Disk string `help:"VM root disk size, e.g. 100G"`
Net string `help:"VM network config"`
Cpu int `help:"VM cpu count"`
Memory string `help:"VM memory size, e.g. 1G"`
CLUSTER string `help:"Cluster id"`
ROLE string `help:"Machine role" choices:"node|controlplane"`
Type string `help:"Resource type" choices:"vm|baremetal" json:"resource_type"`
Instance string `help:"VM or host instance id" json:"resource_id"`
Name string `help:"Name of node"`
Disk string `help:"VM root disk size, e.g. 100G"`
Net string `help:"VM network config"`
Cpu int `help:"VM cpu count"`
Memory string `help:"VM memory size, e.g. 1G"`
Hypervisor string `help:"VM hypervisor"`
}
func (o MachineCreateOptions) Params() (*jsonutils.JSONDict, error) {
@@ -78,6 +79,7 @@ func (o MachineCreateOptions) Params() (*jsonutils.JSONDict, error) {
if o.Cpu > 0 {
vmConfig.Add(jsonutils.NewInt(int64(o.Cpu)), "vcpu_count")
}
vmConfig.Add(jsonutils.NewString(o.Hypervisor), "hypervisor")
params.Add(vmConfig, "config", "vm")
return params, nil
}
pkg/mcclient/options/servers.go
+1 -1
View File
@@ -39,7 +39,7 @@ type ServerListOptions struct {
Gpu *bool `help:"Show gpu servers"`
Secgroup string `help:"Secgroup ID or Name"`
AdminSecgroup string `help:"AdminSecgroup ID or Name"`
Hypervisor string `help:"Show server of hypervisor" choices:"kvm|esxi|container|baremetal|aliyun|azure|aws|huawei|ucloud|zstack"`
Hypervisor string `help:"Show server of hypervisor" choices:"kvm|esxi|container|baremetal|aliyun|azure|aws|huawei|ucloud|zstack|openstack"`
Region string `help:"Show servers in cloudregion"`
WithEip *bool `help:"Show Servers with EIP"`
WithoutEip *bool `help:"Show Servers without EIP"`