Skip to content

add optional nodeSelector for VPA operator #2423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johannes94 merged 3 commits into from
Sep 3, 2025
Merged

add optional nodeSelector for VPA operator #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5734ffa
allow configuring node selector for VPA deployment
johannes94 Sep 3, 2025
9599c50
fix vpa helm chart
johannes94 Sep 3, 2025
8fe89ca
consistent VPA subchart values and names
johannes94 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,7 @@ spec:
enabled: false
scc:
enabled: false
verticalPodAutoscaler:
vertical-pod-autoscaler:
enabled: $INSTALL_VERTICAL_POD_AUTOSCALER_OLM
nodeSelector:
node-role.kubernetes.io/worker: ""
2 changes: 1 addition & 1 deletion dp-terraform/helm/rhacs-terraform/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ dependencies:
condition: secured-cluster.enabled
- name: vertical-pod-autoscaler
version: "0.1.0"
condition: verticalPodAutoscaler.enabled
condition: vertical-pod-autoscaler.enabled
5 changes: 5 additions & 0 deletions ...raform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ spec:
name: vertical-pod-autoscaler
source: redhat-operators
sourceNamespace: openshift-marketplace
{{- if .Values.nodeSelector }}
config:
nodeSelector:
{{- toYaml .Values.nodeSelector | nindent 6 }}
{{- end }}
4 changes: 4 additions & 0 deletions dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
enabled: true
# For HCP clusters, master nodes are hosted so VPA cannot use master node selectors
# because of that we need a way to overwrite initial selectors
nodeSelector: {}
5 changes: 4 additions & 1 deletion dp-terraform/helm/rhacs-terraform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,11 @@ secured-cluster:
nodeSelector:
node-role.kubernetes.io/acscs-infra: ""

verticalPodAutoscaler:
vertical-pod-autoscaler:
Copy link
Copy Markdown
Contributor

@ludydoo ludydoo Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the renaming from verticalPodAutoscaler to vertical-pod-autoscaler intentional?

Copy link
Copy Markdown
Contributor Author

@johannes94 johannes94 Sep 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because otherwise the values won't get piped through properly to the subchart. That is because the subchart is named vertical-pod-autoscaler already

enabled: true
# For HCP clusters, master nodes are hosted so VPA cannot use master node selectors
# because of that we need a way to overwrite initial selectors
nodeSelector: {}

scc:
enabled: true
Expand Down
Loading