refactor

Signed-off-by: Yaroslav Borbat <[email protected]>

Author: yaroslavborbat

api/client/kubeclient/client.go

@@ -75,7 +75,7 @@ func (c client) VirtualMachines(namespace string) virtualizationv1alpha2.Virtual
 		restClient:              c.restClient,
 		config:                  c.config,
 		namespace:               namespace,
-		resource:                "virtualmachines",
+		resource:                "apivirtualmachines",
 	}
 }
 

api/scripts/update-codegen.sh

@@ -49,6 +49,8 @@ function generate::subresources {
         --boilerplate "${SCRIPT_DIR}/boilerplate.go.txt" \
         "${API_ROOT}/subresources"
 
+    # "${THIS_PKG}/subresources/v1alpha2" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version"
+    # TODO: replace packages when legacyVMStorage is removed
     go tool openapi-gen                                                                           \
         --output-pkg "openapi"                                                                    \
         --output-dir "${ROOT}/images/virtualization-artifact/pkg/apiserver/api/generated/openapi" \

api/subresources/register.go

@@ -51,6 +51,7 @@ var (
 // TODO: move types virtv2 to pkg/apiserver/api/install
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
+		&APIVirtualMachine{},
 		&VirtualMachineConsole{},
 		&VirtualMachineVNC{},
 		&VirtualMachinePortForward{},

api/subresources/types.go

@@ -20,6 +20,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type APIVirtualMachine struct {
+	metav1.TypeMeta
+	metav1.ObjectMeta
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type VirtualMachineConsole struct {

api/subresources/v1alpha2/register.go

@@ -51,6 +51,7 @@ var (
 
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
+		&APIVirtualMachine{},
 		&VirtualMachineConsole{},
 		&VirtualMachineVNC{},
 		&VirtualMachinePortForward{},

api/subresources/v1alpha2/types.go

@@ -18,6 +18,12 @@ package v1alpha2
 
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type APIVirtualMachine struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:conversion-gen:explicit-from=net/url.Values
 

api/subresources/v1alpha2/zz_generated.conversion.go

@@ -3,7 +3,7 @@ firmware:
   libvirt: v10.9.0
   edk2: stable202411
 core:
-  3p-kubevirt: v1.3.1-v12n.12
+  3p-kubevirt: use-virtualization-api # v1.3.1-v12n.9
   3p-containerized-data-importer: v1.60.3-v12n.10
   distribution: 2.8.3
 package: