Skip to content

Commit 29272d9

Browse files
committed
Remove bare actuated labels from examples
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent 23a52c4 commit 29272d9

12 files changed

+24
-37
lines changed

docs/examples/github-actions-cache.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on: push
2323

2424
jobs:
2525
build:
26-
runs-on: actuated
26+
runs-on: actuated-4cpu-12gb
2727
steps:
2828
- uses: actions/checkout@v3
2929
with:
@@ -57,7 +57,7 @@ on: push
5757
5858
jobs:
5959
build:
60-
runs-on: actuated
60+
runs-on: actuated-4cpu-12gb
6161
steps:
6262
- uses: actions/checkout@v3
6363
with:

docs/examples/matrix-k8s.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
jobs:
3939
kubernetes:
4040
name: k3s-test-${{ matrix.k3s }}
41-
runs-on: actuated
41+
runs-on: actuated-4cpu-12gb
4242
strategy:
4343
matrix:
4444
k3s: [v1.16, v1.17, v1.18, v1.19, v1.20, v1.21, v1.22, v1.23, v1.24, v1.25]

docs/examples/matrix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
jobs:
3030
arkade-e2e:
3131
name: arkade-e2e
32-
runs-on: actuated
32+
runs-on: actuated-4cpu-12gb
3333
strategy:
3434
matrix:
3535
apps: [run-job,k3sup,arkade,kubectl,faas-cli]

docs/examples/multiarch-buildx.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
+ packages: write
6161

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

7878
- name: Set up QEMU
79-
uses: docker/setup-qemu-action@v2
79+
uses: docker/setup-qemu-action@v3
8080
- name: Set up Docker Buildx
81-
uses: docker/setup-buildx-action@v2
81+
uses: docker/setup-buildx-action@v3
8282
- name: Login to container Registry
83-
uses: docker/login-action@v2
83+
uses: docker/login-action@v3
8484
with:
8585
username: ${{ github.repository_owner }}
8686
password: ${{ secrets.GITHUB_TOKEN }}
8787
registry: ghcr.io
8888

8989
- name: Release build
9090
id: release_build
91-
uses: docker/build-push-action@v3
91+
uses: docker/build-push-action@v5
9292
with:
9393
outputs: "type=registry,push=true"
9494
platforms: linux/amd64,linux/arm/v6,linux/arm64
@@ -103,17 +103,17 @@ jobs:
103103

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

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

108-
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.
108+
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.
109109

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

112112
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.
113113

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

119119
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.

docs/examples/openfaas-helm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ permissions:
3939

4040
jobs:
4141
e2e:
42-
runs-on: actuated
42+
runs-on: actuated-4cpu-12gb
4343
steps:
4444
- uses: actions/checkout@master
4545
with:

docs/examples/openfaas-publish.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ For alexellis' repository called [alexellis/autoscaling-functions](https://githu
2626
* Only the bcrypt function is being built with the `--filter` command added, remove it to build all functions in the stack.yml.
2727
* `--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
2828

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

3131
```yaml
3232
name: publish
@@ -47,7 +47,7 @@ permissions:
4747

4848
jobs:
4949
publish:
50-
runs-on: actuated
50+
runs-on: actuated-4cpu-12gb
5151
steps:
5252
- uses: actions/checkout@master
5353
with:
@@ -57,9 +57,9 @@ jobs:
5757
- name: Pull custom templates from stack.yml
5858
run: faas-cli template pull stack
5959
- name: Set up QEMU
60-
uses: docker/setup-qemu-action@v1
60+
uses: docker/setup-qemu-action@v3
6161
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@v1
62+
uses: docker/setup-buildx-action@v3
6363
- name: Get TAG
6464
id: get_tag
6565
run: echo ::set-output name=TAG::latest-dev

docs/examples/system-info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ on:
6666
jobs:
6767
specs:
6868
name: specs
69-
runs-on: actuated
69+
runs-on: actuated-4cpu-12gb
7070
steps:
7171
- uses: actions/checkout@v1
7272
- name: Check specs

docs/expose-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ on:
188188
jobs:
189189
specs:
190190
name: specs
191-
runs-on: actuated
191+
runs-on: actuated-4cpu-12gb
192192
steps:
193193
- uses: actions/checkout@v1
194194
- name: addr

docs/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Example of running commands with the `docker.io/node:latest` image.
138138
jobs:
139139
specs:
140140
name: test
141-
runs-on: actuated
141+
runs-on: actuated-4cpu-12gb
142142
container:
143143
image: docker.io/node:latest
144144
env:

docs/install-agent.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,20 +203,7 @@ jobs:
203203
+ runs-on: actuated-arm64-8cpu-32gb
204204
```
205205

206-
You can also customise the VM size for each job:
207-
208-
```diff
209-
name: ci
210-
211-
on: push
212-
213-
jobs:
214-
build-golang:
215-
- runs-on: actuated
216-
+ runs-on: actuated-4cpu-8gb
217-
```
218-
219-
> 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.
206+
> 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.
220207
221208
### Other considerations
222209

0 commit comments

Comments
 (0)