Skip to content

Commit

Permalink
Merge pull request kubevirt#13765 from enp0s3/virt-operator-clean-unu…
Browse files Browse the repository at this point in the history 
…sed-return

[virt-operator]: clean up unused returned values
  • Loading branch information
@kubevirt-bot
kubevirt-bot authored Jan 26, 2025
2 parents a1a1e65 + ba1799d commit e847380
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 93 deletions.
36 changes: 16 additions & 20 deletions pkg/virt-operator/kubevirt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1218,16 +1218,16 @@ func (k *KubeVirtTestData) addAllWithExclusionMap(config *util.KubeVirtDeploymen
all = append(all, components.NewApiServerService(NAMESPACE))
all = append(all, components.NewExportProxyService(NAMESPACE))

apiDeployment, _ := getDefaultVirtApiDeployment(NAMESPACE, config)
apiDeployment := getDefaultVirtApiDeployment(NAMESPACE, config)
apiDeploymentPdb := components.NewPodDisruptionBudgetForDeployment(apiDeployment)
controller, _ := getDefaultVirtControllerDeployment(NAMESPACE, config)
controller := getDefaultVirtControllerDeployment(NAMESPACE, config)
controllerPdb := components.NewPodDisruptionBudgetForDeployment(controller)

handler, _ := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
handler := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
all = append(all, apiDeployment, apiDeploymentPdb, controller, controllerPdb, handler)

if exportProxyEnabled(kv) {
exportProxy, _ := getDefaultExportProxyDeployment(NAMESPACE, config)
exportProxy := getDefaultExportProxyDeployment(NAMESPACE, config)
exportProxyPdb := components.NewPodDisruptionBudgetForDeployment(exportProxy)
route := components.NewExportProxyRoute(NAMESPACE)
all = append(all, exportProxy, exportProxyPdb, route)
Expand Down Expand Up @@ -1335,8 +1335,7 @@ func (k *KubeVirtTestData) addAllButHandler(config *util.KubeVirtDeploymentConfi
}

func (k *KubeVirtTestData) addVirtHandler(config *util.KubeVirtDeploymentConfig, kv *v1.KubeVirt) {
handler, err := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
Expect(err).ToNot(HaveOccurred())
handler := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)

c, _ := apply.NewCustomizer(kv.Spec.CustomizeComponents)

Expand Down Expand Up @@ -1556,7 +1555,7 @@ func (k *KubeVirtTestData) addPodsWithIndividualConfigs(config *util.KubeVirtDep
// virt-controller
// virt-handler
var deployments []*appsv1.Deployment
apiDeployment, _ := getDefaultVirtApiDeployment(NAMESPACE, config)
apiDeployment := getDefaultVirtApiDeployment(NAMESPACE, config)

pod := &k8sv1.Pod{
ObjectMeta: apiDeployment.Spec.Template.ObjectMeta,
Expand All @@ -1573,7 +1572,7 @@ func (k *KubeVirtTestData) addPodsWithIndividualConfigs(config *util.KubeVirtDep
k.addPod(pod)
deployments = append(deployments, apiDeployment)

controller, _ := getDefaultVirtControllerDeployment(NAMESPACE, config)
controller := getDefaultVirtControllerDeployment(NAMESPACE, config)
pod = &k8sv1.Pod{
ObjectMeta: controller.Spec.Template.ObjectMeta,
Spec: controller.Spec.Template.Spec,
Expand All @@ -1589,7 +1588,7 @@ func (k *KubeVirtTestData) addPodsWithIndividualConfigs(config *util.KubeVirtDep
k.addPod(pod)
deployments = append(deployments, controller)

handler, _ := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
handler := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
pod = &k8sv1.Pod{
ObjectMeta: handler.Spec.Template.ObjectMeta,
Spec: handler.Spec.Template.Spec,
Expand All @@ -1607,7 +1606,7 @@ func (k *KubeVirtTestData) addPodsWithIndividualConfigs(config *util.KubeVirtDep
k.addPod(pod)

if exportProxyEnabled(kv) {
exportProxy, _ := getDefaultExportProxyDeployment(NAMESPACE, config)
exportProxy := getDefaultExportProxyDeployment(NAMESPACE, config)
pod = &k8sv1.Pod{
ObjectMeta: exportProxy.Spec.Template.ObjectMeta,
Spec: exportProxy.Spec.Template.Spec,
Expand Down Expand Up @@ -2170,8 +2169,7 @@ var _ = Describe("KubeVirt Operator", func() {
envVal := rand.String(10)
config.PassthroughEnvVars = map[string]string{envKey: envVal}

apiDeployment, err := getDefaultVirtApiDeployment(NAMESPACE, config)
Expect(err).ToNot(HaveOccurred())
apiDeployment := getDefaultVirtApiDeployment(NAMESPACE, config)
Expect(apiDeployment.Spec.Template.Spec.Containers[0].Env).To(ContainElement(k8sv1.EnvVar{Name: envKey, Value: envVal}))
})

Expand All @@ -2185,8 +2183,7 @@ var _ = Describe("KubeVirt Operator", func() {
envVal := rand.String(10)
config.PassthroughEnvVars = map[string]string{envKey: envVal}

controllerDeployment, err := getDefaultVirtControllerDeployment(NAMESPACE, config)
Expect(err).ToNot(HaveOccurred())
controllerDeployment := getDefaultVirtControllerDeployment(NAMESPACE, config)
Expect(controllerDeployment.Spec.Template.Spec.Containers[0].Env).To(ContainElement(k8sv1.EnvVar{Name: envKey, Value: envVal}))
})

Expand All @@ -2200,8 +2197,7 @@ var _ = Describe("KubeVirt Operator", func() {
envVal := rand.String(10)
config.PassthroughEnvVars = map[string]string{envKey: envVal}

handlerDaemonset, err := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
Expect(err).ToNot(HaveOccurred())
handlerDaemonset := getDefaultVirtHandlerDaemonSet(NAMESPACE, config)
Expect(handlerDaemonset.Spec.Template.Spec.Containers[0].Env).To(ContainElement(k8sv1.EnvVar{Name: envKey, Value: envVal}))
})

Expand Down Expand Up @@ -3090,7 +3086,7 @@ func shouldExpectHCOConditions(kv *v1.KubeVirt, available k8sv1.ConditionStatus,
))
}

func getDefaultVirtApiDeployment(namespace string, config *util.KubeVirtDeploymentConfig) (*appsv1.Deployment, error) {
func getDefaultVirtApiDeployment(namespace string, config *util.KubeVirtDeploymentConfig) *appsv1.Deployment {
return components.NewApiServerDeployment(
namespace,
config.GetImageRegistry(),
Expand All @@ -3106,7 +3102,7 @@ func getDefaultVirtApiDeployment(namespace string, config *util.KubeVirtDeployme
config.GetExtraEnv())
}

func getDefaultVirtControllerDeployment(namespace string, config *util.KubeVirtDeploymentConfig) (*appsv1.Deployment, error) {
func getDefaultVirtControllerDeployment(namespace string, config *util.KubeVirtDeploymentConfig) *appsv1.Deployment {
return components.NewControllerDeployment(
namespace,
config.GetImageRegistry(),
Expand All @@ -3128,7 +3124,7 @@ func getDefaultVirtControllerDeployment(namespace string, config *util.KubeVirtD
config.GetExtraEnv())
}

func getDefaultVirtHandlerDaemonSet(namespace string, config *util.KubeVirtDeploymentConfig) (*appsv1.DaemonSet, error) {
func getDefaultVirtHandlerDaemonSet(namespace string, config *util.KubeVirtDeploymentConfig) *appsv1.DaemonSet {
return components.NewHandlerDaemonSet(
namespace,
config.GetImageRegistry(),
Expand All @@ -3152,7 +3148,7 @@ func getDefaultVirtHandlerDaemonSet(namespace string, config *util.KubeVirtDeplo
false)
}

func getDefaultExportProxyDeployment(namespace string, config *util.KubeVirtDeploymentConfig) (*appsv1.Deployment, error) {
func getDefaultExportProxyDeployment(namespace string, config *util.KubeVirtDeploymentConfig) *appsv1.Deployment {
return components.NewExportProxyDeployment(
namespace,
config.GetImageRegistry(),
Expand Down
9 changes: 3 additions & 6 deletions pkg/virt-operator/resource/apply/apps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ var _ = Describe("Apply Apps", func() {
Registry: Registry,
KubeVirtVersion: Version,
}
deployment, err = components.NewApiServerDeployment(
deployment = components.NewApiServerDeployment(
Namespace,
virtApiConfig.GetImageRegistry(),
virtApiConfig.GetImagePrefix(),
Expand All @@ -135,7 +135,6 @@ var _ = Describe("Apply Apps", func() {
virtApiConfig.GetImagePullSecrets(),
virtApiConfig.GetVerbosity(),
virtApiConfig.GetExtraEnv())
Expect(err).ToNot(HaveOccurred())

cachedPodDisruptionBudget = components.NewPodDisruptionBudgetForDeployment(deployment)
})
Expand Down Expand Up @@ -328,7 +327,7 @@ var _ = Describe("Apply Apps", func() {
Registry: Registry,
KubeVirtVersion: Version,
}
daemonSet, err = components.NewHandlerDaemonSet(
daemonSet = components.NewHandlerDaemonSet(
Namespace,
virtHandlerConfig.GetImageRegistry(),
virtHandlerConfig.GetImagePrefix(),
Expand All @@ -349,7 +348,6 @@ var _ = Describe("Apply Apps", func() {
virtHandlerConfig.GetVerbosity(),
virtHandlerConfig.GetExtraEnv(),
false)
Expect(err).ToNot(HaveOccurred())
markHandlerReady(daemonSet)
daemonSet.UID = "random-id"
})
Expand Down Expand Up @@ -1192,7 +1190,7 @@ var _ = Describe("Apply Apps", func() {
KubeVirtVersion: Version,
}
var err error
strategyDeployment, err = components.NewControllerDeployment(
strategyDeployment = components.NewControllerDeployment(
Namespace,
virtControllerConfig.GetImageRegistry(),
virtControllerConfig.GetImagePrefix(),
Expand All @@ -1211,7 +1209,6 @@ var _ = Describe("Apply Apps", func() {
virtControllerConfig.GetImagePullSecrets(),
virtControllerConfig.GetVerbosity(),
virtControllerConfig.GetExtraEnv())
Expect(err).ToNot(HaveOccurred())

cachedDeployment = strategyDeployment.DeepCopy()
cachedDeployment.Generation = 2
Expand Down
8 changes: 1 addition & 7 deletions pkg/virt-operator/resource/apply/pdb_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@ var _ = Describe("Apply PDBs", func() {
var expectations *util.Expectations
var kv *v1.KubeVirt
var deployment *v12.Deployment
var mockPodDisruptionBudgetCacheStore *MockStore
var requiredPDB *policyv1.PodDisruptionBudget
var r *Reconciler
var mockGeneration int64
var err error

getCachedPDB := func() *policyv1.PodDisruptionBudget {
Expect(requiredPDB).ToNot(BeNil())
Expand Down Expand Up @@ -76,7 +74,7 @@ var _ = Describe("Apply PDBs", func() {
Registry: Registry,
KubeVirtVersion: Version,
}
deployment, err = components.NewApiServerDeployment(
deployment = components.NewApiServerDeployment(
Namespace,
virtApiConfig.GetImageRegistry(),
virtApiConfig.GetImagePrefix(),
Expand All @@ -89,15 +87,11 @@ var _ = Describe("Apply PDBs", func() {
virtApiConfig.GetImagePullSecrets(),
virtApiConfig.GetVerbosity(),
virtApiConfig.GetExtraEnv())
Expect(err).ToNot(HaveOccurred())

kv.Status.TargetKubeVirtRegistry = Registry
kv.Status.TargetKubeVirtVersion = Version
kv.Status.TargetDeploymentID = Id

mockPodDisruptionBudgetCacheStore = &MockStore{}
err = stores.PodDisruptionBudgetCache.Add(mockPodDisruptionBudgetCacheStore)

mockGeneration = 123

// Set required PDB
Expand Down
9 changes: 3 additions & 6 deletions pkg/virt-operator/resource/generate/components/daemonsets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@ func RenderPrHelperContainer(image string, pullPolicy corev1.PullPolicy) corev1.
}
}

func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVersion, prHelperVersion, sidecarShimVersion, productName, productVersion, productComponent, image, launcherImage, prHelperImage, sidecarShimImage string, pullPolicy corev1.PullPolicy, imagePullSecrets []corev1.LocalObjectReference, migrationNetwork *string, verbosity string, extraEnv map[string]string, enablePrHelper bool) (*appsv1.DaemonSet, error) {
func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVersion, prHelperVersion, sidecarShimVersion, productName, productVersion, productComponent, image, launcherImage, prHelperImage, sidecarShimImage string, pullPolicy corev1.PullPolicy, imagePullSecrets []corev1.LocalObjectReference, migrationNetwork *string, verbosity string, extraEnv map[string]string, enablePrHelper bool) *appsv1.DaemonSet {

deploymentName := VirtHandlerName
imageName := fmt.Sprintf("%s%s", imagePrefix, deploymentName)
env := operatorutil.NewEnvVarMap(extraEnv)
podTemplateSpec, err := newPodTemplateSpec(deploymentName, imageName, repository, version, productName, productVersion, productComponent, image, pullPolicy, imagePullSecrets, nil, env)
if err != nil {
return nil, err
}
podTemplateSpec := newPodTemplateSpec(deploymentName, imageName, repository, version, productName, productVersion, productComponent, image, pullPolicy, imagePullSecrets, nil, env)

if launcherImage == "" {
launcherImage = fmt.Sprintf("%s/%s%s%s", repository, imagePrefix, "virt-launcher", AddVersionSeparatorPrefix(launcherVersion))
Expand Down Expand Up @@ -353,6 +350,6 @@ func NewHandlerDaemonSet(namespace, repository, imagePrefix, version, launcherVe
})
pod.Containers = append(pod.Containers, RenderPrHelperContainer(prHelperImage, pullPolicy))
}
return daemonset, nil
return daemonset

}
Loading

0 comments on commit e847380

Please sign in to comment.