Merge pull request #69 from alphaX86/cluster-fix

Change k8s minikube action version and args
layer5io · Nov 7, 2022 · 51a7e89 · 51a7e89
2 parents 6fcb0a5 + 7576d10
commit 51a7e89
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git 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/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: --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
@@ -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
@@ -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: --disk-size 10000mb
 
       - name: Checkout Code
         uses: actions/checkout@v2
@@ -71,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

diff --git 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