diff --git a/.github/workflows/configurable-benchmark-test-self-hosted.yaml b/.github/workflows/configurable-benchmark-test-self-hosted.yaml index a659080..ce5276b 100644 --- a/.github/workflows/configurable-benchmark-test-self-hosted.yaml +++ b/.github/workflows/configurable-benchmark-test-self-hosted.yaml @@ -15,7 +15,6 @@ on: options: - istio - linkerd - - osm - kuma - appmesh - cilium diff --git a/.github/workflows/configurable-benchmark-test.yaml b/.github/workflows/configurable-benchmark-test.yaml index d4e6b3b..edcf8f5 100644 --- a/.github/workflows/configurable-benchmark-test.yaml +++ b/.github/workflows/configurable-benchmark-test.yaml @@ -19,7 +19,6 @@ on: options: - istio - linkerd - - osm - kuma - appmesh - cilium diff --git a/.github/workflows/scripts/appmesh_deploy.sh b/.github/workflows/scripts/appmesh_deploy.sh index 17e7ae8..f798cae 100644 --- a/.github/workflows/scripts/appmesh_deploy.sh +++ b/.github/workflows/scripts/appmesh_deploy.sh @@ -15,7 +15,10 @@ fi sleep 10 -# TODO: Deploy demo apps +echo 'E' | mesheryctl mesh deploy adapter meshery-appmesh: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" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/cilium_deploy.sh b/.github/workflows/scripts/cilium_deploy.sh index d111e73..53f2d54 100644 --- a/.github/workflows/scripts/cilium_deploy.sh +++ b/.github/workflows/scripts/cilium_deploy.sh @@ -15,7 +15,11 @@ fi sleep 10 -# TODO: Deploy demo apps +#mesheryctl system login --provider None +echo 'E' | mesheryctl mesh deploy adapter meshery-cilium: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" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/consul_deploy.sh b/.github/workflows/scripts/consul_deploy.sh index 742fbea..5d73f03 100644 --- a/.github/workflows/scripts/consul_deploy.sh +++ b/.github/workflows/scripts/consul_deploy.sh @@ -15,8 +15,10 @@ fi sleep 10 -# TODO: Didn't find a demo apps on Consule, so use bookinfo app. -mesheryctl app onboard -f "https://raw.githubusercontent.com/istio/istio/blob/master/samples/bookinfo/platform/kube/bookinfo.yaml" +echo 'E' | mesheryctl mesh deploy adapter meshery-consul: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" echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" echo "Endpoint URL: http://localhost:5000" diff --git a/.github/workflows/scripts/osm_deploy.sh b/.github/workflows/scripts/osm_deploy.sh deleted file mode 100755 index 42376a3..0000000 --- a/.github/workflows/scripts/osm_deploy.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -# This script is used to deploy Open Service Mesh on Kubernetes -# -# Also deploys Bookstore application on OSM - -# See: https://github.com/service-mesh-performance/service-mesh-performance/blob/master/protos/service_mesh.proto -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 - -sleep 100 - -kubectl get deployments -n bookstore -kubectl get pods -n bookstore - -# Wait for the application to be ready -sleep 100 - -# Expose the application outside the cluster -# backend="$1" -# thisScript="$(dirname "$0")/$(basename "$0")" - -# if [ -z "$backend" ]; then -# echo "Usage: $thisScript " -# exit 1 -# fi -# hardcode bookstore comment out uneceserry code -POD="$(kubectl get pods --selector app="bookstore" -n "$BOOKSTORE_NAMESPACE" --no-headers | grep 'Running' | awk 'NR==1{print $1}')" -kubectl port-forward "$POD" -n "$BOOKSTORE_NAMESPACE" 15000:15000 &> /dev/null & - -echo "Service Mesh: $MESH_NAME - $SERVICE_MESH" -echo "Endpoint URL: http://localhost:15000" - -# Pass the endpoint to be used by Meshery -echo "ENDPOINT_URL=http://localhost:15000" >> $GITHUB_ENV -echo "SERVICE_MESH=$SERVICE_MESH" >> $GITHUB_ENV