Fix lints

sapcc · Mar 6, 2024 · 6fbb012 · 6fbb012
1 parent 84e428b
commit 6fbb012
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/internal/controllers/vpa_controller.go b/internal/controllers/vpa_controller.go
@@ -71,19 +71,17 @@ func (v *VpaController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 	if err := v.Get(ctx, req.NamespacedName, vpa); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
-	if common.ManagedByButler(vpa) {
-		deleted, err := v.deleteOrphanedVpa(ctx, vpa)
-		if err != nil || deleted {
-			return ctrl.Result{}, err
-		}
+	deleted, err := v.deleteOrphanedVpa(ctx, vpa)
+	if err != nil || deleted {
+		return ctrl.Result{}, err
 	}
 
 	metrics.RecordContainerRecommendationExcess(vpa)
 	target, err := v.extractTarget(ctx, vpa)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	deleted, err := v.cleanupServedVpa(ctx, cleanupParams{vpa: vpa, target: target})
+	deleted, err = v.cleanupServedVpa(ctx, cleanupParams{vpa: vpa, target: target})
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -199,6 +197,9 @@ func (v *VpaController) deleteOldVpa(ctx context.Context, vpa *vpav1.VerticalPod
 // Compared to finalizers on the targets (deployments,...) this approach is more
 // lazy as the vpa needs to be reconciled, but it does not put finalizers on critical resources.
 func (v *VpaController) deleteOrphanedVpa(ctx context.Context, vpa *vpav1.VerticalPodAutoscaler) (bool, error) {
+	if !common.ManagedByButler(vpa) {
+		return false, nil
+	}
 	if vpa.Spec.TargetRef == nil {
 		v.Log.Info("Deleting Vpa with orphaned target")
 		return true, v.Delete(ctx, vpa)

diff --git a/internal/controllers/vpa_controller_test.go b/internal/controllers/vpa_controller_test.go
@@ -64,14 +64,14 @@ var _ = Describe("VpaController", func() {
 		})
 
 		AfterEach(func() {
-			deleteVpa("test-deployment-custom-vpa")
+			deleteVpa(deploymentCustomVpaName)
 			deleteVpa("test-deployment-deployment")
 			Expect(k8sClient.Delete(context.Background(), deployment)).To(Succeed())
 		})
 
 		It("should delete the served vpa for apps/v1", func() {
 			vpa = &vpav1.VerticalPodAutoscaler{}
-			vpa.Name = "test-deployment-custom-vpa"
+			vpa.Name = deploymentCustomVpaName
 			vpa.Namespace = metav1.NamespaceDefault
 			vpa.Spec.TargetRef = &autoscalingv1.CrossVersionObjectReference{
 				Name:       deploymentName,
@@ -91,7 +91,7 @@ var _ = Describe("VpaController", func() {
 
 		It("should delete the served vpa for v1", func() {
 			vpa = &vpav1.VerticalPodAutoscaler{}
-			vpa.Name = "test-deployment-custom-vpa"
+			vpa.Name = deploymentCustomVpaName
 			vpa.Namespace = metav1.NamespaceDefault
 			vpa.Spec.TargetRef = &autoscalingv1.CrossVersionObjectReference{
 				Name:       deploymentName,
@@ -122,7 +122,7 @@ var _ = Describe("VpaController", func() {
 			Expect(k8sClient.Patch(context.Background(), deployment, client.MergeFrom(unmodified))).To(Succeed())
 
 			vpa = &vpav1.VerticalPodAutoscaler{}
-			vpa.Name = "test-deployment-custom-vpa"
+			vpa.Name = deploymentCustomVpaName
 			vpa.Namespace = metav1.NamespaceDefault
 			vpa.Spec.TargetRef = &autoscalingv1.CrossVersionObjectReference{
 				Name:       deploymentName,