Merge pull request #70 from layer5io/cluster-test

Fix failing k8s action in the workflow

.github/workflows/configurable-benchmark-test-self-hosted.yaml

@@ -83,14 +83,15 @@ 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
+          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/[email protected]
-        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

.github/workflows/configurable-benchmark-test.yaml

@@ -41,7 +41,6 @@ jobs:
           minikube version: v1.23.2 
           kubernetes version: v1.23.2
           driver: docker
-          start args: --disk-size 10000mb
 
       - name: Checkout Code
         uses: actions/checkout@v2

.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/[email protected]
-        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
@@ -225,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: manusa/[email protected]
-        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

.github/workflows/scheduled-benchmarks.yml

@@ -30,10 +30,9 @@ jobs:
       - name: Setup Kubernetes
         uses: manusa/[email protected]
         with:
-          minikube version: 'v1.23.2'
-          kubernetes version: 'v1.23.2'
+          minikube version: v1.23.2 
+          kubernetes version: v1.23.2
           driver: docker
-          start args: --disk-size 10000mb
 
       - name: Checkout Code
         uses: actions/checkout@v2
@@ -77,7 +76,6 @@ jobs:
           minikube version: 'v1.23.2'
           kubernetes version: 'v1.23.2'
           driver: docker
-          start args: --disk-size 10000mb
 
       - name: Checkout Code
         uses: actions/checkout@v2

action.yml

@@ -55,7 +55,7 @@ inputs:
     required: false
 
 runs:
-  using: "node12"
+  using: "node16"
   main: "main.js"
 
 branding:

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"
@@ -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
 }
 

mesheryctl.sh

@@ -26,34 +26,43 @@ 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 '"')
-
-		if [[ $service_mesh != "null" ]]
+		echo "Checking service mesh list from given profile..."
+		#echo $service_mesh
+		if [[ -n $service_mesh ]]
 		then
-
-			shortName=$(echo ${adapters["$service_mesh"]} | cut -d ':' -f1)
+			echo "Service mesh is present from profile."
+			shortName=$(echo ${adapters[$service_mesh]} | cut -d ':' -f1)
+			echo $shortName
 			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!"
+				exit 1
+			else 
+				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
-			docker network connect bridge meshery_meshery-"$shortName"_1
-			docker network connect minikube meshery_meshery-"$shortName"_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"
+		#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
 
 	else
-		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 "Executing from given test config file..."
+		#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
 		mesheryctl system config minikube -t ~/auth.json