v1.12.2

pkg/cloudbroker/k8ci/create.go

@@ -26,24 +26,10 @@ type CreateRequest struct {
 	// Required: true
 	MasterImageID uint64 `url:"masterImageId" json:"masterImageId" validate:"required"`
 
-	// Compute driver
-	// Should be one of:
-	//	- KVM_X86
-	//	- etc
-	// Required: true
-	MasterDriver string `url:"masterDriver" json:"masterDriver" validate:"driver"`
-
 	// Image ID for worker K8S node
 	// Required: true
 	WorkerImageID uint64 `url:"workerImageId" json:"workerImageId" validate:"required"`
 
-	// Compute driver
-	// Should be one of
-	//	- KVM_X86
-	//	- etc
-	// Required: true
-	WorkerDriver string `url:"workerDriver" json:"workerDriver" validate:"driver"`
-
 	// List of account IDs, which have access to this item.
 	// If empty, any account has access
 	// Required: false

pkg/cloudbroker/k8ci/filter_test.go

@@ -12,7 +12,6 @@ var k8ciItems = ListK8CI{
 				GUID:           1,
 				ID:             1,
 				LBImageID:      5,
-				MasterDriver:   "KVM_X86",
 				MasterImageID:  120,
 				MaxMasterCount: 2,
 				MaxWorkerCount: 3,
@@ -20,7 +19,6 @@ var k8ciItems = ListK8CI{
 				SharedWith:     []uint64{},
 				Status:         "ENABLED",
 				Version:        "1",
-				WorkerDriver:   "KVM_X86",
 				WorkerImageID:  120,
 			},
 		},
@@ -32,7 +30,6 @@ var k8ciItems = ListK8CI{
 				GUID:           2,
 				ID:             2,
 				LBImageID:      10,
-				MasterDriver:   "KVM_X86",
 				MasterImageID:  121,
 				MaxMasterCount: 3,
 				MaxWorkerCount: 5,
@@ -40,7 +37,6 @@ var k8ciItems = ListK8CI{
 				SharedWith:     []uint64{},
 				Status:         "DISABLED",
 				Version:        "2",
-				WorkerDriver:   "KVM_X86",
 				WorkerImageID:  121,
 			},
 		},
@@ -52,7 +48,6 @@ var k8ciItems = ListK8CI{
 				GUID:           3,
 				ID:             3,
 				LBImageID:      12,
-				MasterDriver:   "KVM_X86",
 				MasterImageID:  98,
 				MaxMasterCount: 5,
 				MaxWorkerCount: 9,
@@ -60,7 +55,6 @@ var k8ciItems = ListK8CI{
 				SharedWith:     []uint64{},
 				Status:         "ENABLED",
 				Version:        "3",
-				WorkerDriver:   "KVM_X86",
 				WorkerImageID:  98,
 			},
 		},

pkg/cloudbroker/k8ci/list.go

@@ -22,14 +22,6 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
-	// Find by worker driver
-	// Required: false
-	WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
-
-	// Find by master driver
-	// Required: false
-	MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
-
 	// Find by network plugin
 	// Required: false
 	NetworkPlugins string `url:"netPlugins,omitempty" json:"masterDrnetPluginsiver,omitempty"`

pkg/cloudbroker/k8ci/list_deleted.go

@@ -18,14 +18,6 @@ type ListDeletedRequest struct {
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
 
-	// Find by worker driver
-	// Required: false
-	WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
-
-	// Find by master driver
-	// Required: false
-	MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
-
 	// Find by network plugin
 	// Required: false
 	NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`

pkg/cloudbroker/k8ci/models.go

@@ -34,9 +34,6 @@ type RecordK8CIList struct {
 	// Load balancer image ID
 	LBImageID uint64 `json:"lbImageId"`
 
-	// Master driver
-	MasterDriver string `json:"masterDriver"`
-
 	// Master image ID
 	MasterImageID uint64 `json:"masterImageId"`
 
@@ -58,14 +55,11 @@ type RecordK8CIList struct {
 	// Version
 	Version string `json:"version"`
 
-	// Worker driver
-	WorkerDriver string `json:"workerDriver"`
-
 	// Worker image ID
 	WorkerImageID uint64 `json:"workerImageId"`
 }
 
-// Detailed information about K8CI 
+// Detailed information about K8CI
 type RecordK8CI struct {
 	// Description
 	Description string `json:"desc"`
@@ -82,12 +76,12 @@ type RecordK8CI struct {
 	// Load balancer image ID
 	LBImageID uint64 `json:"lbImageId"`
 
-	// Master driver
-	MasterDriver string `json:"masterDriver"`
-
 	// Master image ID
 	MasterImageID uint64 `json:"masterImageId"`
 
+	// Master driver
+	MasterDriver string `json:"masterDriver"`
+
 	// Max master count
 	MaxMasterCount uint64 `json:"maxMasterCount"`
 
@@ -112,9 +106,9 @@ type RecordK8CI struct {
 	// Version
 	Version string `json:"version"`
 
-	// Worker driver
-	WorkerDriver string `json:"workerDriver"`
-
 	// Worker image ID
 	WorkerImageID uint64 `json:"workerImageId"`
+
+	// Worker driver
+	WorkerDriver string `json:"workerDriver"`
 }