From 3b7b8cd7ea9ff867261230480eb49bf79b11e00e Mon Sep 17 00:00:00 2001
From: ravineet <rajula.vineet.reddy@cern.ch>
Date: Mon, 24 Oct 2022 17:49:47 +0200
Subject: [PATCH] Simplify diskSize comparision logic
---
controllers/drupalsite_controller_utils.go | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/controllers/drupalsite_controller_utils.go b/controllers/drupalsite_controller_utils.go
index 4c16babf..aae804da 100644
--- a/controllers/drupalsite_controller_utils.go
+++ b/controllers/drupalsite_controller_utils.go
@@ -31,7 +31,6 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
k8sapierrors "k8s.io/apimachinery/pkg/api/errors"
- k8sapiresource "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"knative.dev/pkg/apis"
@@ -180,18 +179,8 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
return false, newApplicationError(err, ErrClientK8s)
}
- // Parse the input strings (Mi or Gi) into 'quantity' type for easier comparison
- destinationDiskSize, err := k8sapiresource.ParseQuantity(drp.Spec.Configuration.DiskSize)
- if err != nil {
- return false, newApplicationError(err, ErrFunctionDomain)
- }
- sourceDiskSize, err := k8sapiresource.ParseQuantity(sourceSite.Spec.Configuration.DiskSize)
- if err != nil {
- return false, newApplicationError(err, ErrFunctionDomain)
- }
-
// The destination disk size must be at least as large as the source
- if destinationDiskSize.Cmp(sourceDiskSize) == -1 {
+ if drp.Spec.Configuration.DiskSize != sourceSite.Spec.Configuration.DiskSize {
drp.Spec.Configuration.DiskSize = sourceSite.Spec.Configuration.DiskSize
update = true
}
--
GitLab