From 5734ffabfe78fb94dcf75bf44cc8354746dcfa61 Mon Sep 17 00:00:00 2001 From: Johannes Malsam Date: Wed, 3 Sep 2025 08:04:40 +0200 Subject: [PATCH 1/3] allow configuring node selector for VPA deployment --- dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml | 4 +++- .../vertical-pod-autoscaler/templates/02-subscription.yaml | 5 +++++ dp-terraform/helm/rhacs-terraform/values.yaml | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml index 5518174f8c..89f16e2518 100644 --- a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml +++ b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml @@ -48,4 +48,6 @@ spec: scc: enabled: false verticalPodAutoscaler: - enabled: $INSTALL_VERTICAL_POD_AUTOSCALER_OLM + enabled: $ + nodeSelector: + node-role.kubernetes.io/worker: "" diff --git a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml index 5bdc73120b..b13609302b 100644 --- a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml +++ b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml @@ -9,3 +9,8 @@ spec: name: vertical-pod-autoscaler source: redhat-operators sourceNamespace: openshift-marketplace + {{- if .Values.verticalPodAutoscaler.nodeSelector }} + config: + nodeSelector: + {{- toYaml .Values.verticalPodAutoscaler.nodeSelector | nindent 6 }} + {{- end }} diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml index fe6645569f..348f387874 100644 --- a/dp-terraform/helm/rhacs-terraform/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/values.yaml @@ -186,6 +186,9 @@ secured-cluster: verticalPodAutoscaler: 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 From 9599c502b508a1c97f4e274cbc012088bd1ba8db Mon Sep 17 00:00:00 2001 From: Johannes Malsam Date: Wed, 3 Sep 2025 09:01:06 +0200 Subject: [PATCH 2/3] fix vpa helm chart --- .../vertical-pod-autoscaler/templates/02-subscription.yaml | 4 ++-- .../charts/vertical-pod-autoscaler/values.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml diff --git a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml index b13609302b..885d0a2034 100644 --- a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml +++ b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml @@ -9,8 +9,8 @@ spec: name: vertical-pod-autoscaler source: redhat-operators sourceNamespace: openshift-marketplace - {{- if .Values.verticalPodAutoscaler.nodeSelector }} + {{- if .Values.nodeSelector }} config: nodeSelector: - {{- toYaml .Values.verticalPodAutoscaler.nodeSelector | nindent 6 }} + {{- toYaml .Values.nodeSelector | nindent 6 }} {{- end }} diff --git a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml new file mode 100644 index 0000000000..3094ba14de --- /dev/null +++ b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml @@ -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: {} \ No newline at end of file From 8fe89ca4556c5d1148e987df04c688916150f6c9 Mon Sep 17 00:00:00 2001 From: Johannes Malsam Date: Wed, 3 Sep 2025 10:12:03 +0200 Subject: [PATCH 3/3] consistent VPA subchart values and names --- dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml | 4 ++-- dp-terraform/helm/rhacs-terraform/Chart.yaml | 2 +- .../charts/vertical-pod-autoscaler/values.yaml | 2 +- dp-terraform/helm/rhacs-terraform/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml index 89f16e2518..e29a4a8e99 100644 --- a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml +++ b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml @@ -47,7 +47,7 @@ spec: enabled: false scc: enabled: false - verticalPodAutoscaler: - enabled: $ + vertical-pod-autoscaler: + enabled: $INSTALL_VERTICAL_POD_AUTOSCALER_OLM nodeSelector: node-role.kubernetes.io/worker: "" diff --git a/dp-terraform/helm/rhacs-terraform/Chart.yaml b/dp-terraform/helm/rhacs-terraform/Chart.yaml index 126b7cb68a..72b6196e19 100644 --- a/dp-terraform/helm/rhacs-terraform/Chart.yaml +++ b/dp-terraform/helm/rhacs-terraform/Chart.yaml @@ -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 diff --git a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml index 3094ba14de..548e81226e 100644 --- a/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/values.yaml @@ -1,4 +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: {} \ No newline at end of file +nodeSelector: {} diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml index 348f387874..03723dda13 100644 --- a/dp-terraform/helm/rhacs-terraform/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/values.yaml @@ -184,7 +184,7 @@ secured-cluster: nodeSelector: node-role.kubernetes.io/acscs-infra: "" -verticalPodAutoscaler: +vertical-pod-autoscaler: 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