Skip to content

Commit aa1730f

Browse files
committed
Merge branch 'main' of github.com:sp-yduck/cluster-api-provider-proxmox into main
2 parents 89bf0aa + cd2051d commit aa1730f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/docker-publish.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ jobs:
4040
with:
4141
cosign-release: 'v2.1.1'
4242

43+
# Setup QEMU for multi-arch builds
44+
- name: Setup QEMU
45+
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
46+
4347
# Workaround: https://github.com/docker/build-push-action/issues/461
4448
- name: Setup Docker buildx
4549
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
@@ -69,13 +73,13 @@ jobs:
6973
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
7074
with:
7175
context: .
76+
platforms: linux/amd64,linux/arm,linux/arm64
7277
push: ${{ github.event_name != 'pull_request' }}
7378
tags: ${{ steps.meta.outputs.tags }}
7479
labels: ${{ steps.meta.outputs.labels }}
7580
cache-from: type=gha
7681
cache-to: type=gha,mode=max
7782

78-
7983
# Sign the resulting Docker image digest except on PRs.
8084
# This will only write to the public Rekor transparency log when the Docker
8185
# repository is public to avoid leaking data. If you would like to publish

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ ProxmoxMachine controller follows the [typical infra-machine logic](https://clus
106106

107107
### Testing
108108
#### Unit Testing
109-
```
109+
```sh
110110
make unit-test
111111
```
112112

113113
#### Unit and Integration Testing
114-
```
114+
```sh
115115
export PROXMOX_URL=https://X.X.X.X:8006/api2/json
116116
export PROXMOX_PASSWORD=password
117117
export PROXMOX_USER=user@pam
@@ -120,7 +120,7 @@ make test
120120
```
121121

122122
#### E2E Testing
123-
```
123+
```sh
124124
export CONTROLPLANE_HOST=X.X.X.X
125125
export PROXMOX_URL=https://X.X.X.X:8006/api2/json
126126
export PROXMOX_PASSWORD=password

0 commit comments

Comments
 (0)