From ac95f7364efc2d4cb569638ae0e22b9c496bce66 Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 21:20:22 +0530 Subject: [PATCH 1/8] Lifted changes from alphaX86:enhance and changed Bookinfo URL + Wrote emojivoto to a file Signed-off-by: hershd23 --- .github/workflows/auth.json | 1 + ...nfigurable-benchmark-test-self-hosted.yaml | 4 + .../configurable-benchmark-test.yaml | 132 +++++++++--------- .../scheduled-benchmarks-self-hosted.yaml | 20 ++- .github/workflows/scheduled-benchmarks.yml | 8 +- .github/workflows/scripts/istio_deploy.sh | 24 ++-- .github/workflows/scripts/linkerd_deploy.sh | 20 +-- .github/workflows/scripts/osm_deploy.sh | 23 ++- .github/workflows/scripts/stop-cil-runner.sh | 2 +- 9 files changed, 129 insertions(+), 105 deletions(-) create mode 100644 .github/workflows/auth.json diff --git a/.github/workflows/auth.json b/.github/workflows/auth.json new file mode 100644 index 0000000..74c1bf4 --- /dev/null +++ b/.github/workflows/auth.json @@ -0,0 +1 @@ +{"meshery-provider":"None","token":""} \ No newline at end of file diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 2d40e6f..65e71b3 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -27,6 +27,7 @@ on: jobs: start-runner: name: Start self-hosted CNCF CIL runner + timeout-minutes: 60 runs-on: ubuntu-latest if: ${{ github.event_name == 'workflow_dispatch' }} outputs: @@ -62,6 +63,7 @@ jobs: run-benchmarks: name: Run the configurable benchmarks on the runner + timeout-minutes: 60 needs: - start-runner # required to start the main job when the runner is ready runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner @@ -111,6 +113,7 @@ jobs: stop-runner: name: Stop self-hosted runner + timeout-minutes: 60 needs: - start-runner # required to get output from the start-runner job - run-benchmarks # required to wait when the main job is done @@ -127,6 +130,7 @@ jobs: shell: bash - name: Remove CNCF CIL runner from github repository + if: always() run: | runner_id=$(curl -s -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners | jq '.runners[] | select(.name == "${{ needs.start-runner.outputs.hostname }}") | {id}' | jq -r .id) curl -X DELETE -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners/$runner_id diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index 7e1940f..b7441d2 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -1,64 +1,68 @@ -# 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 - 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 - start args: "--v=5" - - - 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: 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 + 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: medyagh/setup-minikube@v0.0.7 + 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/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index 1201e3a..07f12cc 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -12,14 +12,15 @@ on: profile_filename: description: "test configuration file" required: false - # scheduled to run at everyday at 13:00 + # scheduled to run on everyhour schedule: - - cron: '0 13 * * *' + - cron: '0 * * * *' jobs: # Manual Benchmark Test start-runners-manual: name: Start self-hosted CNCF CIL runners for manual test + timeout-minutes: 60 runs-on: ubuntu-latest if: ${{ github.event_name == 'workflow_dispatch' }} strategy: @@ -60,6 +61,7 @@ jobs: manual-test: name: Manual Benchmark Test + timeout-minutes: 60 needs: - start-runners-manual runs-on: ${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ github.run_id }} @@ -84,6 +86,8 @@ jobs: sudo apt-cache policy docker-ce sudo apt install -y docker-ce sudo systemctl status docker + sudo mkdir -p ~/.kube + sudo chmod 777 ~/.kube - name: Setup Kubernetes uses: manusa/actions-setup-minikube@v2.4.3 @@ -119,6 +123,7 @@ jobs: stop-runner-manual: name: Stop self-hosted runner + timeout-minutes: 60 needs: - start-runners-manual # required to get output from the start-runner job - manual-test # required to wait when the main job is done @@ -140,6 +145,7 @@ jobs: shell: bash - name: Remove CNCF CIL runner from github repository + if: always() run: | runner_id=$(curl -s -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners | jq '.runners[] | select(.name == "${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ needs.start-runners-manual.outputs.github_run_id }}") | {id}' | jq -r .id) curl -X DELETE -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners/$runner_id @@ -148,6 +154,7 @@ jobs: # Scheduled Benchmark Test start-runners-scheduled: name: Start self-hosted CNCF CIL runners for scheduled test + timeout-minutes: 60 runs-on: ubuntu-latest if: ${{ github.event_name == 'schedule' }} strategy: @@ -189,6 +196,7 @@ jobs: scheduled-test: name: Scheduled Benchmark Test + timeout-minutes: 60 needs: - start-runners-scheduled runs-on: ${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ matrix.test-configuration }}-${{ github.run_id }} @@ -214,6 +222,8 @@ jobs: sudo apt-cache policy docker-ce sudo apt install -y docker-ce sudo systemctl status docker + sudo mkdir -p ~/.kube + sudo chmod 777 ~/.kube - name: Setup Kubernetes uses: manusa/actions-setup-minikube@v2.4.3 @@ -236,7 +246,7 @@ jobs: run: echo "::set-output name=date::$(date +'%Y-%m-%d-%H.%M.%S')" - name: Run Benchmark Tests - uses: layer5io/meshery-smp-action@self-hosted + uses: layer5io/meshery-smp-action@master with: provider_token: ${{ secrets.MESHERY_TOKEN }} platform: docker @@ -249,6 +259,7 @@ jobs: stop-runner-scheduled: name: Stop self-hosted runner + timeout-minutes: 60 needs: - start-runners-scheduled # required to get output from the start-runner job - scheduled-test # required to wait when the main job is done @@ -271,7 +282,8 @@ jobs: shell: bash - name: Remove CNCF CIL runner from github repository + if: always() run: | runner_id=$(curl -s -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners | jq '.runners[] | select(.name == "${{ matrix.service-mesh }}-${{ matrix.load-generator }}-${{ matrix.test-configuration }}-${{ needs.start-runners-scheduled.outputs.github_run_id }}") | {id}' | jq -r .id) curl -X DELETE -H 'Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}' -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${{github.repository}}/actions/runners/$runner_id - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 12c4b28..2e442a5 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -28,10 +28,10 @@ jobs: load-generator: ['fortio', 'wrk2'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.1 + uses: manusa/actions-setup-minikube@v2.4.3 with: minikube version: 'v1.23.2' - kubernetes version: 'v1.22.2' + kubernetes version: 'v1.23.2' driver: docker - name: Checkout Code @@ -71,10 +71,10 @@ jobs: test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.1 + uses: manusa/actions-setup-minikube@v2.4.3 with: minikube version: 'v1.23.2' - kubernetes version: 'v1.22.2' + kubernetes version: 'v1.23.2' driver: docker - name: Checkout Code diff --git a/.github/workflows/scripts/istio_deploy.sh b/.github/workflows/scripts/istio_deploy.sh index f448b14..a1896bd 100644 --- a/.github/workflows/scripts/istio_deploy.sh +++ b/.github/workflows/scripts/istio_deploy.sh @@ -1,24 +1,27 @@ #!/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='Istio' export SERVICE_MESH='ISTIO' -curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.11.4 sh - -cd istio-1.11.4 -export PATH=$PWD/bin:$PATH -istioctl install --set profile=demo -y -kubectl label namespace default istio-injection=enabled +# Check if mesheryctl is present, else install it +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=istio PLATFORM=kubernetes bash - +fi -kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -kubectl apply -f samples/bookinfo/networking/bookinfo-gateway.yaml +sleep 10 +#mesheryctl system login --provider None +echo 'E' | mesheryctl mesh deploy adapter meshery-istio: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" # Wait for the application to be ready -sleep 100 +sleep 50 # Get the gateway URL and export it and # Expose the service inside the cluster @@ -31,6 +34,5 @@ minikube tunnel &> /dev/null & echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Gateway URL: $GATEWAY_URL" - echo "ENDPOINT_URL=$GATEWAY_URL/productpage" >> $GITHUB_ENV echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV diff --git a/.github/workflows/scripts/linkerd_deploy.sh b/.github/workflows/scripts/linkerd_deploy.sh index 948acae..1c67d28 100644 --- a/.github/workflows/scripts/linkerd_deploy.sh +++ b/.github/workflows/scripts/linkerd_deploy.sh @@ -8,16 +8,18 @@ export MESH_NAME='Linkerd' export SERVICE_MESH='LINKERD' -curl -fsL https://run.linkerd.io/install | sh -export PATH=$PATH:/home/runner/.linkerd2/bin -linkerd version -linkerd check --pre -linkerd install | kubectl apply -f - -linkerd check +# Check if mesheryctl is present, else install it +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=linkerd PLATFORM=kubernetes bash - +fi -curl -fsL https://run.linkerd.io/emojivoto.yml | kubectl apply -f - -kubectl -n emojivoto port-forward svc/web-svc 8080:80 &> /dev/null & -kubectl get -n emojivoto deploy -o yaml | linkerd inject - | kubectl apply -f - +curl -fsL https://run.linkerd.io/emojivoto.yml --output emojivoto.yml +sleep 10 +mesheryctl system login --provider None +mesheryctl mesh deploy adapter meshery-linkerd:10001 +echo "Onboarding application... Standby for few minutes..." +mesheryctl app onboard -f "./emojivoto.yml" # Wait for the application to be ready sleep 100 diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index 42376a3..52ceac0 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -8,18 +8,17 @@ export MESH_NAME='Open Service Mesh' export SERVICE_MESH='OPEN_SERVICE_MESH' -system=$(uname -s) -release=v1.0.0 -curl -L https://github.com/openservicemesh/osm/releases/download/${release}/osm-${release}-${system,,}-amd64.tar.gz | tar -vxzf - -./${system,,}-amd64/osm install \ - --set=OpenServiceMesh.enablePermissiveTrafficPolicy=true \ - --set=OpenServiceMesh.deployPrometheus=true \ - --set=OpenServiceMesh.deployGrafana=true \ - --set=OpenServiceMesh.deployJaeger=true - -kubectl create namespace bookstore -./${system,,}-amd64/osm namespace add bookstore -kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookstore.yaml +# Check if mesheryctl is present, else install it +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=osm PLATFORM=kubernetes bash - +fi + +sleep 10 +mesheryctl system login --provider None +mesheryctl mesh deploy adapter meshery-osm:10009 +echo "Onboarding application... Standby for few minutes..." +mesheryctl app onboard -f "https://github.com/openservicemesh/osm-docs/release-v1.0/manifests/apps/bookstore.yaml" sleep 100 diff --git a/.github/workflows/scripts/stop-cil-runner.sh b/.github/workflows/scripts/stop-cil-runner.sh index 7b1d8b6..6c6d5c9 100644 --- a/.github/workflows/scripts/stop-cil-runner.sh +++ b/.github/workflows/scripts/stop-cil-runner.sh @@ -9,7 +9,7 @@ device_id=$3 if [[ -z $device_id ]]; then # If it's a scheduled benchmark test, we cannot get the orrespondence between hostname and # device_id from previous job, so we need to use hostname to retrive device_id - device_id=$(curl -H "X-Auth-Token: $token " https://api.equinix.com/metal/v1/projects/96a9d336-541b-42f7-9827-d845010da550/devices | jq '.devices[] | select(.hostname == '\"$hostname\"') | {id}' | jq -r .id) + device_id=$(curl -H "X-Auth-Token: $token " https://api.equinix.com/metal/v1/projects/96a9d336-541b-42f7-9827-d845010da550/devices?hostname=${hostname} | jq '.devices[] | {id}' | jq -r .id) fi echo "Removing CNCF CIL machine: $hostname, device id: $device_id..." From 29ddeb2054371a8d97e13c837d57db6f2e2a0f1f Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 21:56:29 +0530 Subject: [PATCH 2/8] Added osm and changed Linkerd from onboard to apply Signed-off-by: hershd23 --- .github/workflows/configurable-benchmark-test-self-hosted.yaml | 1 + .github/workflows/scripts/linkerd_deploy.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 65e71b3..2e505b4 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 load_generator: type: choice required: false diff --git a/.github/workflows/scripts/linkerd_deploy.sh b/.github/workflows/scripts/linkerd_deploy.sh index 1c67d28..57d5787 100644 --- a/.github/workflows/scripts/linkerd_deploy.sh +++ b/.github/workflows/scripts/linkerd_deploy.sh @@ -19,7 +19,8 @@ sleep 10 mesheryctl system login --provider None mesheryctl mesh deploy adapter meshery-linkerd:10001 echo "Onboarding application... Standby for few minutes..." -mesheryctl app onboard -f "./emojivoto.yml" +#mesheryctl app onboard -f "./emojivoto.yml" +mesheryctl pattern apply -f "./emojivoto.yml" # Wait for the application to be ready sleep 100 From a6927770d2b4189155d397cc63dcbee6d7283d44 Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 21:59:40 +0530 Subject: [PATCH 3/8] Adding osm to configurable test Signed-off-by: hershd23 --- .github/workflows/configurable-benchmark-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index b7441d2..22017c6 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -19,6 +19,7 @@ on: options: - istio - linkerd + - osm load_generator: type: choice required: false From e22ad7d0a9256c67c17f28f9e67e3ebaccfd8f1c Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 22:10:32 +0530 Subject: [PATCH 4/8] Changing osm bookstore URL Signed-off-by: hershd23 --- .github/workflows/scripts/osm_deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index 52ceac0..746a812 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -18,7 +18,8 @@ sleep 10 mesheryctl system login --provider None mesheryctl mesh deploy adapter meshery-osm:10009 echo "Onboarding application... Standby for few minutes..." -mesheryctl app onboard -f "https://github.com/openservicemesh/osm-docs/release-v1.0/manifests/apps/bookstore.yaml" +#mesheryctl app onboard -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" +mesheryctl pattern apply -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" --token "./.github/workflows/auth.json" sleep 100 From f37f92aa67f41b489c5a6850305a99564cd327b3 Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 22:38:46 +0530 Subject: [PATCH 5/8] Using app onboard for linkerd and osm Signed-off-by: hershd23 --- .github/workflows/scripts/linkerd_deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/linkerd_deploy.sh b/.github/workflows/scripts/linkerd_deploy.sh index 57d5787..128d907 100644 --- a/.github/workflows/scripts/linkerd_deploy.sh +++ b/.github/workflows/scripts/linkerd_deploy.sh @@ -19,8 +19,8 @@ sleep 10 mesheryctl system login --provider None mesheryctl mesh deploy adapter meshery-linkerd:10001 echo "Onboarding application... Standby for few minutes..." -#mesheryctl app onboard -f "./emojivoto.yml" -mesheryctl pattern apply -f "./emojivoto.yml" +mesheryctl app onboard -f "./emojivoto.yml" +#mesheryctl pattern apply -f "./emojivoto.yml" # Wait for the application to be ready sleep 100 From 1ae4d46c0f01fbfed517774dc3c7e57a249d85fa Mon Sep 17 00:00:00 2001 From: hershd23 Date: Wed, 15 Jun 2022 23:03:02 +0530 Subject: [PATCH 6/8] Downloading the application for OSM before onboarding Signed-off-by: hershd23 --- .github/workflows/scripts/osm_deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh index 746a812..d118129 100755 --- a/.github/workflows/scripts/osm_deploy.sh +++ b/.github/workflows/scripts/osm_deploy.sh @@ -14,12 +14,13 @@ if ! [ -x "$(command -v mesheryctl)" ]; then curl -L https://meshery.io/install | ADAPTERS=osm PLATFORM=kubernetes bash - fi +curl -fsL https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml --output bookstore.yaml sleep 10 mesheryctl system login --provider None mesheryctl mesh deploy adapter meshery-osm:10009 echo "Onboarding application... Standby for few minutes..." -#mesheryctl app onboard -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" -mesheryctl pattern apply -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" --token "./.github/workflows/auth.json" +mesheryctl app onboard -f "./bookstore.yaml" +#mesheryctl pattern apply -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" --token "./.github/workflows/auth.json" sleep 100 From f23c9b3cb90ceb2e8a878fd997483af6761caa52 Mon Sep 17 00:00:00 2001 From: hershd23 Date: Thu, 23 Jun 2022 22:53:10 +0530 Subject: [PATCH 7/8] Replaced minikube install action Signed-off-by: hershd23 --- .github/workflows/configurable-benchmark-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index 22017c6..aad26f8 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -36,7 +36,7 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' }} steps: - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.7 + uses: manusa/actions-setup-minikube@v2.4.3 with: minikube version: v1.23.2 kubernetes version: v1.23.2 From eb4e7e589ccc14e1d2204640da13fec0616dbdd8 Mon Sep 17 00:00:00 2001 From: hershd23 Date: Sat, 25 Jun 2022 16:23:43 +0530 Subject: [PATCH 8/8] Increased sleep time Signed-off-by: hershd23 --- .github/workflows/scripts/istio_deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/istio_deploy.sh b/.github/workflows/scripts/istio_deploy.sh index a1896bd..d7cee1b 100644 --- a/.github/workflows/scripts/istio_deploy.sh +++ b/.github/workflows/scripts/istio_deploy.sh @@ -16,7 +16,7 @@ fi sleep 10 #mesheryctl system login --provider None echo 'E' | mesheryctl mesh deploy adapter meshery-istio:10000 --token "./.github/workflows/auth.json" -sleep 50 +sleep 100 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"