From 08855d6e23c522a8cd24a1ca68e85dbd4e3cdb1e Mon Sep 17 00:00:00 2001
From: Ludovic Cleroux <ludydoo@gmail.com>
Date: Tue, 25 Jun 2024 16:57:34 +0200
Subject: [PATCH] fix vpa namespace name

---
 Makefile                                                      | 4 ++--
 dev/env/scripts/up.sh                                         | 2 +-
 .../charts/data/rhacs-vertical-pod-autoscaling/Chart.yaml     | 2 +-
 fleetshard/pkg/runtime/vpa.go                                 | 4 ++--
 fleetshard/pkg/runtime/vpa_test.go                            | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index aee96510c7..9f490d9626 100644
--- a/Makefile
+++ b/Makefile
@@ -749,9 +749,9 @@ deploy/route:
 	@oc process -f ./templates/route-template.yml --local | oc apply -f - -n $(NAMESPACE)
 .PHONY: deploy/route
 
-# This will create the redhat-pull-secret secret in the rhacs-vertical-pod-autoscaling namespace if it does not exist
+# This will create the redhat-pull-secret secret in the rhacs-vertical-pod-autoscaler namespace if it does not exist
 deploy/redhat-pull-secret:
-	./scripts/redhat-pull-secret.sh rhacs-vertical-pod-autoscaling
+	./scripts/redhat-pull-secret.sh rhacs-vertical-pod-autoscaler
 
 # When making changes to the gitops configuration for development purposes
 # situated here dev/env/manifests/fleet-manager/04-gitops-config.yaml, this
diff --git a/dev/env/scripts/up.sh b/dev/env/scripts/up.sh
index e969f546e4..604d58afcf 100755
--- a/dev/env/scripts/up.sh
+++ b/dev/env/scripts/up.sh
@@ -53,7 +53,7 @@ if ! is_openshift_cluster "$CLUSTER_TYPE"; then
     $KUBECTL -n "$ACSCS_NAMESPACE" create secret generic fleet-manager-tls 2> /dev/null || true
     $KUBECTL -n "$ACSCS_NAMESPACE" create secret generic fleet-manager-envoy-tls 2> /dev/null || true
     $KUBECTL -n "$ACSCS_NAMESPACE" create secret generic fleet-manager-active-tls 2> /dev/null || true
-    # Create the redhat-pull-secret in the rhacs-vertical-pod-autoscaling namespace
+    # Create the redhat-pull-secret in the rhacs-vertical-pod-autoscaler namespace
     make -C "$GITROOT" deploy/redhat-pull-secret
 fi
 
diff --git a/fleetshard/pkg/central/charts/data/rhacs-vertical-pod-autoscaling/Chart.yaml b/fleetshard/pkg/central/charts/data/rhacs-vertical-pod-autoscaling/Chart.yaml
index badf5351ae..10da20c4ea 100644
--- a/fleetshard/pkg/central/charts/data/rhacs-vertical-pod-autoscaling/Chart.yaml
+++ b/fleetshard/pkg/central/charts/data/rhacs-vertical-pod-autoscaling/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: rhacs-vertical-pod-autoscaling
+name: rhacs-vertical-pod-autoscaler
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.0
diff --git a/fleetshard/pkg/runtime/vpa.go b/fleetshard/pkg/runtime/vpa.go
index 0282e05039..64918f2576 100644
--- a/fleetshard/pkg/runtime/vpa.go
+++ b/fleetshard/pkg/runtime/vpa.go
@@ -50,7 +50,7 @@ func (r *vpaReconciler) getParamsForConfig(config private.VerticalPodAutoscaling
 
 	return charts.HelmReconcilerParams{
 		ReleaseName:     "rhacs-vpa",
-		Namespace:       "rhacs-vertical-pod-autoscaling",
+		Namespace:       "rhacs-vertical-pod-autoscaler",
 		ManagerName:     "fleetshard",
 		Chart:           r.chart,
 		Values:          values,
@@ -88,7 +88,7 @@ var vpaChart *chart.Chart
 // init initializes the VPA chart.
 func init() {
 	var err error
-	vpaChart, err = charts.GetChart("rhacs-vertical-pod-autoscaling", nil)
+	vpaChart, err = charts.GetChart("rhacs-vertical-pod-autoscaler", nil)
 	if err != nil {
 		panic(err)
 	}
diff --git a/fleetshard/pkg/runtime/vpa_test.go b/fleetshard/pkg/runtime/vpa_test.go
index d78ab33a45..a93fab4cbd 100644
--- a/fleetshard/pkg/runtime/vpa_test.go
+++ b/fleetshard/pkg/runtime/vpa_test.go
@@ -68,7 +68,7 @@ func Test_vpaReconciler_Reconcile(t *testing.T) {
 	require.NoError(t, err)
 
 	var deployments appsv1.DeploymentList
-	err = cli.List(context.Background(), &deployments, client.InNamespace("rhacs-vertical-pod-autoscaling"))
+	err = cli.List(context.Background(), &deployments, client.InNamespace("rhacs-vertical-pod-autoscaler"))
 	require.NoError(t, err)
 	assert.Len(t, deployments.Items, 1)
 	assert.Equal(t, "recommender-1", deployments.Items[0].Name)
@@ -86,7 +86,7 @@ func Test_vpaReconciler_Reconcile(t *testing.T) {
 	assert.True(t, deployments.Items[0].Spec.Template.Spec.Containers[0].Resources.Requests[v1.ResourceCPU].Equal(resource.MustParse("100m")))
 
 	var sa v1.ServiceAccount
-	err = cli.Get(context.Background(), client.ObjectKey{Namespace: "rhacs-vertical-pod-autoscaling", Name: "rhacs-vpa-recommender"}, &sa)
+	err = cli.Get(context.Background(), client.ObjectKey{Namespace: "rhacs-vertical-pod-autoscaler", Name: "rhacs-vpa-recommender"}, &sa)
 	require.NoError(t, err)
 
 	var clusterRole rbacv1.ClusterRole