4.10.1
This commit is contained in:
@@ -50,7 +50,6 @@ func flattenK8CIListItems(list *k8ci.ListK8CI) []map[string]interface{} {
|
||||
"guid": item.GUID,
|
||||
"k8ci_id": item.ID,
|
||||
"lb_image_id": item.LBImageID,
|
||||
"master_driver": item.MasterDriver,
|
||||
"master_image_id": item.MasterImageID,
|
||||
"max_master_count": item.MaxMasterCount,
|
||||
"max_worker_count": item.MaxWorkerCount,
|
||||
@@ -58,7 +57,6 @@ func flattenK8CIListItems(list *k8ci.ListK8CI) []map[string]interface{} {
|
||||
"shared_with": item.SharedWith,
|
||||
"status": item.Status,
|
||||
"version": item.Version,
|
||||
"worker_driver": item.WorkerDriver,
|
||||
"worker_image_id": item.WorkerImageID,
|
||||
}
|
||||
res = append(res, temp)
|
||||
@@ -75,7 +73,6 @@ func flattenK8CIItems(d *schema.ResourceData, data *k8ci.RecordK8CI) error {
|
||||
d.Set("guid", data.GUID)
|
||||
d.Set("k8ci_id", data.ID)
|
||||
d.Set("lb_image_id", data.LBImageID)
|
||||
d.Set("master_driver", data.MasterDriver)
|
||||
d.Set("master_image_id", data.MasterImageID)
|
||||
d.Set("max_master_count", data.MaxMasterCount)
|
||||
d.Set("max_worker_count", data.MaxWorkerCount)
|
||||
@@ -85,7 +82,6 @@ func flattenK8CIItems(d *schema.ResourceData, data *k8ci.RecordK8CI) error {
|
||||
d.Set("shared_with", data.SharedWith)
|
||||
d.Set("status", data.Status)
|
||||
d.Set("version", data.Version)
|
||||
d.Set("worker_driver", data.WorkerDriver)
|
||||
d.Set("worker_image_id", data.WorkerImageID)
|
||||
|
||||
return nil
|
||||
|
||||
@@ -59,8 +59,6 @@ func resourceK8CICreate(ctx context.Context, d *schema.ResourceData, m interface
|
||||
req := k8ci.CreateRequest{
|
||||
Name: d.Get("name").(string),
|
||||
Version: d.Get("version").(string),
|
||||
MasterDriver: d.Get("master_driver").(string),
|
||||
WorkerDriver: d.Get("worker_driver").(string),
|
||||
MaxMasterCount: uint64(d.Get("max_master_count").(int)),
|
||||
MaxWorkerCount: uint64(d.Get("max_worker_count").(int)),
|
||||
MasterImageID: uint64(d.Get("master_image_id").(int)),
|
||||
|
||||
@@ -61,10 +61,6 @@ func dataSourceK8CISchemaMake() map[string]*schema.Schema {
|
||||
Computed: true,
|
||||
Description: "LB Image ID",
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"master_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Computed: true,
|
||||
@@ -137,16 +133,6 @@ func dataSourceK8CIListSchemaMake() map[string]*schema.Schema {
|
||||
Optional: true,
|
||||
Description: "Filter by status",
|
||||
},
|
||||
"worker_driver": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Description: "Filter by worker driver",
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Description: "Filter by master driver",
|
||||
},
|
||||
"network_plugin": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
@@ -206,10 +192,6 @@ func dataSourceK8CIListSchemaMake() map[string]*schema.Schema {
|
||||
Computed: true,
|
||||
Description: "LB Image ID",
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"master_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Computed: true,
|
||||
@@ -243,10 +225,6 @@ func dataSourceK8CIListSchemaMake() map[string]*schema.Schema {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"worker_driver": {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"worker_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Computed: true,
|
||||
@@ -273,16 +251,6 @@ func dataSourceK8CIListDeletedSchemaMake() map[string]*schema.Schema {
|
||||
Optional: true,
|
||||
Description: "Filter by name",
|
||||
},
|
||||
"worker_driver": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Description: "Filter by worker driver",
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Description: "Filter by master driver",
|
||||
},
|
||||
"network_plugin": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
@@ -336,10 +304,6 @@ func dataSourceK8CIListDeletedSchemaMake() map[string]*schema.Schema {
|
||||
Computed: true,
|
||||
Description: "LB Image ID",
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"master_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Computed: true,
|
||||
@@ -373,10 +337,6 @@ func dataSourceK8CIListDeletedSchemaMake() map[string]*schema.Schema {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"worker_driver": {
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
"worker_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Computed: true,
|
||||
@@ -402,10 +362,6 @@ func resourceK8CISchemaMake() map[string]*schema.Schema {
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
},
|
||||
"master_driver": {
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
},
|
||||
"master_image_id": {
|
||||
Type: schema.TypeInt,
|
||||
Required: true,
|
||||
@@ -422,10 +378,6 @@ func resourceK8CISchemaMake() map[string]*schema.Schema {
|
||||
Type: schema.TypeInt,
|
||||
Required: true,
|
||||
},
|
||||
"worker_driver": {
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
},
|
||||
"network_plugins": {
|
||||
Type: schema.TypeList,
|
||||
Required: true,
|
||||
|
||||
@@ -56,12 +56,6 @@ func utilityK8CIListCheckPresence(ctx context.Context, d *schema.ResourceData, m
|
||||
if status, ok := d.GetOk("status"); ok {
|
||||
req.Status = status.(string)
|
||||
}
|
||||
if worker_driver, ok := d.GetOk("worker_driver"); ok {
|
||||
req.WorkerDriver = worker_driver.(string)
|
||||
}
|
||||
if master_driver, ok := d.GetOk("master_driver"); ok {
|
||||
req.MasterDriver = master_driver.(string)
|
||||
}
|
||||
if network_plugin, ok := d.GetOk("network_plugin"); ok {
|
||||
req.NetworkPlugins = network_plugin.(string)
|
||||
}
|
||||
|
||||
@@ -53,12 +53,6 @@ func utilityK8CIListDeletedCheckPresence(ctx context.Context, d *schema.Resource
|
||||
if name, ok := d.GetOk("name"); ok {
|
||||
req.Name = name.(string)
|
||||
}
|
||||
if worker_driver, ok := d.GetOk("worker_driver"); ok {
|
||||
req.WorkerDriver = worker_driver.(string)
|
||||
}
|
||||
if master_driver, ok := d.GetOk("master_driver"); ok {
|
||||
req.MasterDriver = master_driver.(string)
|
||||
}
|
||||
if network_plugin, ok := d.GetOk("network_plugin"); ok {
|
||||
req.NetworkPlugins = network_plugin.(string)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user