Skip to content

Commit 16e2007

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/reservations
# Conflicts: # broker/machinebroker/server/server_suite_test.go # iri/apis/machine/v1alpha1/api.pb.go # poollet/machinepoollet/api/v1alpha1/common_types.go
2 parents 5ce43e7 + 87761bd commit 16e2007

File tree

134 files changed

+1931
-843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1931
-843
lines changed

.github/workflows/check-codegen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
check-codegen:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v5
14+
- uses: actions/setup-go@v6
1515
with:
1616
go-version-file: 'go.mod'
1717
- name: Run make generate

.github/workflows/clean-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out code
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313

1414
- name: Cleanup
1515
run: |

.github/workflows/kustomize-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
- uses: imranismail/setup-kustomize@v2
1717
with:
1818
kustomize-version: '5.0.0'

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
name: lint
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v5
14+
- uses: actions/setup-go@v6
1515
with:
1616
go-version-file: 'go.mod'
1717
- name: golangci-lint

.github/workflows/publish-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
(github.event_name == 'release' && github.event.action == 'published')
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v5
5959
- uses: docker/metadata-action@v5
6060
id: meta
6161
with:

.github/workflows/publish-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout main
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Configure Git Credentials
1616
run: |
1717
git config user.name github-actions[bot]
1818
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
19-
- uses: actions/setup-python@v5
19+
- uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.x
2222
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
name: reuse
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
- name: REUSE Compliance Check
1212
uses: fsfe/reuse-action@v5

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
name: test
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-go@v5
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-go@v6
1717
with:
1818
go-version-file: 'go.mod'
1919
- name: Run make test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ dev/
2929
charts/
3030
apiserver.local.config/
3131
default.etcd/
32+
.DS_Store
3233

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.25 AS builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

0 commit comments

Comments
 (0)