Merge pull request #8777 from phuhung273/update-leader-election

feat(chart): VPA Updater leaderElection

Author: k8s-ci-robot

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md

@@ -100,9 +100,15 @@ The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resou
 | updater.image.pullPolicy | string | `"IfNotPresent"` |  |
 | updater.image.repository | string | `"registry.k8s.io/autoscaling/vpa-updater"` |  |
 | updater.image.tag | string | `nil` |  |
+| updater.leaderElection.enabled | string | `nil` |  |
+| updater.leaderElection.leaseDuration | string | `"15s"` |  |
+| updater.leaderElection.renewDeadline | string | `"10s"` |  |
+| updater.leaderElection.resourceName | string | `"vpa-updater-lease"` |  |
+| updater.leaderElection.resourceNamespace | string | `""` |  |
+| updater.leaderElection.retryPeriod | string | `"2s"` |  |
 | updater.podAnnotations | object | `{}` |  |
 | updater.podLabels | object | `{}` |  |
-| updater.replicas | int | `1` |  |
+| updater.replicas | int | `2` |  |
 | updater.serviceAccount.annotations | object | `{}` |  |
 | updater.serviceAccount.create | bool | `true` |  |
 | updater.serviceAccount.labels | object | `{}` |  |

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/_helpers.tpl

@@ -96,6 +96,16 @@ app.kubernetes.io/component: updater
 {{- printf "%s:%s" .Values.updater.image.repository (default .Chart.AppVersion .Values.updater.image.tag) }}
 {{- end }}
 
+{{- define "vertical-pod-autoscaler.updater.leaderElectionEnabled" -}}
+{{- if and (eq .Values.updater.leaderElection.enabled nil) (gt (int .Values.updater.replicas) 1) -}}
+true
+{{- else if .Values.updater.leaderElection.enabled -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
 
 {{/*
 Create the name of the namespace to use

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater-deployment.yaml

@@ -41,6 +41,17 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+          args:
+          - --v=4
+          - --stderrthreshold=info
+          {{- if eq (include "vertical-pod-autoscaler.updater.leaderElectionEnabled" .) "true" }}
+          - --leader-elect=true
+          - --leader-elect-resource-namespace={{ .Values.updater.leaderElection.resourceNamespace | default .Release.Namespace }}
+          - --leader-elect-resource-name={{ .Values.updater.leaderElection.resourceName }}
+          - --leader-elect-lease-duration={{ .Values.updater.leaderElection.leaseDuration }}
+          - --leader-elect-renew-deadline={{ .Values.updater.leaderElection.renewDeadline }}
+          - --leader-elect-retry-period={{ .Values.updater.leaderElection.retryPeriod }}
+          {{- end }}
           ports:
             - name: prometheus
               containerPort: 8943

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater-role.yaml

@@ -1,18 +1,12 @@
-{{- if and (.Values.updater.enabled) .Values.updater.serviceAccount.create -}}
+{{- if and .Values.updater.enabled .Values.rbac.create -}}
+{{- if eq (include "vertical-pod-autoscaler.updater.leaderElectionEnabled" .) "true" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.fullname" . }}-leader-locking
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
-  {{- with .Values.updater.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.updater.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 rules:
   - apiGroups:
       - "coordination.k8s.io"
@@ -23,11 +17,12 @@ rules:
   - apiGroups:
       - "coordination.k8s.io"
     resourceNames:
-      - vpa-updater
+      - {{ .Values.updater.leaderElection.resourceName }}
     resources:
       - leases
     verbs:
       - get
       - watch
       - update
 {{- end -}}
+{{- end -}}

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater-rolebinding.yaml

@@ -1,4 +1,5 @@
-{{- if and (.Values.updater.enabled) .Values.rbac.create -}}
+{{- if and .Values.updater.enabled .Values.rbac.create -}}
+{{- if eq (include "vertical-pod-autoscaler.updater.leaderElectionEnabled" .) "true" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -13,3 +14,4 @@ subjects:
     name: {{ include "vertical-pod-autoscaler.updater.fullname" . }}
     namespace: {{ .Release.Namespace }}
 {{- end -}}
+{{- end -}}

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml

@@ -197,7 +197,7 @@ updater:
     pullPolicy: IfNotPresent
 
   # Number of Updater replicas to create.
-  replicas: 1
+  replicas: 2
 
   # Labels to add to the Updater pod.
   podLabels: {}
@@ -211,3 +211,19 @@ updater:
     labels: {}
     # Annotations to add to the Updater service account.
     annotations: {}
+  
+  # Leader election configuration for the Updater.
+  # When running multiple replicas, leader election ensures only one instance is actively processing.
+  leaderElection:
+    # Enable leader election. If not set (null), automatically enabled when replicas > 1
+    enabled:
+    # Namespace for the lease resource. Defaults to Release.Namespace if not set.
+    resourceNamespace: ""
+    # Name of the lease resource.
+    resourceName: vpa-updater-lease
+    # Duration that non-leader candidates will wait after observing a leadership renewal.
+    leaseDuration: 15s
+    # Interval between attempts by the acting master to renew a leadership slot.
+    renewDeadline: 10s
+    # Duration the clients should wait between attempting acquisition and renewal of a leadership.
+    retryPeriod: 2s