Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing k8s action in the workflow #70

Merged
merged 24 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/configurable-benchmark-test-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
kubectl get po -A

- name: Checkout Code
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/configurable-benchmark-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
if: ${{ github.event_name == 'workflow_dispatch' }}
steps:
- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.7.1
uses: medyagh/setup-minikube@v0.0.8
with:
minikube version: v1.23.2
kubernetes version: v1.23.2
driver: docker
start args: --disk-size 10000mb
memory: 5120m

- name: Checkout Code
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scheduled-benchmarks-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ jobs:
sudo chmod 777 ~/.kube

- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.7.1
uses: manusa/actions-setup-minikube@v2.6.1
with:
minikube version: 'v1.23.2'
kubernetes version: 'v1.23.2'
driver: docker
start args: --disk-size 10000mb
start-args: --disk-size 10000mb

- name: Checkout Code
uses: actions/checkout@v2
Expand Down Expand Up @@ -227,12 +227,12 @@ jobs:
sudo chmod 777 ~/.kube

- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.7.1
uses: medyagh/setup-minikube@v0.0.8
with:
minikube version: 'v1.23.2'
kubernetes version: 'v1.23.2'
driver: docker
start args: --disk-size 10000mb
memory: 10000m

- name: Checkout Code
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scheduled-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
load-generator: ['fortio', 'wrk2']
steps:
- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.7.1
uses: medyagh/setup-minikube@v0.0.8
with:
minikube version: 'v1.23.2'
kubernetes version: 'v1.23.2'
driver: docker
start args: --disk-size 10000mb
memory: 5120m

- name: Checkout Code
uses: actions/checkout@v2
Expand Down Expand Up @@ -72,12 +72,12 @@ jobs:
test-configuration: ['load-test.yaml','soak-test.yaml']
steps:
- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.7.1
uses: medyagh/setup-minikube@v0.0.8
with:
minikube version: 'v1.23.2'
kubernetes version: 'v1.23.2'
driver: docker
start args: --disk-size 10000mb
memory: 10000m

- name: Checkout Code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion meshery.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
8 changes: 4 additions & 4 deletions mesheryctl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down