diff --git a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml index 5518174f8c..e29a4a8e99 100644 --- a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml +++ b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml @@ -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: "" 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/templates/02-subscription.yaml b/dp-terraform/helm/rhacs-terraform/charts/vertical-pod-autoscaler/templates/02-subscription.yaml index 5bdc73120b..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,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 }} 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..548e81226e --- /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: {} diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml index fe6645569f..03723dda13 100644 --- a/dp-terraform/helm/rhacs-terraform/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/values.yaml @@ -184,8 +184,11 @@ 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 + nodeSelector: {} scc: enabled: true