Merge pull request #7498 from raywainman/lease-default

Change default lease name for vpa-recommender to "vpa-recommender-lease"
kubernetes · Dec 3, 2024 · d87692f · d87692f
2 parents 4463c60 + 43730d4
commit d87692f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/vertical-pod-autoscaler/deploy/vpa-rbac.yaml b/vertical-pod-autoscaler/deploy/vpa-rbac.yaml
@@ -410,7 +410,9 @@ rules:
   - apiGroups:
       - "coordination.k8s.io"
     resourceNames:
+      # TODO: Clean vpa-recommender up once vpa-recommender-lease is used everywhere. See https://github.com/kubernetes/autoscaler/issues/7461.
       - vpa-recommender
+      - vpa-recommender-lease
     resources:
       - leases
     verbs:

diff --git a/vertical-pod-autoscaler/pkg/recommender/main.go b/vertical-pod-autoscaler/pkg/recommender/main.go
@@ -182,12 +182,13 @@ const (
 
 func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConfiguration {
 	return componentbaseconfig.LeaderElectionConfiguration{
-		LeaderElect:       false,
-		LeaseDuration:     metav1.Duration{Duration: defaultLeaseDuration},
-		RenewDeadline:     metav1.Duration{Duration: defaultRenewDeadline},
-		RetryPeriod:       metav1.Duration{Duration: defaultRetryPeriod},
-		ResourceLock:      resourcelock.LeasesResourceLock,
-		ResourceName:      "vpa-recommender",
+		LeaderElect:   false,
+		LeaseDuration: metav1.Duration{Duration: defaultLeaseDuration},
+		RenewDeadline: metav1.Duration{Duration: defaultRenewDeadline},
+		RetryPeriod:   metav1.Duration{Duration: defaultRetryPeriod},
+		ResourceLock:  resourcelock.LeasesResourceLock,
+		// This was changed from "vpa-recommender" to avoid conflicts with managed VPA deployments.
+		ResourceName:      "vpa-recommender-lease",
 		ResourceNamespace: metav1.NamespaceSystem,
 	}
 }