Skip to content

Commit

Permalink
Merge pull request #61 from alphaX86/auth-fix
Browse files Browse the repository at this point in the history
Modify bash script and action variables
  • Loading branch information
gyohuangxin authored Aug 29, 2022
2 parents 33a35e8 + 4c29766 commit bb2f67c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/configurable-benchmark-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ jobs:
chmod +x .github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh
.github/workflows/scripts/${{ github.event.inputs.service_mesh }}_deploy.sh
shell: bash

- name: Initiate tmate session
uses: mxschmitt/action-tmate@v3

- name: Run Benchmark Tests
uses: layer5io/meshery-smp-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/istio_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi

sleep 10
#mesheryctl system login --provider None
echo 'E' | mesheryctl mesh deploy adapter meshery-istio:10000 --token "./.github/workflows/auth.json"
echo | mesheryctl mesh deploy adapter meshery-istio:10000 --namespace "istio-system" --token "./.github/workflows/auth.json"
sleep 100
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"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scripts/linkerd_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ fi

curl -fsL https://run.linkerd.io/emojivoto.yml --output emojivoto.yml
sleep 10
mesheryctl system login --provider None
mesheryctl mesh deploy adapter meshery-linkerd:10001
#mesheryctl system login --provider None
echo | mesheryctl mesh deploy adapter meshery-linkerd:10001 --token "./.github/workflows/auth.json"
echo "Onboarding application... Standby for few minutes..."
mesheryctl app onboard -f "./emojivoto.yml"
mesheryctl app onboard -f "./emojivoto.yml" -s "Kubernetes Manifest" --token "./.github/workflows/auth.json"
#mesheryctl pattern apply -f "./emojivoto.yml"

# Wait for the application to be ready
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scripts/osm_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ fi

curl -fsL https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml --output bookstore.yaml
sleep 10
mesheryctl system login --provider None
mesheryctl mesh deploy adapter meshery-osm:10009
#mesheryctl system login --provider None
echo | mesheryctl mesh deploy adapter meshery-osm:10009 --token "./.github/workflows/auth.json"
echo "Onboarding application... Standby for few minutes..."
mesheryctl app onboard -f "./bookstore.yaml"
mesheryctl app onboard -f "./bookstore.yaml" -s "Kubernetes Manifest" --token "./.github/workflows/auth.json"
#mesheryctl pattern apply -f "https://raw.githubusercontent.com/openservicemesh/osm-docs/main/manifests/apps/bookstore.yaml" --token "./.github/workflows/auth.json"

sleep 100
Expand Down
2 changes: 1 addition & 1 deletion meshery.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ main() {
kubectl config view --minify --flatten > ~/minified_config
mv ~/minified_config ~/.kube/config

curl -L https://git.io/meshery | sudo PLATFORM=$PLATFORM bash - &
curl -L https://meshery.io/install | sudo PLATFORM=$PLATFORM bash - &

sleep 60
}
Expand Down

0 comments on commit bb2f67c

Please sign in to comment.