From 835413d7800b6e4647b407c4c77599b380864b80 Mon Sep 17 00:00:00 2001
From: alphashaw <shawalpha5@gmail.com>
Date: Fri, 26 Aug 2022 10:17:19 +0000
Subject: [PATCH] revert the default operator namespace to
 "istio-virtualservice-merger"

---
 main.go                |  2 +-
 manifest/operator.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 0423f68..380be65 100644
--- a/main.go
+++ b/main.go
@@ -53,7 +53,7 @@ func init() {
 
 func main() {
 	var namespace string
-	flag.StringVar(&namespace, "namespace", "istio-merger-operator", "Select which namespace this controller is deployed")
+	flag.StringVar(&namespace, "namespace", "istio-virtualservice-merger", "Select which namespace this controller is deployed")
 	flag.Parse()
 
 	// set logger
diff --git a/manifest/operator.yaml b/manifest/operator.yaml
index 3001b5c..bfceeb3 100644
--- a/manifest/operator.yaml
+++ b/manifest/operator.yaml
@@ -7,7 +7,7 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: istio-merger-operator
+  namespace: istio-virtualservice-merger
   name: istio-virtualservice-merger
 ---
 # permissions to do leader election.
@@ -15,7 +15,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: istio-virtualservice-merger-leader-election-role
-  namespace: istio-merger-operator
+  namespace: istio-virtualservice-merger
 rules:
   - apiGroups:
       - ""
@@ -53,7 +53,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: istio-virtualservice-merger-leader-election-rolebinding
-  namespace: istio-merger-operator
+  namespace: istio-virtualservice-merger
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -61,7 +61,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: istio-virtualservice-merger
-    namespace: istio-merger-operator
+    namespace: istio-virtualservice-merger
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -125,13 +125,13 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: istio-virtualservice-merger
-    namespace: istio-merger-operator
+    namespace: istio-virtualservice-merger
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: istio-virtualservice-merger
-  namespace: istio-merger-operator
+  namespace: istio-virtualservice-merger
   labels:
     app: istio-virtualservice-merger
 spec: