Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify ensureKubeVirtStorageConfig #690

Merged
merged 1 commit into from
Jul 30, 2020
Merged

Simplify ensureKubeVirtStorageConfig #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions pkg/controller/hyperconverged/hyperconverged_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ func (r *ReconcileHyperConverged) ensureHco(req *hcoRequest) error {
for _, f := range []func(*hcoRequest) (upgradeDone bool, err error){
r.ensureKubeVirtPriorityClass,
r.ensureKubeVirtConfig,
r.ensureKubeVirtStorageConfig,
r.ensureKubeVirt,
r.ensureCDI,
r.ensureNetworkAddons,
Expand Down Expand Up @@ -958,6 +957,11 @@ func (r *ReconcileHyperConverged) ensureCDI(req *hcoRequest) (upgradeDone bool,

req.logger.Info("CDI already exists", "CDI.Namespace", found.Namespace, "CDI.Name", found.Name)

err = r.ensureKubeVirtStorageConfig(req)
if err != nil {
return false, err
}

err = r.ensureKubeVirtStorageRole(req)
if err != nil {
return false, err
Expand Down Expand Up @@ -1604,10 +1608,10 @@ func (r *ReconcileHyperConverged) ensureKubeVirtStorageRoleBinding(req *hcoReque
return nil
}

func (r *ReconcileHyperConverged) ensureKubeVirtStorageConfig(req *hcoRequest) (upgradeDone bool, err error) {
func (r *ReconcileHyperConverged) ensureKubeVirtStorageConfig(req *hcoRequest) error {
kubevirtStorageConfig := newKubeVirtStorageConfigForCR(req.instance, req.Namespace)
if err = controllerutil.SetControllerReference(req.instance, kubevirtStorageConfig, r.scheme); err != nil {
return false, err
if err := controllerutil.SetControllerReference(req.instance, kubevirtStorageConfig, r.scheme); err != nil {
return err
}

key, err := client.ObjectKeyFromObject(kubevirtStorageConfig)
Expand All @@ -1619,22 +1623,22 @@ func (r *ReconcileHyperConverged) ensureKubeVirtStorageConfig(req *hcoRequest) (
err = r.client.Get(req.ctx, key, found)
if err != nil && apierrors.IsNotFound(err) {
req.logger.Info("Creating kubevirt storage config")
return false, r.client.Create(req.ctx, kubevirtStorageConfig)
return r.client.Create(req.ctx, kubevirtStorageConfig)
}

if err != nil {
return false, err
return err
}

req.logger.Info("KubeVirt storage config already exists", "KubeVirtConfig.Namespace", found.Namespace, "KubeVirtConfig.Name", found.Name)
// Add it to the list of RelatedObjects if found
objectRef, err := reference.GetReference(r.scheme, found)
if err != nil {
return false, err
return err
}
objectreferencesv1.SetObjectReference(&req.instance.Status.RelatedObjects, *objectRef)

return req.componentUpgradeInProgress, nil
return nil
}

func newKubeVirtMetricsAggregationForCR(cr *hcov1alpha1.HyperConverged, namespace string) *sspv1.KubevirtMetricsAggregation {
Expand Down
6 changes: 2 additions & 4 deletions pkg/controller/hyperconverged/hyperconverged_controller_components_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,7 @@ var _ = Describe("HyperConverged Components", func() {
expectedResource := newKubeVirtStorageConfigForCR(hco, namespace)
cl := initClient([]runtime.Object{})
r := initReconciler(cl)
upgradeDone, err := r.ensureKubeVirtStorageConfig(req)
Expect(upgradeDone).To(BeFalse())
err := r.ensureKubeVirtStorageConfig(req)
Expect(err).To(BeNil())

foundResource := &corev1.ConfigMap{}
Expand All @@ -277,8 +276,7 @@ var _ = Describe("HyperConverged Components", func() {
expectedResource.ObjectMeta.SelfLink = fmt.Sprintf("/apis/v1/namespaces/%s/dummies/%s", expectedResource.Namespace, expectedResource.Name)
cl := initClient([]runtime.Object{hco, expectedResource})
r := initReconciler(cl)
upgradeDone, err := r.ensureKubeVirtStorageConfig(req)
Expect(upgradeDone).To(BeFalse())
err := r.ensureKubeVirtStorageConfig(req)
Expect(err).To(BeNil())

// Check HCO's status
Expand Down