From bc586f87f8fe5d74bd95802344e3b5675bb5957f Mon Sep 17 00:00:00 2001
From: Joel Smith <joelsmith@redhat.com>
Date: Mon, 24 Oct 2022 08:48:14 -0600
Subject: [PATCH] Fix typo, move service accounts to RBAC

---
 .../deploy/recommender-deployment.yaml             |  6 ------
 .../deploy/updater-deployment.yaml                 |  6 ------
 vertical-pod-autoscaler/deploy/vpa-rbac.yaml       | 14 +++++++++++++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml
index a6c2aabc6f..006628ab17 100644
--- a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml
+++ b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml
@@ -1,10 +1,4 @@
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vpa-recommender
-  namespace: kube-system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/vertical-pod-autoscaler/deploy/updater-deployment.yaml b/vertical-pod-autoscaler/deploy/updater-deployment.yaml
index cee63c4e90..2e04a4105c 100644
--- a/vertical-pod-autoscaler/deploy/updater-deployment.yaml
+++ b/vertical-pod-autoscaler/deploy/updater-deployment.yaml
@@ -1,10 +1,4 @@
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vpa-updater
-  namespace: kube-system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/vertical-pod-autoscaler/deploy/vpa-rbac.yaml b/vertical-pod-autoscaler/deploy/vpa-rbac.yaml
index dd54f25197..05b076876a 100644
--- a/vertical-pod-autoscaler/deploy/vpa-rbac.yaml
+++ b/vertical-pod-autoscaler/deploy/vpa-rbac.yaml
@@ -214,7 +214,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: system:vpa-evictionter-binding
+  name: system:vpa-evictioner-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -230,6 +230,18 @@ metadata:
   name: vpa-admission-controller
   namespace: kube-system
 ---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: vpa-recommender
+  namespace: openshift-vertical-pod-autoscaler
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: vpa-updater
+  namespace: openshift-vertical-pod-autoscaler
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata: