Skip to content

Commit

Permalink
Remove bare actuated labels from examples
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed May 17, 2024
1 parent 23a52c4 commit 29272d9
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 37 deletions.
4 changes: 2 additions & 2 deletions docs/examples/github-actions-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on: push

jobs:
build:
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -57,7 +57,7 @@ on: push
jobs:
build:
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/matrix-k8s.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ on:
jobs:
kubernetes:
name: k3s-test-${{ matrix.k3s }}
runs-on: actuated
runs-on: actuated-4cpu-12gb
strategy:
matrix:
k3s: [v1.16, v1.17, v1.18, v1.19, v1.20, v1.21, v1.22, v1.23, v1.24, v1.25]
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
jobs:
arkade-e2e:
name: arkade-e2e
runs-on: actuated
runs-on: actuated-4cpu-12gb
strategy:
matrix:
apps: [run-job,k3sup,arkade,kubectl,faas-cli]
Expand Down
18 changes: 9 additions & 9 deletions docs/examples/multiarch-buildx.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
+ packages: write

- runs-on: ubuntu-latest
+ runs-on: actuated
+ runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@master
with:
Expand All @@ -76,19 +76,19 @@ jobs:
run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io

- name: Release build
id: release_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
outputs: "type=registry,push=true"
platforms: linux/amd64,linux/arm/v6,linux/arm64
Expand All @@ -103,17 +103,17 @@ jobs:

You'll see that we added a `Setup mirror` step, this explained in the [Registry Mirror example](/tasks/registry-mirror)

The `docker/setup-qemu-action@v2` step is responsible for setting up QEMU, which is used to emulate the different CPU architectures.
The `docker/setup-qemu-action@v3` step is responsible for setting up QEMU, which is used to emulate the different CPU architectures.

The `docker/build-push-action@v3` step is responsible for passing in a number of platform combinations such as: `linux/amd64` for cloud, `linux/arm64` for Arm servers and `linux/arm/v6` for Raspberry Pi.
The `docker/build-push-action@v5` step is responsible for passing in a number of platform combinations such as: `linux/amd64` for cloud, `linux/arm64` for Arm servers and `linux/arm/v6` for Raspberry Pi.

Within [the Dockerfile](https://github.com/inlets/inlets-operator/blob/master/Dockerfile), we needed to make a couple of changes.

You can pick to run the step in either the BUILDPLATFORM or TARGETPLATFORM. The BUILDPLATFORM is the native architecture and platform of the machine performing the build, this is usually amd64. The TARGETPLATFORM is important for the final step of the build, and will be injected based upon one each of the platforms you have specified in the step.

```diff
- FROM golang:1.18 as builder
+ FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.18 as builder
- FROM golang:1.22 as builder
+ FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 as builder
```

For Go specifically, we also updated the `go build` command to tell Go to use cross-compilation based upon the TARGETOS and TARGETARCH environment variables, which are populated by Docker.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/openfaas-helm.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ permissions:

jobs:
e2e:
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@master
with:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/openfaas-publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For alexellis' repository called [alexellis/autoscaling-functions](https://githu
* Only the bcrypt function is being built with the `--filter` command added, remove it to build all functions in the stack.yml.
* `--platforms linux/amd64,linux/arm64,linux/arm/v7` will build for regular Intel/AMD machines, 64-bit Arm and 32-bit Arm i.e. Raspberry Pi, most users can reduce this list to just "linux/amd64" for a speed improvement

Make sure you edit `runs-on:` and set it to `runs-on: actuated`
Make sure you edit `runs-on:` and set it to `runs-on: actuated-4cpu-12gb`

```yaml
name: publish
Expand All @@ -47,7 +47,7 @@ permissions:

jobs:
publish:
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@master
with:
Expand All @@ -57,9 +57,9 @@ jobs:
- name: Pull custom templates from stack.yml
run: faas-cli template pull stack
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Get TAG
id: get_tag
run: echo ::set-output name=TAG::latest-dev
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/system-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ on:
jobs:
specs:
name: specs
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@v1
- name: Check specs
Expand Down
2 changes: 1 addition & 1 deletion docs/expose-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ on:
jobs:
specs:
name: specs
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: actions/checkout@v1
- name: addr
Expand Down
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Example of running commands with the `docker.io/node:latest` image.
jobs:
specs:
name: test
runs-on: actuated
runs-on: actuated-4cpu-12gb
container:
image: docker.io/node:latest
env:
Expand Down
15 changes: 1 addition & 14 deletions docs/install-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,20 +203,7 @@ jobs:
+ runs-on: actuated-arm64-8cpu-32gb
```

You can also customise the VM size for each job:

```diff
name: ci
on: push
jobs:
build-golang:
- runs-on: actuated
+ runs-on: actuated-4cpu-8gb
```

> In a future version of actuated, you'll be able to specify `actuated-any` if you don't mind whether the job runs on one of your amd64 or arm64 servers.
> You can also specify `actuated-any-4cpu-8gb` if you don't mind whether the job runs on one of your amd64 or arm64 servers.
### Other considerations
Expand Down
2 changes: 1 addition & 1 deletion docs/register.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Plans are paid monthly, without any minimum commitment.

> We'll walk you through the onboarding process and answer all your questions, so that you can be up and running straight away.
We've now run over 245,000 VMs for commercial teams, and there's very little for you to do to get started, in most cases, we've seen a 2-3x speed up for `x86_64` builds by switching one line in a workflow: `runs-on: actuated`. For `Arm` builds, native hardware makes a night and day difference.
We've now run over 245,000 VMs for commercial teams, and there's very little for you to do to get started, in most cases, we've seen a 2-3x speed up for `x86_64` builds by switching one line in a workflow: `runs-on: actuated-4cpu-16gb`. For `Arm` builds, native hardware makes a night and day difference.

## Book a call with us

Expand Down
2 changes: 1 addition & 1 deletion docs/tasks/debug-ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ permissions:
jobs:
connect:
name: connect
runs-on: actuated
runs-on: actuated-4cpu-12gb
steps:
- uses: self-actuated/connect-ssh@master
```
Expand Down

0 comments on commit 29272d9

Please sign in to comment.