Added logic for applying default architecture to kubevirt CR status

Signed-off-by: David Aghaian <[email protected]>
KarstenB · May 5, 2023 · fc8a5a4 · fc8a5a4
1 parent 9292b61
commit fc8a5a4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 0 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -17276,6 +17276,9 @@
        "$ref": "#/definitions/v1.KubeVirtCondition"
       }
      },
+     "defaultArchitecture": {
+      "type": "string"
+     },
      "generations": {
       "type": "array",
       "items": {

diff --git a/manifests/generated/kv-resource.yaml b/manifests/generated/kv-resource.yaml
@@ -2804,6 +2804,8 @@ spec:
                   - type
                   type: object
                 type: array
+              defaultArchitecture:
+                type: string
               generations:
                 items:
                   description: GenerationStatus keeps track of the generation for
@@ -5661,6 +5663,8 @@ spec:
                   - type
                   type: object
                 type: array
+              defaultArchitecture:
+                type: string
               generations:
                 items:
                   description: GenerationStatus keeps track of the generation for

diff --git a/pkg/virt-operator/kubevirt.go b/pkg/virt-operator/kubevirt.go
@@ -857,6 +857,9 @@ func (c *KubeVirtController) syncInstallation(kv *v1.KubeVirt) error {
 	// Record the version we're targeting to install
 	config.SetTargetDeploymentConfig(kv)
 
+	// Set the default architecture
+	config.SetDefaultArchitecture(kv)
+
 	if kv.Status.Phase == "" {
 		kv.Status.Phase = v1.KubeVirtPhaseDeploying
 	}

diff --git a/pkg/virt-operator/resource/generate/components/validations_generated.go b/pkg/virt-operator/resource/generate/components/validations_generated.go
@@ -3138,6 +3138,8 @@ var CRDsValidation map[string]string = map[string]string{
             - type
             type: object
           type: array
+        defaultArchitecture:
+          type: string
         generations:
           items:
             description: GenerationStatus keeps track of the generation for a given

diff --git a/pkg/virt-operator/util/config.go b/pkg/virt-operator/util/config.go
@@ -27,6 +27,7 @@ import (
 	"fmt"
 	"reflect"
 	"regexp"
+	"runtime"
 	"sort"
 	"strings"
 
@@ -560,6 +561,17 @@ func (c *KubeVirtDeploymentConfig) SetTargetDeploymentConfig(kv *v1.KubeVirt) er
 	return err
 }
 
+func (c *KubeVirtDeploymentConfig) SetDefaultArchitecture(kv *v1.KubeVirt) error {
+	if kv.Spec.Configuration.ArchitectureConfiguration.DefaultArchitecture != "" {
+		kv.Status.DefaultArchitecture = kv.Spec.Configuration.ArchitectureConfiguration.DefaultArchitecture
+	} else {
+		kv.Spec.Configuration.ArchitectureConfiguration.DefaultArchitecture = runtime.GOARCH
+		kv.Status.DefaultArchitecture = runtime.GOARCH
+	}
+
+	return nil
+}
+
 func (c *KubeVirtDeploymentConfig) SetObservedDeploymentConfig(kv *v1.KubeVirt) error {
 	kv.Status.ObservedKubeVirtVersion = c.GetKubeVirtVersion()
 	kv.Status.ObservedKubeVirtRegistry = c.GetImageRegistry()

diff --git a/staging/src/kubevirt.io/api/core/v1/types.go b/staging/src/kubevirt.io/api/core/v1/types.go
@@ -1917,6 +1917,7 @@ type KubeVirtStatus struct {
 	ObservedDeploymentID                    string              `json:"observedDeploymentID,omitempty" optional:"true"`
 	OutdatedVirtualMachineInstanceWorkloads *int                `json:"outdatedVirtualMachineInstanceWorkloads,omitempty" optional:"true"`
 	ObservedGeneration                      *int64              `json:"observedGeneration,omitempty"`
+	DefaultArchitecture                     string              `json:"defaultArchitecture,omitempty"`
 	// +listType=atomic
 	Generations []GenerationStatus `json:"generations,omitempty" optional:"true"`
 }

diff --git a/staging/src/kubevirt.io/client-go/api/openapi_generated.go b/staging/src/kubevirt.io/client-go/api/openapi_generated.go