Skip to content

Commit

Permalink
Merge pull request #45 from k0sproject/use-fork-images
Browse files Browse the repository at this point in the history
Make everything refer to k0sproject/footloose-* images
  • Loading branch information
kke authored Sep 26, 2023
2 parents 5803b2a + 262854f commit a7a7234
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 99 deletions.
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ $ footloose ssh root@node1
## Choosing the OS image to run

`footloose` will default to running an Ubuntu LTS container image. The `--image`
argument of `config create` can be used to configure the OS image. Valid OS
images are:
argument of `config create` can be used to configure the OS image. OS
images provided by this repository are:

- `quay.io/k0sproject/footloose-alpine3.18`
- `quay.io/k0sproject/footloose-amazonlinux2023`
Expand All @@ -93,18 +93,23 @@ images are:
- `quay.io/k0sproject/footloose-ubuntu20.04`
- `quay.io/k0sproject/footloose-ubuntu22.04`

The tag `:latest` is updated when any of the images are changed in the repository.
When footloose CLI binary releases are published, images at that point are tagged
with a version that you can pin a config to, such as
`quay.io/k0sproject/footloose-ubuntu20.04:v0.7.0`.

For example:

```console
footloose config create --replicas 3 --image quay.io/k0sproject/footloose-debian12
```

Some images need the `--privileged` flag:

```console
footloose config create --replicas 1 --image quay.io/k0sproject/footloose-ubuntu18.04 --privileged
footloose config create --replicas 3 --image quay.io/k0sproject/footloose-debian12:v0.7.0
```

Some images may need the `--privileged` flag.

## `footloose.yaml`

`footloose config create` creates a `footloose.yaml` configuration file that is then
Expand Down
2 changes: 1 addition & 1 deletion defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var defaultConfig = config.Config{
Count: 1,
Spec: config.Machine{
Name: "node%d",
Image: "centos7", // TODO use a k0sproject hosted image
Image: "quay.io/k0sproject/footloose-ubuntu20.04",
PortMappings: []config.PortMapping{{
ContainerPort: 22,
}},
Expand Down
4 changes: 2 additions & 2 deletions examples/ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ deploy container images:

```console
$ footloose create
INFO[0000] Pulling image: quay.io/footloose/centos7 ...
INFO[0000] Pulling image: quay.io/footloose/ubuntu20.04 ...
INFO[0007] Creating machine: cluster-node0 ...
```

Expand Down Expand Up @@ -49,4 +49,4 @@ changed: [cluster-node0]

PLAY RECAP **************************************
cluster-node0 : ok=5 changed=0 unreachable=0 failed=0
```
```
2 changes: 1 addition & 1 deletion examples/docker-in-docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cluster:
machines:
- count: 1
spec:
image: quay.io/footloose/centos7
image: quay.io/k0sproject/footloose-debian12
name: node%d
portMappings:
- containerPort: 22
Expand Down
4 changes: 2 additions & 2 deletions examples/fedora29-htop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For instance, if we want the created machines to run `fedora29` with the
`htop` package already pre-installed:

```Dockerfile
FROM quay.io/footloose/fedora29
FROM quay.io/k0sproject/footloose-fedora39

# Pre-seed the htop package
RUN dnf -y install htop && dnf clean all
Expand All @@ -18,7 +18,7 @@ RUN dnf -y install htop && dnf clean all
Build that image:

```console
docker build -t fedora29-htop .
docker build -t fedora39-htop .
```

Configure `footloose.yaml` to use that image by either editing the file or running:
Expand Down
4 changes: 2 additions & 2 deletions examples/simple-hostPort/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cluster:
machines:
- count: 2
spec:
image: quay.io/footloose/centos7
image: quay.io/k0sproject/footloose-debian12
name: node%d
portMappings:
- containerPort: 22
Expand All @@ -23,7 +23,7 @@ Now you can deploy your cluster:

```console
$ footloose create
INFO[0000] Image: quay.io/footloose/centos7 present locally
INFO[0000] Image: quay.io/k0sproject/footloose-debian12 present locally
INFO[0000] Creating machine: cluster-node0 ...
INFO[0001] Creating machine: cluster-node1 ...

Expand Down
4 changes: 2 additions & 2 deletions examples/user-defined-network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cluster:
machines:
- count: 3
spec:
image: quay.io/footloose/centos7:0.6.4
image: quay.io/k0sproject/footloose-debian12:latest
name: node%d
networks:
- footloose-cluster
Expand All @@ -32,7 +32,7 @@ Now you can deploy your cluster:

```console
$ footloose create
INFO[0000] Image: quay.io/footloose/centos7 present locally
INFO[0000] Image: quay.io/k0sproject/footloose-debian12 present locally
INFO[0000] Creating machine: cluster-node0 ...
INFO[0001] Creating machine: cluster-node1 ...
INFO[0002] Creating machine: cluster-node2 ...
Expand Down
83 changes: 0 additions & 83 deletions make-image.sh

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestCreateDeleteMachine(t *testing.T) {

err = env.client.CreateMachine("testcluster", &config.Machine{
Name: "testmachine",
Image: "quay.io/footloose/centos7:latest", // TODO use a k0sproject hosted image
Image: "quay.io/k0sproject/footloose-ubuntu20.04:latest",
PortMappings: []config.PortMapping{
{ContainerPort: 22},
},
Expand Down

0 comments on commit a7a7234

Please sign in to comment.