aeraki support specified namespace

Signed-off-by: chentanjun <tanjunchen20@gmail.com>
aeraki-mesh · Apr 3, 2023 · 1b79990 · 1b79990
1 parent 94f9ed0
commit 1b79990
Show file tree

Hide file tree

Showing 43 changed files with 2,015 additions and 120 deletions.
diff --git a/.github/workflows/e2e-dubbo.yaml b/.github/workflows/e2e-dubbo.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 
 env:
   ISTIO_VERSION: 1.14.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
   AERAKI_IMG_PULL_POLICY: Never
@@ -33,7 +34,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -62,7 +63,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -91,7 +92,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -120,7 +121,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -149,7 +150,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test

diff --git a/.github/workflows/e2e-metaprotocol-gateway.yaml b/.github/workflows/e2e-metaprotocol-gateway.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 
 env:
   ISTIO_VERSION: 1.14.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
   AERAKI_IMG_PULL_POLICY: Never
@@ -33,7 +34,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test

diff --git a/.github/workflows/e2e-metaprotocol.yaml b/.github/workflows/e2e-metaprotocol.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 
 env:
   ISTIO_VERSION: 1.14.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
   AERAKI_IMG_PULL_POLICY: Never
@@ -33,7 +34,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -62,7 +63,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -91,7 +92,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -120,7 +121,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -149,7 +150,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -178,7 +179,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -207,7 +208,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -236,7 +237,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -265,7 +266,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test

diff --git a/.github/workflows/e2e-redis.yaml b/.github/workflows/e2e-redis.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 
 env:
   ISTIO_VERSION: 1.14.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
   AERAKI_IMG_PULL_POLICY: Never
@@ -32,7 +33,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test

diff --git a/.github/workflows/e2e-thrift.yaml b/.github/workflows/e2e-thrift.yaml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 
 env:
   ISTIO_VERSION: 1.14.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
   AERAKI_IMG_PULL_POLICY: Never
@@ -33,7 +34,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -62,7 +63,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
@@ -91,7 +92,7 @@ jobs:
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test

diff --git a/cmd/aeraki/main.go b/cmd/aeraki/main.go
@@ -21,8 +21,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/aeraki-mesh/aeraki/pkg/config/constants"
-
 	"github.com/google/uuid"
 
 	"github.com/aeraki-mesh/aeraki/pkg/bootstrap"
@@ -39,7 +37,7 @@ import (
 
 const (
 	defaultIstiodAddr        = "istiod.istio-system:15010"
-	defaultRootNamespace     = constants.DefaultRootNamespace
+	defaultRootNamespace     = "istio-system"
 	defaultXdsAddr           = ":15010"
 	defaultElectionID        = "aeraki-controller"
 	defaultLogLevel          = "all:info"
@@ -70,13 +68,15 @@ func main() {
 	if args.ServerID == "" {
 		args.ServerID = "Aeraki-" + uuid.New().String()
 	}
+	args.PodName = env.RegisterStringVar("POD_NAME", args.ServerID, "").Get()
+	args.RootNamespace = env.RegisterStringVar("AERAKI_NAMESPACE", args.RootNamespace, "").Get()
+	args.EnableEnvoyFilterNSScope = env.RegisterBoolVar("AERAKI_ENABLE_ENVOY_FILTER_NS_SCOPE",
+		args.EnableEnvoyFilterNSScope, "").Get()
 
 	flag.VisitAll(func(flag *flag.Flag) {
 		log.Infof("Aeraki parameter: %s: %v", flag.Name, flag.Value)
 	})
 
-	args.PodName = env.RegisterStringVar("POD_NAME", args.ServerID, "").Get()
-
 	setLogLevels(args.LogLevel)
 	// Create the stop channel for all of the servers.
 	stopChan := make(chan struct{}, 1)