Skip to content

Commit b8d9ee1

Browse files
authored
Add ubuntu-specific option for bootstrapping (#257)
1 parent 9d02442 commit b8d9ee1

File tree

6 files changed

+31
-9
lines changed

6 files changed

+31
-9
lines changed

.github/actions/start-k8s-cluster/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Run Bootstrap Cluster
13-
run: make bootstrap-cluster-fedora-local
13+
run: make bootstrap-cluster
1414
working-directory: ${{ inputs.working_directory }}
1515
shell: bash
1616

17-
- name: Run Bootstrap Cluster
18-
run: make bootstrap-docker-fedora-local
17+
- name: Run Bootstrap Docker
18+
run: make bootstrap-docker-ubuntu-local
1919
working-directory: ${{ inputs.working_directory }}
2020
shell: bash
2121

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ install: clean
2222
# ./scripts/install-prometheus-operator.sh
2323
./scripts/deploy-operator-crd-scaling.sh
2424

25-
# Bootstrap Fedora Machine Locally
25+
# Bootstrap Docker (Fedora)
2626
bootstrap-docker-fedora-local:
27-
cd config/vagrant/scripts; ./bootstrap-docker.sh
27+
cd config/vagrant/scripts; ./bootstrap-docker-fedora.sh
2828

29+
# Bootstrap Docker (Ubuntu)
30+
bootstrap-docker-ubuntu-local:
31+
cd config/vagrant/scripts; ./bootstrap-docker-ubuntu.sh
32+
33+
# Bootstrap Golang (Fedora)
2934
bootstrap-golang-fedora-local:
30-
cd config/vagrant/scripts; ./bootstrap-golang.sh
35+
cd config/vagrant/scripts; ./bootstrap-golang-fedora.sh
3136

32-
bootstrap-cluster-fedora-local:
37+
# Bootstrap Kubernetes/Kind
38+
bootstrap-cluster:
3339
cd config/vagrant/scripts; ./bootstrap-cluster.sh
3440

3541
# creates a k8s cluster instance

config/vagrant/Vagrantfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ Vagrant.configure('2') do |config|
1717

1818
# Install Go
1919
k8shost.vm.provision 'shell',
20-
path: 'scripts/bootstrap-golang.sh',
20+
path: 'scripts/bootstrap-golang-fedora.sh',
2121
privileged: false
2222

2323
# Configures docker.
2424
k8shost.vm.provision 'shell',
25-
path: 'scripts/bootstrap-docker.sh',
25+
path: 'scripts/bootstrap-docker-fedora.sh',
2626
privileged: false
2727

2828
# Triggers reload to setup docker rootless permissions.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
# update docker config
4+
sudo bash -c 'cat <<- EOF > /etc/docker/daemon.json
5+
{
6+
"ipv6": true,
7+
"fixed-cidr-v6": "2001:db8:1::/64"
8+
}
9+
EOF'
10+
11+
# restart docker
12+
sudo systemctl restart docker
13+
14+
# increase file system limits
15+
sudo sysctl fs.inotify.max_user_watches=524288
16+
sudo sysctl fs.inotify.max_user_instances=512

0 commit comments

Comments
 (0)