Skip to content

Commit

Permalink
Merge pull request #3639 from k0sproject/bootloose
Browse files Browse the repository at this point in the history
Replace footloose in tests and examples with k0sproject/bootloose
  • Loading branch information
kke authored Oct 27, 2023
2 parents 69fbe0b + 2301421 commit 6dffcb7
Show file tree
Hide file tree
Showing 78 changed files with 276 additions and 295 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/footloose/ubuntu18.04
FROM quay.io/k0sproject/bootloose-ubuntu18.04

ADD k0s.service /etc/systemd/system/k0s.service

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ build:

.PHONY: create-cluster
create-cluster: build
docker build -t k0s-footloose .
envsubst < footloose.yaml.tpl > footloose.yaml
footloose create
docker build -t k0s-bootloose .
envsubst < bootloose.yaml.tpl > bootloose.yaml
bootloose create

.PHONY: delete-cluster
delete-cluster:
footloose delete
bootloose delete
docker volume prune -f
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# k0s HA controllers with footloose
# k0s HA controllers with bootloose

> This example is targeted for development use
## Setup

* Install [footloose](https://github.com/weaveworks/footloose)
* Install [bootloose](https://github.com/k0sproject/bootloose)
* Start a cluster: `make create-cluster`
* Now you can exec into running nodes, for example: `footloose ssh root@controller0`
* Now you can exec into running nodes, for example: `bootloose ssh root@controller0`
* Within a node there is a config file (`/etc/k0s/config.yaml`) and systemd service (`k0s`) available for easier testing.

## Teardown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ machines:
- count: 3
backend: docker
spec:
image: k0s-footloose:latest
image: k0s-bootloose:latest
name: controller%d
privileged: true
volumes:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# k0s in footloose with mysql
# k0s in bootloose with mysql

In this example we're gonna use footloose to simulate 2-node control plane setup using mysql as the storage.
In this example we're gonna use bootloose to simulate 2-node control plane setup using mysql as the storage.

**Note:** All the config files are more like examples, you WILL need to finetune them to fit your env.

## Prep work

1. Install docker
2. Get footloose from https://github.com/weaveworks/footloose
2. Get bootloose from https://github.com/k0sproject/bootloose
3. Build k0s bin: Run `make build` at repo root

## Mysql
Expand All @@ -31,7 +31,7 @@ Fix the mysql address in `k0s.yaml` config file.
First we need to bootup the control plane nodes:

```shell
footloose create
bootloose create
```

This will start two nodes for us: `controller0` and `controller1`. There's a bind-mount of the whole repo so we easily get the compiled bin into the nodes.
Expand All @@ -43,7 +43,7 @@ This will start two nodes for us: `controller0` and `controller1`. There's a bin
SSH into the node with:

```shell
footloose ssh root@controller0
bootloose ssh root@controller0
```

Bootstrap the controlplane:
Expand All @@ -70,7 +70,7 @@ This will output the token we'll need in the next step.
SSH into the node with:

```shell
footloose ssh root@controller1
bootloose ssh root@controller1
```

Bootstrap the controlplane:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ machines:
- count: 2
backend: docker
spec:
image: quay.io/footloose/ubuntu18.04
image: quay.io/k0sproject/bootloose-ubuntu18.04
name: controller%d
privileged: true
volumes:
Expand Down
File renamed without changes.
6 changes: 1 addition & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require (
github.com/google/go-cmp v0.6.0
github.com/hashicorp/terraform-exec v0.19.0
github.com/imdario/mergo v0.3.16
github.com/k0sproject/bootloose v0.7.1
github.com/k0sproject/dig v0.2.0
github.com/k0sproject/version v0.4.2
github.com/kardianos/service v1.2.2
Expand All @@ -48,7 +49,6 @@ require (
github.com/urfave/cli v1.22.14
github.com/vishvananda/netlink v1.2.1-beta.2
github.com/vmware-tanzu/sonobuoy v0.57.0
github.com/weaveworks/footloose v0.0.0-20210208164054-2862489574a3
github.com/zcalusic/sysinfo v1.0.1
go.etcd.io/etcd/api/v3 v3.5.9
go.etcd.io/etcd/client/pkg/v3 v3.5.9
Expand Down Expand Up @@ -102,7 +102,6 @@ require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/briandowns/spinner v1.19.0 // indirect
Expand Down Expand Up @@ -291,9 +290,6 @@ require (

// Replacements specific to k0s
replace (
// https://github.com/weaveworks/footloose/pull/272
github.com/weaveworks/footloose => github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890

// containerd 1.7.0 updated to go.opentelemetry.io/otel/metric v0.37.0,
// which includes https://github.com/open-telemetry/opentelemetry-go/pull/3631.
// This is incompatible to the current Kubernetes libraries, which still
Expand Down
20 changes: 3 additions & 17 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
Expand Down Expand Up @@ -181,19 +179,16 @@ github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWT
github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-connections v0.4.1-0.20190612165340-fd1b1942c4d5 h1:2o8D0hdBky229bNnc7a8bAZkeVMpH4qsp2Rmt4g/+Zk=
github.com/docker/go-connections v0.4.1-0.20190612165340-fd1b1942c4d5/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4=
Expand Down Expand Up @@ -353,9 +348,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-github/v24 v24.0.1/go.mod h1:CRqaW1Uns1TCkP0wqTpxYyRxRjxwvKU/XSS44u6X74M=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
Expand All @@ -380,7 +372,6 @@ github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
Expand Down Expand Up @@ -422,7 +413,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/intel/goresctrl v0.3.0 h1:K2D3GOzihV7xSBedGxONSlaw/un1LZgWsc9IfqipN4c=
Expand All @@ -442,6 +432,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/k0sproject/bootloose v0.7.1 h1:B4/7zG7gA+p7rUi/U0P57tpTRLtF14qinmC/rkl3hKg=
github.com/k0sproject/bootloose v0.7.1/go.mod h1:BwIRhmv1ioCQsOeTa6qeSlBFzu5OTpINP9BIjVAXjEc=
github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w=
github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78=
github.com/k0sproject/version v0.4.2 h1:zrbT5xRv1ai4N102ZaHTTq9Zqf6pAGFm9WCxHaC9QHY=
Expand Down Expand Up @@ -549,8 +541,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890 h1:36ZxVGR5mGZSqpsNsvMjhcjycwH/TQIQN8G25gimNuU=
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down Expand Up @@ -651,10 +641,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
Expand Down Expand Up @@ -774,7 +762,6 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down Expand Up @@ -881,7 +868,6 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20180824143301-4910a1d54f87/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -1137,7 +1123,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
helm.sh/helm/v3 v3.13.1 h1:DG+XLGzBJeZvMLlMbm6bPDLV1dGaVW9eZsDoUd1/LM0=
helm.sh/helm/v3 v3.13.1/go.mod h1:TdQRMiq46CSWcc68Hb0uVhvAWusaN90YwAV54cz6JzU=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
36 changes: 18 additions & 18 deletions inttest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,44 @@ bins = bin/sonobuoy
include ../embedded-bins/Makefile.variables

.PHONY: all
all: $(bins) .footloose-alpine.stamp
all: $(bins) .bootloose-alpine.stamp

bin:
mkdir -p $@

bin/sonobuoy: | bin
$(curl) $(sonobuoy_url) | tar -C bin/ -zxv $(notdir $@)

footloose_alpine_build_cmdline := \
bootloose_alpine_build_cmdline := \
--build-arg GOLANG_IMAGE=$(golang_buildimage) \
--build-arg ALPINE_VERSION=$(alpine_patch_version) \
--build-arg ETCD_VERSION=$(etcd_version) \
--build-arg HELM_VERSION=$(helm_version) \
--build-arg KUBE_VERSION=$(kubernetes_version) \
-t footloose-alpine \
-f footloose-alpine/Dockerfile \
footloose-alpine
-t bootloose-alpine \
-f bootloose-alpine/Dockerfile \
bootloose-alpine

.footloose-alpine.stamp: $(shell find footloose-alpine -type f)
docker build --build-arg TARGETARCH=$(ARCH) $(footloose_alpine_build_cmdline)
.bootloose-alpine.stamp: $(shell find bootloose-alpine -type f)
docker build --build-arg TARGETARCH=$(ARCH) $(bootloose_alpine_build_cmdline)
touch $@

# This is a special target to test the footloose alpine image locally for all supported platforms.
.PHONY: check-footloose-alpine-buildx
check-footloose-alpine-buildx:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 $(footloose_alpine_build_cmdline)
# This is a special target to test the bootloose alpine image locally for all supported platforms.
.PHONY: check-bootloose-alpine-buildx
check-bootloose-alpine-buildx:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 $(bootloose_alpine_build_cmdline)

.footloose-k0s.stamp: K0S_PATH ?= $(realpath ../k0s)
.footloose-k0s.stamp: .footloose-alpine.stamp
.bootloose-k0s.stamp: K0S_PATH ?= $(realpath ../k0s)
.bootloose-k0s.stamp: .bootloose-alpine.stamp
docker build \
--build-arg K0S_PATH=$(notdir $(K0S_PATH)) \
-t footloose-k0s \
-f footloose-k0s/Dockerfile \
-t bootloose-k0s \
-f bootloose-k0s/Dockerfile \
$(dir $(K0S_PATH))
touch $@

.update-server.stamp: .footloose-alpine.stamp update-server/Dockerfile $(wildcard update-server/html/**/*.html)
docker build -t update-server --build-arg BASE=footloose-alpine -f update-server/Dockerfile update-server
.update-server.stamp: .bootloose-alpine.stamp update-server/Dockerfile $(wildcard update-server/html/**/*.html)
docker build -t update-server --build-arg BASE=bootloose-alpine -f update-server/Dockerfile update-server
touch $@

check-network: bin/sonobuoy
Expand Down Expand Up @@ -116,7 +116,7 @@ include Makefile.variables

$(smoketests): K0S_PATH ?= $(realpath ../k0s)
$(smoketests): K0S_IMAGES_BUNDLE ?= $(realpath ../airgap-image-bundle-linux-$(ARCH).tar)
$(smoketests): .footloose-alpine.stamp
$(smoketests): .bootloose-alpine.stamp
$(smoketests): TEST_PACKAGE ?= $(subst check-,,$@)
$(smoketests):
K0S_PATH='$(K0S_PATH)' \
Expand Down
4 changes: 2 additions & 2 deletions inttest/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Integration tests a.k.a e2e testing

This folder is the root of k0s integration tests. These tests are such that run the actual k0s clusters, currently using [footloose](https://github.com/weaveworks/footloose) as the target environment.
This folder is the root of k0s integration tests. These tests are such that run the actual k0s clusters, currently using [bootloose](https://github.com/k0sproject/bootloose) as the target environment.

## Running the tests

Expand All @@ -21,7 +21,7 @@ Sometimes, especially when debugging some test failures, it's good to leave the
The test output show how to run manual cleanup for the environment, something like:

```shell
TestNetworkSuite: footloosesuite.go:138: footloose cluster left intact for debugging. Needs to be manually cleaned with: footloose delete --config /tmp/afghzzvp-footloose.yaml
TestNetworkSuite: bootloosesuite.go:138: bootloose cluster left intact for debugging. Needs to be manually cleaned with: bootloose delete --config /tmp/afghzzvp-bootloose.yaml
```

This allows you to run manual cleanup after you've done the needed debugging.
Expand Down
4 changes: 2 additions & 2 deletions inttest/addons/addons_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
)

type AddonsSuite struct {
common.FootlooseSuite
common.BootlooseSuite
}

func (as *AddonsSuite) TestHelmBasedAddons() {
Expand Down Expand Up @@ -233,7 +233,7 @@ func (as *AddonsSuite) doTestAddonUpdate(addonName string, values map[string]int
func TestAddonsSuite(t *testing.T) {

s := AddonsSuite{
common.FootlooseSuite{
common.BootlooseSuite{
ControllerCount: 1,
WorkerCount: 1,
},
Expand Down
4 changes: 2 additions & 2 deletions inttest/airgap/airgap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
`

type AirgapSuite struct {
common.FootlooseSuite
common.BootlooseSuite
}

func (s *AirgapSuite) TestK0sGetsUp() {
Expand Down Expand Up @@ -107,7 +107,7 @@ func (s *AirgapSuite) TestK0sGetsUp() {

func TestAirgapSuite(t *testing.T) {
s := AirgapSuite{
common.FootlooseSuite{
common.BootlooseSuite{
ControllerCount: 1,
WorkerCount: 1,

Expand Down
4 changes: 2 additions & 2 deletions inttest/ap-airgap/airgap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

type airgapSuite struct {
common.FootlooseSuite
common.BootlooseSuite
}

// SetupTest prepares the controller and filesystem, getting it into a consistent
Expand Down Expand Up @@ -137,7 +137,7 @@ spec:
// autopilot upgrade scenarios against them.
func TestAirgapSuite(t *testing.T) {
suite.Run(t, &airgapSuite{
common.FootlooseSuite{
common.BootlooseSuite{
ControllerCount: 1,
WorkerCount: 1,
LaunchMode: common.LaunchModeOpenRC,
Expand Down
Loading

0 comments on commit 6dffcb7

Please sign in to comment.