Skip to content

Commit

Permalink
fix vpa namespace name
Browse files Browse the repository at this point in the history
  • Loading branch information
ludydoo committed Jun 25, 2024
1 parent 7ba089d commit 08855d6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/env/scripts/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions fleetshard/pkg/runtime/vpa.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions fleetshard/pkg/runtime/vpa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 08855d6

Please sign in to comment.