instancetypes: Move ENV constants into a more meaningful package

Signed-off-by: Lee Yarwood <[email protected]>
kubevirt · Jul 1, 2024 · 53370cb · 53370cb
1 parent a418d72
commit 53370cb
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 55 deletions.
diff --git a/artifacts/centos/centos_test.go b/artifacts/centos/centos_test.go
@@ -7,8 +7,8 @@ import (
 	. "github.com/onsi/gomega"
 
 	"kubevirt.io/containerdisks/pkg/api"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 	"kubevirt.io/containerdisks/testutil"
 )
 
@@ -29,8 +29,8 @@ var _ = Describe("Centos", func() {
 				ImageArchitecture: "amd64",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.7",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.7",
 			},
 			&api.Metadata{
 				Name:        "centos",
@@ -40,8 +40,8 @@ var _ = Describe("Centos", func() {
 					Username: "centos",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.7",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.7",
 				},
 			},
 		),
@@ -52,8 +52,8 @@ var _ = Describe("Centos", func() {
 				ImageArchitecture: "amd64",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.7",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.7",
 			},
 			&api.Metadata{
 				Name:        "centos",
@@ -63,8 +63,8 @@ var _ = Describe("Centos", func() {
 					Username: "centos",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.7",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.7",
 				},
 			},
 		),

diff --git a/artifacts/centosstream/centos-stream_test.go b/artifacts/centosstream/centos-stream_test.go
@@ -7,8 +7,8 @@ import (
 	. "github.com/onsi/gomega"
 
 	"kubevirt.io/containerdisks/pkg/api"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 	"kubevirt.io/containerdisks/testutil"
 )
 
@@ -35,8 +35,8 @@ var _ = Describe("CentosStream", func() {
 				Username: "centos",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.stream8",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.stream8",
 			},
 			&api.Metadata{
 				Name:        "centos-stream",
@@ -46,8 +46,8 @@ var _ = Describe("CentosStream", func() {
 					Username: "centos",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.stream8",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.stream8",
 				},
 			},
 		),
@@ -62,8 +62,8 @@ var _ = Describe("CentosStream", func() {
 				Username: "centos",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.stream8",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.stream8",
 			},
 			&api.Metadata{
 				Name:        "centos-stream",
@@ -73,8 +73,8 @@ var _ = Describe("CentosStream", func() {
 					Username: "centos",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.stream8",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.stream8",
 				},
 			},
 		),
@@ -89,8 +89,8 @@ var _ = Describe("CentosStream", func() {
 				Username: "cloud-user",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.stream9",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.stream9",
 			},
 			&api.Metadata{
 				Name:        "centos-stream",
@@ -100,8 +100,8 @@ var _ = Describe("CentosStream", func() {
 					Username: "cloud-user",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.stream9",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.stream9",
 				},
 			},
 		),
@@ -116,8 +116,8 @@ var _ = Describe("CentosStream", func() {
 				Username: "cloud-user",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "centos.stream9",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "centos.stream9",
 			},
 			&api.Metadata{
 				Name:        "centos-stream",
@@ -127,8 +127,8 @@ var _ = Describe("CentosStream", func() {
 					Username: "cloud-user",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "centos.stream9",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "centos.stream9",
 				},
 			},
 		),

diff --git a/artifacts/fedora/fedora.go b/artifacts/fedora/fedora.go
@@ -12,9 +12,9 @@ import (
 
 	"kubevirt.io/containerdisks/pkg/api"
 	"kubevirt.io/containerdisks/pkg/architecture"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
 	"kubevirt.io/containerdisks/pkg/http"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 	"kubevirt.io/containerdisks/pkg/tests"
 )
 
@@ -199,8 +199,8 @@ const (
 func (f *fedora) setEnvVariables() {
 	if f.Arch == "x86_64" {
 		f.EnvVariables = map[string]string{
-			common.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
-			common.DefaultPreferenceEnv:   defaultPreferenceX86_64,
+			instancetype.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
+			instancetype.DefaultPreferenceEnv:   defaultPreferenceX86_64,
 		}
 	}
 }

diff --git a/artifacts/fedora/fedora_test.go b/artifacts/fedora/fedora_test.go
@@ -7,9 +7,9 @@ import (
 	. "github.com/onsi/gomega"
 
 	"kubevirt.io/containerdisks/pkg/api"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
 	"kubevirt.io/containerdisks/pkg/http"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 	"kubevirt.io/containerdisks/testutil"
 )
 
@@ -38,8 +38,8 @@ var _ = Describe("Fedora", func() {
 					Username: "fedora",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
-					common.DefaultPreferenceEnv:   defaultPreferenceX86_64,
+					instancetype.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
+					instancetype.DefaultPreferenceEnv:   defaultPreferenceX86_64,
 				},
 			},
 		),
@@ -74,8 +74,8 @@ var _ = Describe("Fedora", func() {
 					Username: "fedora",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
-					common.DefaultPreferenceEnv:   defaultPreferenceX86_64,
+					instancetype.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
+					instancetype.DefaultPreferenceEnv:   defaultPreferenceX86_64,
 				},
 			},
 		),
@@ -106,8 +106,8 @@ var _ = Describe("Fedora", func() {
 					Variant: "Cloud",
 					getter:  &http.HTTPGetter{},
 					EnvVariables: map[string]string{
-						common.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
-						common.DefaultPreferenceEnv:   defaultPreferenceX86_64,
+						instancetype.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
+						instancetype.DefaultPreferenceEnv:   defaultPreferenceX86_64,
 					},
 				},
 				&fedora{
@@ -124,8 +124,8 @@ var _ = Describe("Fedora", func() {
 					Variant: "Cloud",
 					getter:  &http.HTTPGetter{},
 					EnvVariables: map[string]string{
-						common.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
-						common.DefaultPreferenceEnv:   defaultPreferenceX86_64,
+						instancetype.DefaultInstancetypeEnv: defaultInstancetypeX86_64,
+						instancetype.DefaultPreferenceEnv:   defaultPreferenceX86_64,
 					},
 				},
 				&fedora{

diff --git a/artifacts/ubuntu/ubuntu_test.go b/artifacts/ubuntu/ubuntu_test.go
@@ -7,8 +7,8 @@ import (
 	. "github.com/onsi/gomega"
 
 	"kubevirt.io/containerdisks/pkg/api"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 	"kubevirt.io/containerdisks/testutil"
 )
 
@@ -29,8 +29,8 @@ var _ = Describe("Ubuntu", func() {
 				ImageArchitecture: "amd64",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "ubuntu",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "ubuntu",
 			},
 			&api.Metadata{
 				Name:        "ubuntu",
@@ -40,8 +40,8 @@ var _ = Describe("Ubuntu", func() {
 					Username: "ubuntu",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "ubuntu",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "ubuntu",
 				},
 			},
 		),
@@ -52,8 +52,8 @@ var _ = Describe("Ubuntu", func() {
 				ImageArchitecture: "arm64",
 			},
 			map[string]string{
-				common.DefaultInstancetypeEnv: "u1.medium",
-				common.DefaultPreferenceEnv:   "ubuntu",
+				instancetype.DefaultInstancetypeEnv: "u1.medium",
+				instancetype.DefaultPreferenceEnv:   "ubuntu",
 			},
 			&api.Metadata{
 				Name:        "ubuntu",
@@ -63,8 +63,8 @@ var _ = Describe("Ubuntu", func() {
 					Username: "ubuntu",
 				},
 				EnvVariables: map[string]string{
-					common.DefaultInstancetypeEnv: "u1.medium",
-					common.DefaultPreferenceEnv:   "ubuntu",
+					instancetype.DefaultInstancetypeEnv: "u1.medium",
+					instancetype.DefaultPreferenceEnv:   "ubuntu",
 				},
 			},
 		),

diff --git a/cmd/medius/common/registry.go b/cmd/medius/common/registry.go
@@ -11,8 +11,8 @@ import (
 	"kubevirt.io/containerdisks/artifacts/generic"
 	"kubevirt.io/containerdisks/artifacts/ubuntu"
 	"kubevirt.io/containerdisks/pkg/api"
-	"kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 )
 
 type Entry struct {
@@ -107,8 +107,8 @@ func gatherArtifacts(registry *[]Entry, gatherers []api.ArtifactsGatherer) {
 
 func defaultEnvVariables(defaultInstancetype, defaultPreference string) map[string]string {
 	return map[string]string{
-		common.DefaultInstancetypeEnv: defaultInstancetype,
-		common.DefaultPreferenceEnv:   defaultPreference,
+		instancetype.DefaultInstancetypeEnv: defaultInstancetype,
+		instancetype.DefaultPreferenceEnv:   defaultPreference,
 	}
 }
 

diff --git a/cmd/medius/images/verify.go b/cmd/medius/images/verify.go
@@ -23,8 +23,8 @@ import (
 
 	"kubevirt.io/containerdisks/cmd/medius/common"
 	"kubevirt.io/containerdisks/pkg/api"
-	pkgCommon "kubevirt.io/containerdisks/pkg/common"
 	"kubevirt.io/containerdisks/pkg/docs"
+	"kubevirt.io/containerdisks/pkg/instancetype"
 )
 
 func NewVerifyImagesCommand(options *common.Options) *cobra.Command {
@@ -249,14 +249,14 @@ func (v *verifyArtifact) createVMWithEnvVariables() (*v1.VirtualMachine, string,
 	vm := v.artifact.VM(name, imgRef, userData)
 	vm.Spec.Template.Spec.TerminationGracePeriodSeconds = ptr.To[int64](0)
 
-	if instancetype, ok := metadata.EnvVariables[pkgCommon.DefaultInstancetypeEnv]; ok {
+	if instancetypeName, ok := metadata.EnvVariables[instancetype.DefaultInstancetypeEnv]; ok {
 		vm.Spec.Instancetype = &v1.InstancetypeMatcher{
-			Name: instancetype,
+			Name: instancetypeName,
 		}
 		vm.Spec.Template.Spec.Domain.Resources = v1.ResourceRequirements{}
 	}
 
-	if preference, ok := metadata.EnvVariables[pkgCommon.DefaultPreferenceEnv]; ok {
+	if preference, ok := metadata.EnvVariables[instancetype.DefaultPreferenceEnv]; ok {
 		vm.Spec.Preference = &v1.PreferenceMatcher{
 			Name: preference,
 		}

diff --git a/pkg/common/common.go → pkg/instancetype/constants.go b/pkg/common/common.go → pkg/instancetype/constants.go
@@ -1,4 +1,4 @@
-package common
+package instancetype
 
 const (
 	DefaultInstancetypeEnv = "INSTANCETYPE_KUBEVIRT_IO_DEFAULT_INSTANCETYPE"