From 190bf2c755eed75e7215e4dab89f5ef11ebed499 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Fri, 13 May 2022 19:28:19 +0800 Subject: [PATCH 1/9] Add Meshes: Kuma, App Mesh, Consul, Cilium Signed-off-by: Huang Xin --- ...nfigurable-benchmark-test-self-hosted.yaml | 4 + .../configurable-benchmark-test.yaml | 142 +++++++++--------- .github/workflows/scripts/appmesh_deploy.sh | 25 +++ .github/workflows/scripts/cilium_deploy.sh | 25 +++ .github/workflows/scripts/consul_deploy.sh | 25 +++ .github/workflows/scripts/kuma_deploy.sh | 30 ++++ 6 files changed, 182 insertions(+), 69 deletions(-) create mode 100644 .github/workflows/scripts/appmesh_deploy.sh create mode 100644 .github/workflows/scripts/cilium_deploy.sh create mode 100644 .github/workflows/scripts/consul_deploy.sh create mode 100644 .github/workflows/scripts/kuma_deploy.sh diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 2e505b4..a659080 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -16,6 +16,10 @@ on: - istio - linkerd - osm + - kuma + - appmesh + - cilium + - consul load_generator: type: choice required: false diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index aad26f8..fabd166 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -1,69 +1,73 @@ -# This workflow runs performance benchmarks with Meshery based on the configuration provided -# This workflow needs to be triggered manually by providing the test configuration - -name: Configurable Benchmark Test -on: - # for triggering the workflow, provide these inputs - workflow_dispatch: - inputs: - profile_name: - description: "performance profile to use" - required: false - profile_filename: - description: "test configuration file" - required: false - service_mesh: - type: choice - required: false - description: "service mesh being tested" - options: - - istio - - linkerd - - osm - load_generator: - type: choice - required: false - description: "load generator to run tests with" - options: - - fortio - - wrk2 - - nighthawk - -jobs: - manual-test: - name: Configurable Benchmark Test - runs-on: ubuntu-latest - if: ${{ github.event_name == 'workflow_dispatch' }} - steps: - - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 - with: - minikube version: v1.23.2 - kubernetes version: v1.23.2 - driver: docker - apus: 4 - memory: 5192 - - - name: Checkout Code - uses: actions/checkout@v2 - - - name: Install Service Mesh and Deploy Application - run: | - chmod +x .github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh - .github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh - shell: bash - - - name: Initiate tmate session - uses: mxschmitt/action-tmate@v3 - - - name: Run Benchmark Tests - uses: layer5io/meshery-smp-action@master - with: - provider_token: ${{ secrets.MESHERY_TOKEN }} - platform: docker - profile_name: ${{ github.event.inputs.profile_name }} - profile_filename: ${{ github.event.inputs.profile_filename }} - endpoint_url: ${{env.ENDPOINT_URL}} - service_mesh: ${{env.SERVICE_MESH}} - load_generator: ${{ github.event.inputs.load_generator }} - test_name: '${{ github.event.inputs.service_mesh }}-${{ github.event.inputs.load_generator }}-${{ github.event.inputs.profile_filename }}${{ github.event.inputs.profile_name }}' +# This workflow runs performance benchmarks with Meshery based on the configuration provided +# This workflow needs to be triggered manually by providing the test configuration + +name: Configurable Benchmark Test +on: + # for triggering the workflow, provide these inputs + workflow_dispatch: + inputs: + profile_name: + description: "performance profile to use" + required: false + profile_filename: + description: "test configuration file" + required: false + service_mesh: + type: choice + required: false + description: "service mesh being tested" + options: + - istio + - linkerd + - osm + - kuma + - appmesh + - cilium + - consul + load_generator: + type: choice + required: false + description: "load generator to run tests with" + options: + - fortio + - wrk2 + - nighthawk + +jobs: + manual-test: + name: Configurable Benchmark Test + runs-on: ubuntu-latest + if: ${{ github.event_name == 'workflow_dispatch' }} + steps: + - name: Setup Kubernetes + uses: manusa/actions-setup-minikube@v2.4.3 + with: + minikube version: v1.23.2 + kubernetes version: v1.23.2 + driver: docker + apus: 4 + memory: 5192 + + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Install Service Mesh and Deploy Application + run: | + chmod +x .github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh + .github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh + shell: bash + + - name: Initiate tmate session + uses: mxschmitt/action-tmate@v3 + + - name: Run Benchmark Tests + uses: layer5io/meshery-smp-action@master + with: + provider_token: ${{ secrets.MESHERY_TOKEN }} + platform: docker + profile_name: ${{ github.event.inputs.profile_name }} + profile_filename: ${{ github.event.inputs.profile_filename }} + endpoint_url: ${{env.ENDPOINT_URL}} + service_mesh: ${{env.SERVICE_MESH}} + load_generator: ${{ github.event.inputs.load_generator }} + test_name: '${{ github.event.inputs.service_mesh }}-${{ github.event.inputs.load_generator }}-${{ github.event.inputs.profile_filename }}${{ github.event.inputs.profile_name }}' diff --git a/.github/workflows/scripts/appmesh_deploy.sh b/.github/workflows/scripts/appmesh_deploy.sh new file mode 100644 index 0000000..17e7ae8 --- /dev/null +++ b/.github/workflows/scripts/appmesh_deploy.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# This script is used to deploy Istio on Kubernetes +# +# Also deploys the bookinfo application on Istio and passes the gateway URL to Meshery +# See: https://github.com/service-mesh-performance/service-mesh-performance/blob/master/protos/service_mesh.proto + +export MESH_NAME='App Mesh' +export SERVICE_MESH='APP_MESH' + +# Check if mesheryctl is present, else install it and deploy Kuma adapter +if ! [ -x "$(command -v mesheryctl)" ]; then + echo 'mesheryctl is not installed. Installing mesheryctl client... Standby... (Starting Meshery as well...)' >&2 + curl -L https://meshery.io/install | ADAPTERS=appmesh PLATFORM=kubernetes bash - +fi + +sleep 10 + +# TODO: Deploy demo apps + +echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" +echo "Endpoint URL: http://localhost:5000" + +# Pass the endpoint to be used by Meshery +echo "ENDPOINT_URL=http://localhost:5000" >> $GITHUB_ENV +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/scripts/cilium_deploy.sh b/.github/workflows/scripts/cilium_deploy.sh new file mode 100644 index 0000000..d111e73 --- /dev/null +++ b/.github/workflows/scripts/cilium_deploy.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# This script is used to deploy Istio on Kubernetes +# +# Also deploys the bookinfo application on Istio and passes the gateway URL to Meshery +# See: https://github.com/service-mesh-performance/service-mesh-performance/blob/master/protos/service_mesh.proto + +export MESH_NAME='Cilium' +export SERVICE_MESH='CILIUM' + +# Check if mesheryctl is present, else install it and deploy Kuma adapter +if ! [ -x "$(command -v mesheryctl)" ]; then + echo 'mesheryctl is not installed. Installing mesheryctl client... Standby... (Starting Meshery as well...)' >&2 + curl -L https://meshery.io/install | ADAPTERS=cilium PLATFORM=kubernetes bash - +fi + +sleep 10 + +# TODO: Deploy demo apps + +echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" +echo "Endpoint URL: http://localhost:5000" + +# Pass the endpoint to be used by Meshery +echo "ENDPOINT_URL=http://localhost:5000" >> $GITHUB_ENV +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/scripts/consul_deploy.sh b/.github/workflows/scripts/consul_deploy.sh new file mode 100644 index 0000000..5fcff8f --- /dev/null +++ b/.github/workflows/scripts/consul_deploy.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# This script is used to deploy Istio on Kubernetes +# +# Also deploys the bookinfo application on Istio and passes the gateway URL to Meshery +# See: https://github.com/service-mesh-performance/service-mesh-performance/blob/master/protos/service_mesh.proto + +export MESH_NAME='Consul' +export SERVICE_MESH='CONSUL' + +# Check if mesheryctl is present, else install it and deploy Kuma adapter +if ! [ -x "$(command -v mesheryctl)" ]; then + echo 'mesheryctl is not installed. Installing mesheryctl client... Standby... (Starting Meshery as well...)' >&2 + curl -L https://meshery.io/install | ADAPTERS=consul PLATFORM=kubernetes bash - +fi + +sleep 10 + +# TODO: Deploy demo apps + +echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" +echo "Endpoint URL: http://localhost:5000" + +# Pass the endpoint to be used by Meshery +echo "ENDPOINT_URL=http://localhost:5000" >> $GITHUB_ENV +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file diff --git a/.github/workflows/scripts/kuma_deploy.sh b/.github/workflows/scripts/kuma_deploy.sh new file mode 100644 index 0000000..9a23bf3 --- /dev/null +++ b/.github/workflows/scripts/kuma_deploy.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# This script is used to deploy Istio on Kubernetes +# +# Also deploys the bookinfo application on Istio and passes the gateway URL to Meshery +# See: https://github.com/service-mesh-performance/service-mesh-performance/blob/master/protos/service_mesh.proto + +export MESH_NAME='Kuma' +export SERVICE_MESH='Kuma' + +# Check if mesheryctl is present, else install it and deploy Kuma adapter +if ! [ -x "$(command -v mesheryctl)" ]; then + echo 'mesheryctl is not installed. Installing mesheryctl client... Standby... (Starting Meshery as well...)' >&2 + curl -L https://meshery.io/install | ADAPTERS=kuma PLATFORM=kubernetes bash - +fi + +sleep 10 +echo "Deploying demo application on Kuma..." +# Refer to https://kuma.io/docs/1.6.x/quickstart/kubernetes/#set-up-and-run +git clone https://github.com/kumahq/kuma-counter-demo.git && cd kuma-counter-demo +kubectl apply -f demo.yaml +echo "Waiting for the application to be ready..." +sleep 100 +kubectl port-forward svc/demo-app -n kuma-demo 5000:5000 & + +echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" +echo "Endpoint URL: http://localhost:5000" + +# Pass the endpoint to be used by Meshery +echo "ENDPOINT_URL=http://localhost:5000" >> $GITHUB_ENV +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file From 6a9d82aaeea1161cb447602de9371031e7514273 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Fri, 13 May 2022 23:36:37 +0800 Subject: [PATCH 2/9] Consul demp apps Signed-off-by: Huang Xin --- .github/workflows/scripts/consul_deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/consul_deploy.sh b/.github/workflows/scripts/consul_deploy.sh index 5fcff8f..742fbea 100644 --- a/.github/workflows/scripts/consul_deploy.sh +++ b/.github/workflows/scripts/consul_deploy.sh @@ -15,7 +15,8 @@ fi sleep 10 -# TODO: Deploy demo apps +# TODO: Didn't find a demo apps on Consule, so use bookinfo app. +mesheryctl app onboard -f "https://raw.githubusercontent.com/istio/istio/blob/master/samples/bookinfo/platform/kube/bookinfo.yaml" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" From 7530bda4f927402bb9f37744d9bf84c884d8abf2 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Thu, 23 Jun 2022 15:14:51 +0800 Subject: [PATCH 3/9] Delete OSM. Change 'app onboard' to 'pattern apply'. Signed-off-by: Huang Xin --- .../workflows/configurable-benchmark-test-self-hosted.yaml | 1 - .github/workflows/configurable-benchmark-test.yaml | 1 - .github/workflows/scripts/appmesh_deploy.sh | 5 ++++- .github/workflows/scripts/cilium_deploy.sh | 6 +++++- .github/workflows/scripts/consul_deploy.sh | 6 ++++-- .github/workflows/scripts/osm_deploy.sh | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index a659080..ce5276b 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -15,7 +15,6 @@ on: options: - istio - linkerd - - osm - kuma - appmesh - cilium diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index fabd166..f0678ce 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -19,7 +19,6 @@ on: options: - istio - linkerd - - osm - kuma - appmesh - cilium diff --git a/.github/workflows/scripts/appmesh_deploy.sh b/.github/workflows/scripts/appmesh_deploy.sh index 17e7ae8..f798cae 100644 --- a/.github/workflows/scripts/appmesh_deploy.sh +++ b/.github/workflows/scripts/appmesh_deploy.sh @@ -15,7 +15,10 @@ fi sleep 10 -# TODO: Deploy demo apps +echo 'E' | mesheryctl mesh deploy adapter meshery-appmesh:10000 --token "./.github/workflows/auth.json" +sleep 50 +echo "Onboarding application... Standby for few minutes..." +mesheryctl pattern apply -f "https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/bookInfoPattern.yaml" --token "./.github/workflows/auth.json" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/cilium_deploy.sh b/.github/workflows/scripts/cilium_deploy.sh index d111e73..53f2d54 100644 --- a/.github/workflows/scripts/cilium_deploy.sh +++ b/.github/workflows/scripts/cilium_deploy.sh @@ -15,7 +15,11 @@ fi sleep 10 -# TODO: Deploy demo apps +#mesheryctl system login --provider None +echo 'E' | mesheryctl mesh deploy adapter meshery-cilium:10000 --token "./.github/workflows/auth.json" +sleep 50 +echo "Onboarding application... Standby for few minutes..." +mesheryctl pattern apply -f "https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/bookInfoPattern.yaml" --token "./.github/workflows/auth.json" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/consul_deploy.sh b/.github/workflows/scripts/consul_deploy.sh index 742fbea..5d73f03 100644 --- a/.github/workflows/scripts/consul_deploy.sh +++ b/.github/workflows/scripts/consul_deploy.sh @@ -15,8 +15,10 @@ fi sleep 10 -# TODO: Didn't find a demo apps on Consule, so use bookinfo app. -mesheryctl app onboard -f "https://raw.githubusercontent.com/istio/istio/blob/master/samples/bookinfo/platform/kube/bookinfo.yaml" +echo 'E' | mesheryctl mesh deploy adapter meshery-consul:10000 --token "./.github/workflows/auth.json" +sleep 50 +echo "Onboarding application... Standby for few minutes..." +mesheryctl pattern apply -f "https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/bookInfoPattern.yaml" --token "./.github/workflows/auth.json" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index d118129..d7c3db8 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -47,4 +47,4 @@ echo "Endpoint URL: http://localhost:15000" # Pass the endpoint to be used by Meshery echo "ENDPOINT_URL=http://localhost:15000" >> $GITHUB_ENV -echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV`` \ No newline at end of file From 83df6e7c9fc63ebfed0b0ba69f150b86d978108e Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Fri, 24 Jun 2022 15:45:56 +0800 Subject: [PATCH 4/9] Add other meshes in scheduled-benchmarks Signed-off-by: Huang Xin --- .github/workflows/scheduled-benchmarks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 2e442a5..97b34ae 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -24,8 +24,8 @@ jobs: strategy: fail-fast: false matrix: - service-mesh: ['istio', 'linkerd'] - load-generator: ['fortio', 'wrk2'] + service-mesh: ['istio', 'linkerd', 'consul', 'kuma', 'appmesh', 'cilium'] + load-generator: ['fortio', 'wrk2', 'nighthawk'] steps: - name: Setup Kubernetes uses: manusa/actions-setup-minikube@v2.4.3 From 369a04ee6f9063d3b5a309a2cde9eff5cc5c6e76 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Mon, 4 Jul 2022 13:18:27 +0800 Subject: [PATCH 5/9] re-add osm Signed-off-by: Huang Xin --- .../workflows/configurable-benchmark-test-self-hosted.yaml | 1 + .github/workflows/configurable-benchmark-test.yaml | 1 + .github/workflows/scheduled-benchmarks.yml | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index ce5276b..a659080 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -15,6 +15,7 @@ on: options: - istio - linkerd + - osm - kuma - appmesh - cilium diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index f0678ce..fabd166 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -19,6 +19,7 @@ on: options: - istio - linkerd + - osm - kuma - appmesh - cilium diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 97b34ae..205fb49 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -66,8 +66,8 @@ jobs: strategy: fail-fast: false matrix: - service-mesh: ['istio', 'linkerd', 'osm'] - load-generator: ['fortio', 'wrk2'] + service-mesh: ['istio', 'linkerd', 'osm', 'consul', 'kuma', 'appmesh', 'cilium'] + load-generator: ['fortio', 'wrk2', 'nighthawk'] test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes From 97db7a649c6463f40a38f732e2205357afca7e8c Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Mon, 4 Jul 2022 13:25:56 +0800 Subject: [PATCH 6/9] fix typos Signed-off-by: Huang Xin --- .github/workflows/scripts/osm_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index d7c3db8..6f52cf8 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -47,4 +47,4 @@ echo "Endpoint URL: http://localhost:15000" # Pass the endpoint to be used by Meshery echo "ENDPOINT_URL=http://localhost:15000" >> $GITHUB_ENV -echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV`` \ No newline at end of file +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file From d5b2f198a18bcdfa74089aeeceef4bf6200186bd Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Mon, 4 Jul 2022 13:38:40 +0800 Subject: [PATCH 7/9] change meshery-smp-action test release Signed-off-by: Huang Xin --- .github/workflows/configurable-benchmark-test-self-hosted.yaml | 2 +- .github/workflows/scheduled-benchmarks-self-hosted.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index a659080..555eb1b 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -105,7 +105,7 @@ jobs: shell: bash - name: Run Benchmark Tests - uses: layer5io/meshery-smp-action@master + uses: gyohuangxin/meshery-smp-action@master with: provider_token: ${{ secrets.MESHERY_TOKEN }} platform: docker diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index 07f12cc..974a16f 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -110,7 +110,7 @@ jobs: run: echo "::set-output name=date::$(date +'%Y-%m-%d-%H.%M.%S')" - name: Run Benchmark Tests - uses: layer5io/meshery-smp-action@master + uses: gyohuangxin/meshery-smp-action@master with: provider_token: ${{ secrets.MESHERY_TOKEN }} platform: docker From 93d93db1c94c3e087b675c8df43dc86a4ad55f35 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Wed, 6 Jul 2022 10:00:06 +0800 Subject: [PATCH 8/9] Fix app mesh typos. Signed-off-by: Huang Xin --- .github/workflows/scripts/appmesh_deploy.sh | 4 ++-- .github/workflows/scripts/osm_deploy.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/appmesh_deploy.sh b/.github/workflows/scripts/appmesh_deploy.sh index f798cae..1f73c60 100644 --- a/.github/workflows/scripts/appmesh_deploy.sh +++ b/.github/workflows/scripts/appmesh_deploy.sh @@ -10,12 +10,12 @@ export SERVICE_MESH='APP_MESH' # Check if mesheryctl is present, else install it and deploy Kuma adapter if ! [ -x "$(command -v mesheryctl)" ]; then echo 'mesheryctl is not installed. Installing mesheryctl client... Standby... (Starting Meshery as well...)' >&2 - curl -L https://meshery.io/install | ADAPTERS=appmesh PLATFORM=kubernetes bash - + curl -L https://meshery.io/install | ADAPTERS=app-mesh PLATFORM=kubernetes bash - fi sleep 10 -echo 'E' | mesheryctl mesh deploy adapter meshery-appmesh:10000 --token "./.github/workflows/auth.json" +echo 'E' | mesheryctl mesh deploy adapter meshery-app-mesh:10000 --token "./.github/workflows/auth.json" sleep 50 echo "Onboarding application... Standby for few minutes..." mesheryctl pattern apply -f "https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/bookInfoPattern.yaml" --token "./.github/workflows/auth.json" diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index 6f52cf8..d118129 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -47,4 +47,4 @@ echo "Endpoint URL: http://localhost:15000" # Pass the endpoint to be used by Meshery echo "ENDPOINT_URL=http://localhost:15000" >> $GITHUB_ENV -echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV \ No newline at end of file +echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV From f4590eab92ad03c1d21fc09419869a69d1398131 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Wed, 6 Jul 2022 10:22:30 +0800 Subject: [PATCH 9/9] Add Kuma adapter Signed-off-by: Huang Xin --- .github/workflows/scripts/kuma_deploy.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/kuma_deploy.sh b/.github/workflows/scripts/kuma_deploy.sh index 9a23bf3..3b5d8a6 100644 --- a/.github/workflows/scripts/kuma_deploy.sh +++ b/.github/workflows/scripts/kuma_deploy.sh @@ -14,12 +14,15 @@ if ! [ -x "$(command -v mesheryctl)" ]; then fi sleep 10 + +echo 'E' | mesheryctl mesh deploy adapter meshery-kuma:10000 --token "./.github/workflows/auth.json" +sleep 50 echo "Deploying demo application on Kuma..." # Refer to https://kuma.io/docs/1.6.x/quickstart/kubernetes/#set-up-and-run git clone https://github.com/kumahq/kuma-counter-demo.git && cd kuma-counter-demo kubectl apply -f demo.yaml echo "Waiting for the application to be ready..." -sleep 100 +sleep 50 kubectl port-forward svc/demo-app -n kuma-demo 5000:5000 & echo "Service Mesh: $MESH_NAME - $SERVICE_MESH"