fix

Signed-off-by: yaroslavborbat <[email protected]>

api/client/kubeclient/client.go

@@ -35,9 +35,8 @@ import (
 )
 
 var (
-	Scheme         = runtime.NewScheme()
-	Codecs         = serializer.NewCodecFactory(Scheme)
-	ParameterCodec = runtime.NewParameterCodec(Scheme)
+	Scheme = runtime.NewScheme()
+	Codecs = serializer.NewCodecFactory(Scheme)
 )
 
 func init() {

api/client/kubeclient/vm.go

@@ -30,7 +30,6 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
 	virtv1 "kubevirt.io/api/core/v1"
 
@@ -153,27 +152,24 @@ func (v vm) Migrate(ctx context.Context, name string, opts v1alpha2.VirtualMachi
 
 func (v vm) AddVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineAddVolume) error {
 	path := fmt.Sprintf(subresourceURLTpl, v.namespace, v.resource, name, "addvolume")
-	opts.TypeMeta = metav1.TypeMeta{
-		Kind:       v1alpha2.VirtualMachineAddVolumeKind,
-		APIVersion: v1alpha2.SchemeGroupVersion.String(),
-	}
-	return v.doRequest(ctx, path, &opts)
+	return v.restClient.
+		Put().
+		AbsPath(path).
+		Param("name", opts.Name).
+		Param("volumeKind", opts.VolumeKind).
+		Param("pvcName", opts.PVCName).
+		Param("image", opts.Image).
+		Param("isCdrom", strconv.FormatBool(opts.IsCdrom)).
+		Do(ctx).
+		Error()
 }
 
 func (v vm) RemoveVolume(ctx context.Context, name string, opts v1alpha2.VirtualMachineRemoveVolume) error {
 	path := fmt.Sprintf(subresourceURLTpl, v.namespace, v.resource, name, "removevolume")
-	opts.TypeMeta = metav1.TypeMeta{
-		Kind:       v1alpha2.VirtualMachineRemoveVolumeKind,
-		APIVersion: v1alpha2.SchemeGroupVersion.String(),
-	}
-	return v.doRequest(ctx, path, &opts)
-}
-
-func (v vm) doRequest(ctx context.Context, path string, obj runtime.Object) error {
 	return v.restClient.
 		Put().
 		AbsPath(path).
-		VersionedParams(obj, ParameterCodec).
+		Param("name", opts.Name).
 		Do(ctx).
 		Error()
 }

api/subresources/v1alpha2/types.go

@@ -18,11 +18,6 @@ package v1alpha2
 
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-const (
-	VirtualMachineAddVolumeKind    = "VirtualMachineAddVolume"
-	VirtualMachineRemoveVolumeKind = "VirtualMachineRemoveVolume"
-)
-
 // +genclient
 // +genclient:readonly
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object