Fix ordering of VPA mode annotation logic (#352)

FairwindsOps · Sep 16, 2021 · 4b8350d · 4b8350d
1 parent d491646
commit 4b8350d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/vpa/vpa.go b/pkg/vpa/vpa.go
@@ -195,12 +195,13 @@ func (r Reconciler) reconcileDeploymentsAndVPAs(ns *corev1.Namespace, vpas []vpa
 }
 
 func (r Reconciler) reconcileDeploymentAndVPA(ns *corev1.Namespace, deployment appsv1.Deployment, vpa *vpav1.VerticalPodAutoscaler, vpaUpdateMode *vpav1.UpdateMode) error {
-	desiredVPA := r.getVPAObject(vpa, ns, deployment.Name, vpaUpdateMode)
-
 	if vpaUpdateModeOverride, explicit := vpaUpdateModeForResource(&deployment); explicit {
 		vpaUpdateMode = vpaUpdateModeOverride
 		klog.V(5).Infof("Deployment/%s has custom vpa-update-mode=%s", deployment.Name, *vpaUpdateMode)
 	}
+
+	desiredVPA := r.getVPAObject(vpa, ns, deployment.Name, vpaUpdateMode)
+
 	if vpa == nil {
 		klog.V(5).Infof("Deployment/%s does not have a VPA currently, creating VPA/%s", deployment.Name, deployment.Name)
 		// no vpa exists, create one (use the same name as the deployment)