From b93abe68c54694e54f4e1e04c36c70c4b8d9fa16 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Anna Date: Tue, 24 Jun 2025 15:05:15 +0200 Subject: [PATCH 1/4] Handle controlledValues Signed-off-by: Giuseppe D'Anna --- charts/fluent-bit/Chart.yaml | 2 +- charts/fluent-bit/templates/vpa.yaml | 6 +++++- charts/fluent-bit/values.yaml | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index a9182fdb..6c98d3aa 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -5,7 +5,7 @@ keywords: - logging - fluent-bit - fluentd -version: 0.49.1 +version: 0.50.0 appVersion: 4.0.3 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg home: https://fluentbit.io/ diff --git a/charts/fluent-bit/templates/vpa.yaml b/charts/fluent-bit/templates/vpa.yaml index 58dfaa09..d4df3ed8 100644 --- a/charts/fluent-bit/templates/vpa.yaml +++ b/charts/fluent-bit/templates/vpa.yaml @@ -15,7 +15,11 @@ spec: containerPolicies: - containerName: {{ .Chart.Name }} {{- with .Values.autoscaling.vpa.controlledResources }} - controlledResources: + controlledResources: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.autoscaling.vpa.controlledValues }} + controlledValues: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.autoscaling.vpa.maxAllowed }} diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index a95bc188..8eb0ab49 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -244,6 +244,9 @@ autoscaling: # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory controlledResources: [] + # Values that the vertical pod autoscaler can control. Allowed values are RequestsAndLimits and RequestsOnly. + controlledValues: RequestsAndLimits + # Define the max allowed resources for the pod maxAllowed: {} # cpu: 200m From c46cbe9ffb3dd045b79841cd4ba04f2e28300154 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Anna Date: Wed, 25 Jun 2025 23:35:26 +0200 Subject: [PATCH 2/4] Update annotation Signed-off-by: Giuseppe D'Anna --- charts/fluent-bit/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index 6c98d3aa..8990d1bd 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -22,5 +22,5 @@ maintainers: email: steve.hipwell@gmail.com annotations: artifacthub.io/changes: | - - kind: changed - description: "Updated Fluent Bit OCI image to v4.0.3." + - kind: added + description: "Add VPA controlledValues option" From 69374ee26fb00224c73089866b678ded08809da5 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Anna Date: Fri, 27 Jun 2025 15:35:37 +0200 Subject: [PATCH 3/4] Default empty Signed-off-by: Giuseppe D'Anna --- charts/fluent-bit/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index 8eb0ab49..e34e3a89 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -244,8 +244,8 @@ autoscaling: # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory controlledResources: [] - # Values that the vertical pod autoscaler can control. Allowed values are RequestsAndLimits and RequestsOnly. - controlledValues: RequestsAndLimits + # Values that the vertical pod autoscaler can control. Allowed values are RequestsAndLimits and RequestsOnly. Default is RequestsAndLimits. + controlledValues: "" # Define the max allowed resources for the pod maxAllowed: {} From 602c0a884788abc9eb2ee45b0aca14061301564a Mon Sep 17 00:00:00 2001 From: Giuseppe D'Anna Date: Fri, 27 Jun 2025 17:20:57 +0200 Subject: [PATCH 4/4] Update charts/fluent-bit/values.yaml Co-authored-by: Steve Hipwell Signed-off-by: Giuseppe D'Anna --- charts/fluent-bit/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index e34e3a89..f0620e1b 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -245,7 +245,7 @@ autoscaling: controlledResources: [] # Values that the vertical pod autoscaler can control. Allowed values are RequestsAndLimits and RequestsOnly. Default is RequestsAndLimits. - controlledValues: "" + controlledValues: # Define the max allowed resources for the pod maxAllowed: {}