Skip to content

Commit

Permalink
Install lxd using k8s-snap composite action
Browse files Browse the repository at this point in the history
This simplifies the gh workflows and also applies the Docker
iptables workaround.
  • Loading branch information
petrutlucian94 committed Jan 9, 2025
1 parent 490b457 commit b1cdfa7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/k8s-snap-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ jobs:
run: |
sudo snap download k8s --channel=latest/edge --basename k8s
- name: Install lxd
run: |
sudo snap refresh lxd --channel 5.21/stable
sudo lxd init --auto
sudo usermod --append --groups lxd $USER
sg lxd -c 'lxc version'
uses: canonical/k8s-snap/.github/actions/install-lxd@main
- name: Build k8s-dqlite
run: |
make static
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/performance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,7 @@ jobs:
sudo apt install r-base
sudo Rscript -e 'install.packages(c("ggplot2", "dplyr", "optparse"), repos="https://cloud.r-project.org")'
- name: Install lxd
run: |
sudo snap refresh lxd --channel 5.21/stable
sudo lxd init --auto
sudo usermod --append --groups lxd $USER
sg lxd -c 'lxc version'
- name: Ensure lxd network traffic flows by removing docker if installed
run: |
if command -v docker >/dev/null 2>&1; then
echo "Docker is installed, purging it"
sudo apt-get purge -y docker-engine docker docker.io docker-ce docker-ce-cli containerd runc
fi
uses: canonical/k8s-snap/.github/actions/install-lxd@main
- name: Download latest k8s-snap
run: |
sudo snap download k8s --channel=latest/edge --basename k8s
Expand Down

0 comments on commit b1cdfa7

Please sign in to comment.