From 0fe1b1f50175ebb12570eb3f57599298807310a6 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 13:42:15 +0530 Subject: [PATCH 01/22] Change action version Signed-off-by: Aadhitya A --- .../workflows/configurable-benchmark-test-self-hosted.yaml | 2 +- .github/workflows/configurable-benchmark-test.yaml | 2 +- .github/workflows/scheduled-benchmarks-self-hosted.yaml | 4 ++-- .github/workflows/scheduled-benchmarks.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 60f1efb..53a6857 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -85,7 +85,7 @@ jobs: sudo systemctl status docker - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index 47b7c2a..50f58b5 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: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: v1.23.2 kubernetes version: v1.23.2 diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index e14b8d7..659e582 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -90,7 +90,7 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' @@ -227,7 +227,7 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 6c2b644..a50e7cf 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -28,7 +28,7 @@ jobs: load-generator: ['fortio', 'wrk2'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' @@ -72,7 +72,7 @@ jobs: test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.1 + uses: manusa/actions-setup-minikube@v2.7.0 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' From 7b92619006496e023c8fc18fee009b186586e49d Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 14:55:05 +0530 Subject: [PATCH 02/22] Change GH action Signed-off-by: Aadhitya A --- .../configurable-benchmark-test-self-hosted.yaml | 4 ++-- .github/workflows/configurable-benchmark-test.yaml | 4 ++-- .github/workflows/scheduled-benchmarks-self-hosted.yaml | 8 ++++---- .github/workflows/scheduled-benchmarks.yml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 53a6857..475ec3c 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -85,12 +85,12 @@ jobs: sudo systemctl status docker - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index 50f58b5..a52e50d 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -36,12 +36,12 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' }} steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: v1.23.2 kubernetes version: v1.23.2 driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index 659e582..a21c35a 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -90,12 +90,12 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 @@ -227,12 +227,12 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index a50e7cf..d58b029 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -28,12 +28,12 @@ jobs: load-generator: ['fortio', 'wrk2'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 @@ -72,12 +72,12 @@ jobs: test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.7.0 + uses: medyagh/setup-minikube@v0.0.8 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - start args: --disk-size 10000mb + memory: 10000m - name: Checkout Code uses: actions/checkout@v2 From b80646b9eac22bb4829a22227a659ec3ce0a30fd Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 15:25:13 +0530 Subject: [PATCH 03/22] Revert action on self-hosted runners Signed-off-by: Aadhitya A --- .../workflows/configurable-benchmark-test-self-hosted.yaml | 6 ++++-- .github/workflows/scheduled-benchmarks-self-hosted.yaml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 475ec3c..b2e2d73 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -83,14 +83,16 @@ 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: medyagh/setup-minikube@v0.0.8 + uses: manusa/setup-minikube@v2.6.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - memory: 10000m + start-args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index a21c35a..c4740b3 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -90,12 +90,12 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.8 + uses: manusa/setup-minikube@v2.6.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - memory: 10000m + start-args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 From 60ab06e0e61f4a8aa883936df1c1bfe3a4db5c45 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 15:33:56 +0530 Subject: [PATCH 04/22] Make changes Signed-off-by: Aadhitya A --- .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 b2e2d73..7f9f7d5 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -87,7 +87,7 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/setup-minikube@v2.6.1 + uses: manusa/actions-setup-minikube@v2.6.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index c4740b3..feca73a 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -90,7 +90,7 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/setup-minikube@v2.6.1 + uses: manusa/actions-setup-minikube@v2.6.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' From af1fc434a4c4c173fc6f30fa8451b824efe0a25d Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 15:44:04 +0530 Subject: [PATCH 05/22] Edit workflow for testing Signed-off-by: Aadhitya A --- .../configurable-benchmark-test-self-hosted.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 7f9f7d5..103d752 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -85,14 +85,13 @@ jobs: sudo systemctl status docker sudo mkdir -p ~/.kube sudo chmod 777 ~/.kube + curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 + sudo install minikube-linux-amd64 /usr/local/bin/minikube - - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.6.1 - with: - minikube version: 'v1.23.2' - kubernetes version: 'v1.23.2' - driver: docker - start-args: --disk-size 10000mb + - name: Start minikube + run: | + sudo minikube start + kubectl get po -A - name: Checkout Code uses: actions/checkout@v2 From e364dcc93363685e8e1bda3a53f78171902e8bfe Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 15:58:20 +0530 Subject: [PATCH 06/22] Edit permission in minikube Signed-off-by: Aadhitya A --- .github/workflows/configurable-benchmark-test-self-hosted.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 103d752..8252d6f 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -90,7 +90,7 @@ jobs: - name: Start minikube run: | - sudo minikube start + minikube start kubectl get po -A - name: Checkout Code From 25510b18977e3dcb5cc65e9f548e440cf8d52548 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 16:26:22 +0530 Subject: [PATCH 07/22] Edit script Signed-off-by: Aadhitya A --- mesheryctl.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index 5f709e4..620a20a 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -32,10 +32,10 @@ main() { shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery_meshery_1 - docker network connect minikube meshery_meshery_1 - docker network connect bridge meshery_meshery_"$shortName"_1 - docker network connect minikube meshery_meshery_"$shortName"_1 + docker network connect bridge meshery-meshery-1 + docker network connect minikube meshery-meshery-1 + docker network connect bridge meshery-meshery-"$shortName"-1 + docker network connect minikube meshery-meshery-"$shortName"-1 mesheryctl system config minikube -t ~/auth.json fi @@ -48,12 +48,12 @@ main() { shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery_meshery_"$shortName"_1 - docker network connect minikube meshery_meshery_"$shortName"_1 + docker network connect bridge meshery-meshery-"$shortName"-1 + docker network connect minikube meshery-meshery-"$shortName"-1 done - docker network connect bridge meshery_meshery_1 - docker network connect minikube meshery_meshery_1 + docker network connect bridge meshery-meshery-1 + docker network connect minikube meshery-meshery-1 mesheryctl system config minikube -t ~/auth.json echo "Configuration file: $perf_filename" From b182a1a0b1177bf66094dad6fc0ad88f486121de Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 22:51:13 +0530 Subject: [PATCH 08/22] Correct minor bugs in bash scripts Signed-off-by: Aadhitya A --- meshery.sh | 2 +- mesheryctl.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meshery.sh b/meshery.sh index 08dcf3e..aafa104 100755 --- a/meshery.sh +++ b/meshery.sh @@ -46,7 +46,7 @@ create_k8s_cluster() { sudo apt update -y sudo apt install conntrack minikube version - minikube start --driver=none --kubernetes-version=v1.20.7 + minikube start --driver=none --kubernetes-version=v1.23.2 sleep 40 } diff --git a/mesheryctl.sh b/mesheryctl.sh index 620a20a..ad6a9c1 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -32,10 +32,10 @@ main() { shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery-meshery-1 - docker network connect minikube meshery-meshery-1 - docker network connect bridge meshery-meshery-"$shortName"-1 - docker network connect minikube meshery-meshery-"$shortName"-1 + docker network connect bridge meshery_meshery-1 + docker network connect minikube meshery_meshery-1 + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 mesheryctl system config minikube -t ~/auth.json fi @@ -48,12 +48,12 @@ main() { shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery-meshery-"$shortName"-1 - docker network connect minikube meshery-meshery-"$shortName"-1 + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 done - docker network connect bridge meshery-meshery-1 - docker network connect minikube meshery-meshery-1 + docker network connect bridge meshery_meshery_1 + docker network connect minikube meshery_meshery_1 mesheryctl system config minikube -t ~/auth.json echo "Configuration file: $perf_filename" From 44450a4e4c2a10cff7e2d3876e50141a7b936ce3 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 22:52:10 +0530 Subject: [PATCH 09/22] Correct minor mistake Signed-off-by: Aadhitya A --- mesheryctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index ad6a9c1..6e3e47d 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -32,8 +32,8 @@ main() { shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery_meshery-1 - docker network connect minikube meshery_meshery-1 + docker network connect bridge meshery_meshery_1 + docker network connect minikube meshery_meshery_1 docker network connect bridge meshery_meshery-"$shortName"_1 docker network connect minikube meshery_meshery-"$shortName"_1 From 683d0409794758504297e27a528871816017f44b Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 15 Nov 2022 22:54:59 +0530 Subject: [PATCH 10/22] Edit memory size Signed-off-by: Aadhitya A --- .github/workflows/configurable-benchmark-test.yaml | 2 +- .github/workflows/scheduled-benchmarks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index a52e50d..c801677 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -41,7 +41,7 @@ jobs: minikube version: v1.23.2 kubernetes version: v1.23.2 driver: docker - memory: 10000m + memory: 5120m - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index d58b029..c95f483 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -33,7 +33,7 @@ jobs: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - memory: 10000m + memory: 5120m - name: Checkout Code uses: actions/checkout@v2 From bfb5de353d968fa1a248697289d279b69badd94b Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 29 Nov 2022 15:40:48 +0530 Subject: [PATCH 11/22] Make changes in workflow schema Signed-off-by: Aadhitya A --- .../configurable-benchmark-test-self-hosted.yaml | 2 +- .../workflows/configurable-benchmark-test.yaml | 3 +-- .../scheduled-benchmarks-self-hosted.yaml | 15 ++++++++------- .github/workflows/scheduled-benchmarks.yml | 7 +++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 8252d6f..bd8dd1b 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -90,7 +90,7 @@ jobs: - name: Start minikube run: | - minikube start + minikube start --memory 5000 kubectl get po -A - name: Checkout Code diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index c801677..4ecccd7 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -36,12 +36,11 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' }} steps: - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.8 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: v1.23.2 kubernetes version: v1.23.2 driver: docker - memory: 5120m - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index feca73a..1c9608d 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -88,18 +88,19 @@ jobs: sudo systemctl status docker sudo mkdir -p ~/.kube sudo chmod 777 ~/.kube + curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 + sudo install minikube-linux-amd64 /usr/local/bin/minikube - - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.6.1 - with: - minikube version: 'v1.23.2' - kubernetes version: 'v1.23.2' - driver: docker - start-args: --disk-size 10000mb + + - name: Start minikube + run: | + minikube start --memory 5000 + kubectl get po -A - name: Checkout Code uses: actions/checkout@v2 + - name: Install Service Mesh and Deploy Application run: | chmod +x .github/workflows/scripts/${{ matrix.service-mesh }}_deploy.sh diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index c95f483..6082980 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -28,12 +28,11 @@ jobs: load-generator: ['fortio', 'wrk2'] steps: - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.8 + uses: manusa/actions-setup-minikube@v2.7.1 with: - minikube version: 'v1.23.2' - kubernetes version: 'v1.23.2' + minikube version: v1.23.2 + kubernetes version: v1.23.2 driver: docker - memory: 5120m - name: Checkout Code uses: actions/checkout@v2 From b70ce73f28809a1cdbbbb53cc86657547f6301f4 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 29 Nov 2022 15:43:39 +0530 Subject: [PATCH 12/22] Make changes Signed-off-by: Aadhitya A --- .../scheduled-benchmarks-self-hosted.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/scheduled-benchmarks-self-hosted.yaml b/.github/workflows/scheduled-benchmarks-self-hosted.yaml index 1c9608d..a254c4d 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -226,14 +226,14 @@ jobs: sudo systemctl status docker sudo mkdir -p ~/.kube sudo chmod 777 ~/.kube + curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 + sudo install minikube-linux-amd64 /usr/local/bin/minikube - - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.8 - with: - minikube version: 'v1.23.2' - kubernetes version: 'v1.23.2' - driver: docker - memory: 10000m + + - name: Start minikube + run: | + minikube start --memory 5000 + kubectl get po -A - name: Checkout Code uses: actions/checkout@v2 From 39caea7d87683bf02cd5cb1ee57d05276d92b1a6 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 6 Dec 2022 14:22:28 +0530 Subject: [PATCH 13/22] Edit minor change Signed-off-by: Aadhitya A --- mesheryctl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/mesheryctl.sh b/mesheryctl.sh index 6e3e47d..7081459 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -31,6 +31,7 @@ main() { then shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) + echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" docker network connect bridge meshery_meshery_1 docker network connect minikube meshery_meshery_1 From 79ae38508b67968a1be87afdf27e8353be7f28a6 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 20:12:53 +0530 Subject: [PATCH 14/22] Add debug print for check logs Signed-off-by: Aadhitya A --- mesheryctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index 7081459..40f3bb8 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -26,10 +26,10 @@ main() { then # get the mesh name from performance test config service_mesh=$(mesheryctl perf view $perf_profile_name -t ~/auth.json -o json 2>&1 | jq '."service_mesh"' | tr -d '"') - + echo "Checking service mesh list from given profile" + echo $service_mesh if [[ $service_mesh != "null" ]] then - shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" From b554ea3f936d126f2b2d39c54796d73315faad2f Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 21:24:47 +0530 Subject: [PATCH 15/22] Make changes Signed-off-by: Aadhitya A --- meshery.sh | 2 +- mesheryctl.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meshery.sh b/meshery.sh index aafa104..083e94a 100755 --- a/meshery.sh +++ b/meshery.sh @@ -13,7 +13,7 @@ main() { parse_command_line "$@" - echo "Checking if a k8s cluster exits..." + echo "Checking if a k8s cluster exists..." if kubectl config current-context then echo "Cluster found" diff --git a/mesheryctl.sh b/mesheryctl.sh index 40f3bb8..6eb98df 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -30,7 +30,7 @@ main() { echo $service_mesh if [[ $service_mesh != "null" ]] then - shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) + shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" docker network connect bridge meshery_meshery_1 @@ -44,9 +44,9 @@ main() { mesheryctl perf apply $perf_profile_name -t ~/auth.json --yes else - for service_mesh in "${!adapters[@]}" + for service_mesh in ${!adapters[@]} do - shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1) + shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" docker network connect bridge meshery_meshery-"$shortName"_1 From 1c158fe8ed85a197214279fb9253e8ccecfd2fe2 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 21:55:44 +0530 Subject: [PATCH 16/22] Edit bash script Signed-off-by: Aadhitya A --- mesheryctl.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index 6eb98df..2a4317f 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -28,8 +28,9 @@ main() { service_mesh=$(mesheryctl perf view $perf_profile_name -t ~/auth.json -o json 2>&1 | jq '."service_mesh"' | tr -d '"') echo "Checking service mesh list from given profile" echo $service_mesh - if [[ $service_mesh != "null" ]] + if [[ -n $service_mesh ]] then + echo "Service mesh is present from profile. Executing..." shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" @@ -44,6 +45,7 @@ main() { mesheryctl perf apply $perf_profile_name -t ~/auth.json --yes else + echo "Service mesh name is not present from profile. Executing all cases..." for service_mesh in ${!adapters[@]} do shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) From 95f640bd9e4b7be37e5e6db84453fefe87c186d5 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 22:06:29 +0530 Subject: [PATCH 17/22] Edit script and if else block Signed-off-by: Aadhitya A --- .github/workflows/scheduled-benchmarks.yml | 2 +- mesheryctl.sh | 25 ++++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 6082980..38088c3 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -76,7 +76,7 @@ jobs: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - memory: 10000m + memory: 5000m - name: Checkout Code uses: actions/checkout@v2 diff --git a/mesheryctl.sh b/mesheryctl.sh index 2a4317f..a5a3d7f 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -34,10 +34,15 @@ main() { shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery_meshery_1 - docker network connect minikube meshery_meshery_1 - docker network connect bridge meshery_meshery-"$shortName"_1 - docker network connect minikube meshery_meshery-"$shortName"_1 + if [[ -z $shortName ]] + then + echo "'shortName' value is empty. Provide a valid profile name with service mesh, else contact us to raise an issue!" + else + docker network connect bridge meshery_meshery_1 + docker network connect minikube meshery_meshery_1 + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 + fi mesheryctl system config minikube -t ~/auth.json fi @@ -50,11 +55,17 @@ main() { do shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" + if [[ -z $shortName ]] + then + echo "'shortName' value is empty. Provide a valid profile name with service mesh, else contact us to raise an issue!" + break + else + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 + fi - docker network connect bridge meshery_meshery-"$shortName"_1 - docker network connect minikube meshery_meshery-"$shortName"_1 done - + docker network connect bridge meshery_meshery_1 docker network connect minikube meshery_meshery_1 mesheryctl system config minikube -t ~/auth.json From e54fb123020da77e8e78dcaa28dd731716be7e9f Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 22:12:16 +0530 Subject: [PATCH 18/22] Edit message Signed-off-by: Aadhitya A --- mesheryctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index a5a3d7f..0e56576 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -36,7 +36,7 @@ main() { shortName=${shortName#meshery-} #remove the prefix "meshery-" if [[ -z $shortName ]] then - echo "'shortName' value is empty. Provide a valid profile name with service mesh, else contact us to raise an issue!" + echo "'shortName' value is empty. Provide a valid profile containing with service mesh name, else contact us to raise an issue!" else docker network connect bridge meshery_meshery_1 docker network connect minikube meshery_meshery_1 @@ -57,7 +57,7 @@ main() { shortName=${shortName#meshery-} #remove the prefix "meshery-" if [[ -z $shortName ]] then - echo "'shortName' value is empty. Provide a valid profile name with service mesh, else contact us to raise an issue!" + echo "'shortName' value is empty. Provide a valid profile containing with service mesh name, else contact us to raise an issue!" break else docker network connect bridge meshery_meshery-"$shortName"_1 From d1c12371d4cd665dbc66ced2fcb3920f7ac0a458 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 22:19:24 +0530 Subject: [PATCH 19/22] Revert use of k8s action Signed-off-by: Aadhitya A --- .github/workflows/scheduled-benchmarks.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 38088c3..709b133 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -71,12 +71,11 @@ jobs: test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes - uses: medyagh/setup-minikube@v0.0.8 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker - memory: 5000m - name: Checkout Code uses: actions/checkout@v2 From 9e83a36c438ea468be9103118fba2721e2077b31 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 22:38:09 +0530 Subject: [PATCH 20/22] Update script Signed-off-by: Aadhitya A --- mesheryctl.sh | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index cf6f417..16b79c1 100644 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -26,11 +26,11 @@ main() { then # get the mesh name from performance test config service_mesh=$(mesheryctl perf view $perf_profile_name -t ~/auth.json -o json 2>&1 | jq '."service_mesh"' | tr -d '"') - echo "Checking service mesh list from given profile" - echo $service_mesh + echo "Checking service mesh list from given profile..." + #echo $service_mesh if [[ -n $service_mesh ]] then - echo "Service mesh is present from profile. Executing..." + echo "Service mesh is present from profile." shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) echo $shortName shortName=${shortName#meshery-} #remove the prefix "meshery-" @@ -38,12 +38,11 @@ main() { then echo "'shortName' value is empty. Provide a valid profile containing with service mesh name, else contact us to raise an issue!" else - docker network connect bridge meshery_meshery_1 - docker network connect minikube meshery_meshery_1 docker network connect bridge meshery_meshery-"$shortName"_1 docker network connect minikube meshery_meshery-"$shortName"_1 fi - + docker network connect bridge meshery_meshery_1 + docker network connect minikube meshery_meshery_1 mesheryctl system config minikube -t ~/auth.json fi rand_string=$(openssl rand -hex 3) @@ -52,19 +51,13 @@ main() { mesheryctl perf apply $perf_profile_name -t ~/auth.json --yes else - echo "Service mesh name is not present from profile. Executing all cases..." + echo "Executing from given test config file..." for service_mesh in ${!adapters[@]} do shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) shortName=${shortName#meshery-} #remove the prefix "meshery-" - if [[ -z $shortName ]] - then - echo "'shortName' value is empty. Provide a valid profile containing with service mesh name, else contact us to raise an issue!" - break - else - docker network connect bridge meshery_meshery-"$shortName"_1 - docker network connect minikube meshery_meshery-"$shortName"_1 - fi + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 done From d47293cc163b9aa6b113d2112175a1c709a01bcf Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 22:57:48 +0530 Subject: [PATCH 21/22] Update script Signed-off-by: Aadhitya A --- mesheryctl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index 16b79c1..778c29d 100644 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -37,6 +37,7 @@ main() { if [[ -z $shortName ]] then echo "'shortName' value is empty. Provide a valid profile containing with service mesh name, else contact us to raise an issue!" + exit 1 else docker network connect bridge meshery_meshery-"$shortName"_1 docker network connect minikube meshery_meshery-"$shortName"_1 @@ -45,8 +46,8 @@ main() { docker network connect minikube meshery_meshery_1 mesheryctl system config minikube -t ~/auth.json fi - rand_string=$(openssl rand -hex 3) - perf_profile_name="$rand_string-$perf_profile_name" + #rand_string=$(openssl rand -hex 3) + #perf_profile_name="$rand_string-$perf_profile_name" echo "Running test with performance profile $perf_profile_name" mesheryctl perf apply $perf_profile_name -t ~/auth.json --yes @@ -58,7 +59,6 @@ main() { shortName=${shortName#meshery-} #remove the prefix "meshery-" docker network connect bridge meshery_meshery-"$shortName"_1 docker network connect minikube meshery_meshery-"$shortName"_1 - done docker network connect bridge meshery_meshery_1 From eeafc915094a20023e1dc36d6c2d1d683cd1db63 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Tue, 10 Jan 2023 23:31:11 +0530 Subject: [PATCH 22/22] Change node version (as per new GH rules) Signed-off-by: Aadhitya A --- action.yml | 2 +- mesheryctl.sh | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/action.yml b/action.yml index 485cc25..bba9997 100644 --- a/action.yml +++ b/action.yml @@ -55,7 +55,7 @@ inputs: required: false runs: - using: "node12" + using: "node16" main: "main.js" branding: diff --git a/mesheryctl.sh b/mesheryctl.sh index 778c29d..bdd5888 100644 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -45,6 +45,10 @@ main() { docker network connect bridge meshery_meshery_1 docker network connect minikube meshery_meshery_1 mesheryctl system config minikube -t ~/auth.json + + else + echo "Service mesh not found from profile. Invalid profile name has been provided" + exit 1 fi #rand_string=$(openssl rand -hex 3) #perf_profile_name="$rand_string-$perf_profile_name" @@ -53,13 +57,11 @@ main() { else echo "Executing from given test config file..." - for service_mesh in ${!adapters[@]} - do - shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) - shortName=${shortName#meshery-} #remove the prefix "meshery-" - docker network connect bridge meshery_meshery-"$shortName"_1 - docker network connect minikube meshery_meshery-"$shortName"_1 - done + #echo $service_mesh + shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1) + shortName=${shortName#meshery-} #remove the prefix "meshery-" + docker network connect bridge meshery_meshery-"$shortName"_1 + docker network connect minikube meshery_meshery-"$shortName"_1 docker network connect bridge meshery_meshery_1 docker network connect minikube meshery_meshery_1