From f2d4781a45ed39b5fa4216949a11258f31ee901f Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Fri, 4 Nov 2022 21:43:47 +0530 Subject: [PATCH 1/4] Change action version and args Signed-off-by: Aadhitya A --- .github/workflows/configurable-benchmark-test.yaml | 5 ++--- .github/workflows/scheduled-benchmarks.yml | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index aa77dc8..f7611cb 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -36,13 +36,12 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' }} steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: v1.23.2 kubernetes version: v1.23.2 driver: docker - apus: 4 - memory: 5192 + start args: --cpus 4 --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 2e442a5..a5f1b38 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -28,11 +28,12 @@ jobs: load-generator: ['fortio', 'wrk2'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker + start args: --cpus 4 --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 From 5cfb97f12f56b8c1bde44e06b1e1b6c3f1438009 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Fri, 4 Nov 2022 21:51:37 +0530 Subject: [PATCH 2/4] Change cpu count to default 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 f7611cb..47b7c2a 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 - start args: --cpus 4 --disk-size 10000mb + start args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index a5f1b38..274e458 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 - start args: --cpus 4 --disk-size 10000mb + start args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 From 797c2a2681f81a4b1c643d7b5b75cf999a7cc696 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Fri, 4 Nov 2022 22:02:42 +0530 Subject: [PATCH 3/4] Update version and args on all workflow schema files Signed-off-by: Aadhitya A --- .../workflows/configurable-benchmark-test-self-hosted.yaml | 3 ++- .github/workflows/scheduled-benchmarks-self-hosted.yaml | 6 ++++-- .github/workflows/scheduled-benchmarks.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index 2e505b4..60f1efb 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -85,11 +85,12 @@ jobs: sudo systemctl status docker - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker + 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 07f12cc..e14b8d7 100644 --- a/.github/workflows/scheduled-benchmarks-self-hosted.yaml +++ b/.github/workflows/scheduled-benchmarks-self-hosted.yaml @@ -90,11 +90,12 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker + start args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 @@ -226,11 +227,12 @@ jobs: sudo chmod 777 ~/.kube - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker + start args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/scheduled-benchmarks.yml b/.github/workflows/scheduled-benchmarks.yml index 274e458..6c2b644 100644 --- a/.github/workflows/scheduled-benchmarks.yml +++ b/.github/workflows/scheduled-benchmarks.yml @@ -72,11 +72,12 @@ jobs: test-configuration: ['load-test.yaml','soak-test.yaml'] steps: - name: Setup Kubernetes - uses: manusa/actions-setup-minikube@v2.4.3 + uses: manusa/actions-setup-minikube@v2.7.1 with: minikube version: 'v1.23.2' kubernetes version: 'v1.23.2' driver: docker + start args: --disk-size 10000mb - name: Checkout Code uses: actions/checkout@v2 From 7576d104c897ab11b6c829e3a361dc13ffd61069 Mon Sep 17 00:00:00 2001 From: Aadhitya A Date: Fri, 4 Nov 2022 22:08:26 +0530 Subject: [PATCH 4/4] Fix arg error in action shell script Signed-off-by: Aadhitya A --- mesheryctl.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesheryctl.sh b/mesheryctl.sh index 6e3e47d..5f709e4 100755 --- a/mesheryctl.sh +++ b/mesheryctl.sh @@ -34,8 +34,8 @@ main() { 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_"$shortName"_1 + docker network connect minikube meshery_meshery_"$shortName"_1 mesheryctl system config minikube -t ~/auth.json fi @@ -48,8 +48,8 @@ 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