change ApplicationProtocol CRD to cluster scope (#230)

* change ApplicationProtocol CRD to cluster scope Signed-off-by: Sad-polar-bear <[email protected]> * fix script issue Signed-off-by: Sad-polar-bear <[email protected]> * fix e2e test Signed-off-by: Sad-polar-bear <[email protected]> * fix e2e test Signed-off-by: Sad-polar-bear <[email protected]> * fix e2e test Signed-off-by: Sad-polar-bear <[email protected]> * fix e2e test Signed-off-by: Sad-polar-bear <[email protected]>
aeraki-mesh · May 24, 2022 · 0f15f0c · 0f15f0c
1 parent 0330c7c
commit 0f15f0c
Show file tree

Hide file tree

Showing 25 changed files with 179 additions and 25 deletions.
diff --git a/.github/workflows/e2e-dubbo.yaml b/.github/workflows/e2e-dubbo.yaml
@@ -7,7 +7,7 @@ env:
   ISTIO_VERSION: 1.12.7
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
   TestSidecarOutboundConfig:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e-kafka-zookeeper.yaml b/.github/workflows/e2e-kafka-zookeeper.yaml
@@ -7,7 +7,7 @@ env:
   ISTIO_VERSION: 1.12.7
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e-metaprotocol.yaml b/.github/workflows/e2e-metaprotocol.yaml
@@ -7,8 +7,66 @@ env:
   ISTIO_VERSION: 1.12.7
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
+  TestSidecarInboundConfig:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: true
+    name: TestSidecarInboundConfig
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Install dependencies
+        run: |
+          go version
+          go get golang.org/x/tools/cmd/goimports
+      - name: build docker
+        run: make docker-build-e2e
+      - name: Prepare envrionment
+        run: bash ${SCRIPTS_DIR}/pre.sh
+      - 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
+      - name: Install aeraki
+        run: bash ${SCRIPTS_DIR}/aeraki.sh
+      - name: test
+        run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/ -run TestSidecarInboundConfig
+  TestSidecarOutboundConfig:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: true
+    name: TestSidecarOutboundConfig
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Install dependencies
+        run: |
+          go version
+          go get golang.org/x/tools/cmd/goimports
+      - name: build docker
+        run: make docker-build-e2e
+      - name: Prepare envrionment
+        run: bash ${SCRIPTS_DIR}/pre.sh
+      - 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
+      - name: Install aeraki
+        run: bash ${SCRIPTS_DIR}/aeraki.sh
+      - name: test
+        run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/ -run TestSidecarOutboundConfig
   TestVersionRouting:
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -38,3 +96,61 @@ jobs:
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
         run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/ -run TestVersionRouting
+  TestAttributeRouting:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: true
+    name: TestAttributeRouting
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Install dependencies
+        run: |
+          go version
+          go get golang.org/x/tools/cmd/goimports
+      - name: build docker
+        run: make docker-build-e2e
+      - name: Prepare envrionment
+        run: bash ${SCRIPTS_DIR}/pre.sh
+      - 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
+      - name: Install aeraki
+        run: bash ${SCRIPTS_DIR}/aeraki.sh
+      - name: test
+        run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/ -run TestAttributeRouting
+  TestPercentageRouting:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: true
+    name: TestPercentageRouting
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Install dependencies
+        run: |
+          go version
+          go get golang.org/x/tools/cmd/goimports
+      - name: build docker
+        run: make docker-build-e2e
+      - name: Prepare envrionment
+        run: bash ${SCRIPTS_DIR}/pre.sh
+      - 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
+      - name: Install aeraki
+        run: bash ${SCRIPTS_DIR}/aeraki.sh
+      - name: test
+        run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/ -run TestPercentageRouting
diff --git a/.github/workflows/e2e-redis.yaml b/.github/workflows/e2e-redis.yaml
@@ -7,7 +7,7 @@ env:
   ISTIO_VERSION: 1.12.7
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e-thrift.yaml b/.github/workflows/e2e-thrift.yaml
@@ -7,7 +7,7 @@ env:
   ISTIO_VERSION: 1.12.7
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/api/metaprotocol/v1alpha1/metaprotocol.aeraki.io.v1alpha1.pb.html b/api/metaprotocol/v1alpha1/metaprotocol.aeraki.io.v1alpha1.pb.html
@@ -76,7 +76,9 @@ <h2 id="MetaRouter">MetaRouter</h2>
 <p>The destination service to which traffic is being sent.
 <em>Note for Kubernetes users</em>: It must be a fully qualified domain name
 (FQDN), (e.g. &ldquo;thrift-sample-server.meta-thrift.svc.cluster.local&rdquo; )
-instead of a short name (e.g. &ldquo;thrift-sample-server&rdquo;).</p>
+instead of a short name (e.g. &ldquo;thrift-sample-server&rdquo;).
+<em>Note</em>: Only one host is supported now. If multiple hosts are specified,
+Only the first one takes effect.</p>
 
 </td>
 <td>
@@ -132,7 +134,7 @@ <h2 id="MetaRouter">MetaRouter</h2>
 by default.</p>
 
 <p>The value &ldquo;.&rdquo; is reserved and defines an export to the same namespace that
-the virtual service is declared in. Similarly the value &ldquo;*&rdquo; is reserved and
+the MetaRouter is declared in. Similarly the value &ldquo;*&rdquo; is reserved and
 defines an export to all namespaces.</p>
 
 </td>

diff --git a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go
diff --git a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.proto b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.proto
@@ -44,7 +44,7 @@ option go_package = "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1";
 // +cue-gen:ApplicationProtocol:annotations:helm.sh/resource-policy=keep
 // +cue-gen:ApplicationProtocol:labels:app=aeraki,chart=aeraki,heritage=Tiller,release=aeraki
 // +cue-gen:ApplicationProtocol:subresource:status
-// +cue-gen:ApplicationProtocol:scope:Namespaced
+// +cue-gen:ApplicationProtocol:scope:Cluster
 // +cue-gen:ApplicationProtocol:resource:categories=aeraki-io,metaprotocol-aeraki-io
 // +cue-gen:ApplicationProtocol:preserveUnknownFields:false
 // -->

diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go
diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go
diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go
diff --git a/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go b/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go
diff --git a/crd/kubernetes/customresourcedefinitions.gen.yaml b/crd/kubernetes/customresourcedefinitions.gen.yaml
@@ -144,7 +144,7 @@ spec:
     listKind: ApplicationProtocolList
     plural: applicationprotocols
     singular: applicationprotocol
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1alpha1
     schema:

diff --git a/demo/install-aeraki.sh b/demo/install-aeraki.sh
@@ -25,4 +25,10 @@ else
   export AERAKI_TAG=$AERAKI_TAG
 fi
 
+if [ -z "$AERAKI_IMG_PULL_POLICY" ]; then
+  export $AERAKI_IMG_PULL_POLICY=Always
+else
+  export AERAKI_IMG_PULL_POLICY=$AERAKI_IMG_PULL_POLICY
+fi
+
 bash ${SCRIPTS_DIR}/aeraki.sh $1
diff --git a/demo/install-demo.sh b/demo/install-demo.sh
@@ -21,7 +21,7 @@ DEMO=$1
 SCRIPTS_DIR=$BASEDIR/test/e2e/scripts
 COMMON_DIR=$BASEDIR/test/e2e/common
 export ISTIO_VERSION=1.12.7
-export AERAKI_TAG=latest
+export AERAKI_TAG=1.1.0
 
 bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
 bash ${SCRIPTS_DIR}/aeraki.sh

diff --git a/demo/metaprotocol-brpc/brpc-protocol.yaml b/demo/metaprotocol-brpc/brpc-protocol.yaml
@@ -17,7 +17,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: brpc
-  namespace: istio-system
 spec:
   codec: aeraki.meta_protocol.codec.brpc
   protocol: brpc
diff --git a/demo/metaprotocol-qza/qza-protocol.yaml b/demo/metaprotocol-qza/qza-protocol.yaml
@@ -17,7 +17,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: qza
-  namespace: istio-system
 spec:
   codec: aeraki.meta_protocol.codec.qza
   protocol: qza
diff --git a/demo/metaprotocol-trpc/trpc-protocol.yaml b/demo/metaprotocol-trpc/trpc-protocol.yaml
@@ -17,7 +17,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: trpc
-  namespace: istio-system
 spec:
   codec: aeraki.meta_protocol.codec.trpc
   protocol: trpc
diff --git a/demo/metaprotocol-videopacket/videopacket-protocol.yaml b/demo/metaprotocol-videopacket/videopacket-protocol.yaml
@@ -17,7 +17,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: videopacket
-  namespace: istio-system
 spec:
   codec: aeraki.meta_protocol.codec.videopacket
   protocol: videopacket
diff --git a/k8s/aeraki.yaml b/k8s/aeraki.yaml
@@ -36,6 +36,8 @@ spec:
       containers:
         - name: aeraki
           image: aeraki/aeraki:${AERAKI_TAG}
+          # imagePullPolicy should be set to Never so Minikube can use local image for e2e testing
+          imagePullPolicy: ${AERAKI_IMG_PULL_POLICY}
           env:
             - name: AERAKI_IS_MASTER
               value: "${AERAKI_IS_MASTER}"
@@ -201,7 +203,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: dubbo
-  namespace: istio-system
 spec:
   protocol: dubbo
   codec: aeraki.meta_protocol.codec.dubbo
@@ -210,7 +211,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: thrift
-  namespace: istio-system
 spec:
   protocol: thrift
   codec: aeraki.meta_protocol.codec.thrift
diff --git a/k8s/crd.yaml b/k8s/crd.yaml
@@ -144,7 +144,7 @@ spec:
     listKind: ApplicationProtocolList
     plural: applicationprotocols
     singular: applicationprotocol
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1alpha1
     schema:

diff --git a/manifests/charts/aeraki/templates/applicationprotocol.yaml b/manifests/charts/aeraki/templates/applicationprotocol.yaml
@@ -17,7 +17,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: dubbo
-  namespace: istio-system
 spec:
   protocol: dubbo
   codec: aeraki.meta_protocol.codec.dubbo
@@ -26,7 +25,6 @@ apiVersion: metaprotocol.aeraki.io/v1alpha1
 kind: ApplicationProtocol
 metadata:
   name: thrift
-  namespace: istio-system
 spec:
   protocol: thrift
   codec: aeraki.meta_protocol.codec.thrift