Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

Commit 35270ac

Browse files
authored
Merge branch 'main' into renovate/patch-github-actions
2 parents d1e451a + 6356a5a commit 35270ac

File tree

128 files changed

+5862
-2160
lines changed

Some content is hidden

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

128 files changed

+5862
-2160
lines changed

.github/actions/setup-go/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: "composite"
55
steps:
66
- name: Install go
7-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
7+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
88
with:
99
go-version: "1.22"
1010
go-version-file: "go.mod"
@@ -16,14 +16,14 @@ runs:
1616
echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
1717
echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
1818
- name: Go Mod Cache
19-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
19+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
2020
with:
2121
path: ${{ steps.go-cache-paths.outputs.go-mod }}
2222
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
2323
restore-keys: |
2424
${{ runner.os }}-go-mod-
2525
- name: Go Build Cache
26-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
26+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
2727
with:
2828
path: ${{ steps.go-cache-paths.outputs.go-build }}
2929
key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}

.github/workflows/build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
uses: ./.github/actions/setup-go
3636

3737
- name: Set up QEMU
38-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
38+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
3939
- name: Set up Docker Buildx
40-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
40+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
4141

4242
- name: Generate metadata cspo
4343
id: metacspo
@@ -73,7 +73,7 @@ jobs:
7373
7474
# Load Golang cache build from GitHub
7575
- name: Load cspo Golang cache build from GitHub
76-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
76+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
7777
id: cache
7878
with:
7979
path: /tmp/.cache/cspo
@@ -91,7 +91,7 @@ jobs:
9191
9292
# Import GitHub's cache build to docker cache
9393
- name: Copy cspo Golang cache to docker cache
94-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
94+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
9595
with:
9696
provenance: false
9797
context: /tmp/.cache/cspo
@@ -101,7 +101,7 @@ jobs:
101101
target: import-cache
102102

103103
- name: Build and push cspo image
104-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6
104+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
105105
id: docker_build_release_cspo
106106
with:
107107
provenance: false
@@ -145,7 +145,7 @@ jobs:
145145
146146
# Upload artifact digests
147147
- name: Upload artifact digests
148-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
148+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
149149
with:
150150
name: image-digest
151151
path: image-digest
@@ -154,7 +154,7 @@ jobs:
154154
# Store docker's golang's cache build locally only on the main branch
155155
- name: Store cspo Golang cache build locally
156156
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
157-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
157+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
158158
with:
159159
provenance: false
160160
context: .

.github/workflows/pr-verify.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Verify Starlark
3030
run: make verify-starlark
3131

32-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
32+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
3333
with:
3434
node-version: "18"
3535
- name: Install renovate
@@ -42,7 +42,7 @@ jobs:
4242
done
4343
4444
- name: Generate Token
45-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1
45+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1
4646
id: generate-token
4747
with:
4848
app-id: ${{ secrets.SCS_APP_ID }}

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
fetch-depth: 0
2424
- uses: ./.github/actions/setup-go
2525
- name: Set up QEMU
26-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
26+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
28+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
2929

3030
- name: Generate metadata cspo
3131
id: metacspo
@@ -60,7 +60,7 @@ jobs:
6060
echo 'EOF' >> $GITHUB_ENV
6161
6262
- name: Build and push cspo image
63-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6
63+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
6464
id: docker_build_release_cspo
6565
with:
6666
provenance: false
@@ -105,7 +105,7 @@ jobs:
105105
106106
# Upload artifact digests
107107
- name: Upload artifact digests
108-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
108+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
109109
with:
110110
name: image-digest cspo
111111
path: image-digest
@@ -154,7 +154,7 @@ jobs:
154154
make release-notes
155155
156156
- name: Release
157-
uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2
157+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
158158
with:
159159
draft: true
160160
files: out/*

.github/workflows/report-bin-size.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
1717

1818
- name: Install go
19-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2020
with:
2121
go-version-file: "go.mod"
2222
cache: true
@@ -26,7 +26,7 @@ jobs:
2626
run: make manager-core report-binsize-treemap-all
2727

2828
- name: Upload Report
29-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
29+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
3030
with:
3131
name: reports-${{ github.sha }}
3232
path: .reports

.github/workflows/schedule-cache-cleaner-cspo-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Load Golang cache build from GitHub
1717
- name: Load cspo Golang cache build from GitHub
18-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
18+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
1919
id: cache
2020
with:
2121
path: /tmp/.cache/cspo

.github/workflows/schedule-update-bot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
# qemu is not required as of now because we don't build images for arm64
3636
# use docker/setup-qemu-action@v3 if you want to have arm64 images.
3737
- name: Set up Docker Buildx # required for building image
38-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
38+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
3939

4040
- name: Generate Token
41-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1
41+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1
4242
id: generate-token
4343
with:
4444
app-id: ${{ secrets.SCS_APP_ID }}

go.mod

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ module github.com/SovereignCloudStack/cluster-stack-provider-openstack
22

33
go 1.22.0
44

5-
toolchain go1.23.3
5+
toolchain go1.23.5
66

77
require (
8-
github.com/SovereignCloudStack/cluster-stack-operator v0.1.0-alpha.7
9-
github.com/gophercloud/gophercloud/v2 v2.2.0
10-
github.com/gophercloud/utils/v2 v2.0.0-20240812072210-8ce1fc0f2894
11-
github.com/onsi/ginkgo/v2 v2.22.0
12-
github.com/onsi/gomega v1.36.0
8+
github.com/SovereignCloudStack/cluster-stack-operator v0.1.0-alpha.8
9+
github.com/gophercloud/gophercloud/v2 v2.4.0
10+
github.com/gophercloud/utils/v2 v2.0.0-20250106080359-c8704d65b4fa
11+
github.com/onsi/ginkgo/v2 v2.22.2
12+
github.com/onsi/gomega v1.36.2
1313
github.com/stretchr/testify v1.10.0
14-
k8s.io/api v0.30.7
15-
k8s.io/apimachinery v0.30.7
16-
k8s.io/client-go v0.30.7
14+
k8s.io/api v0.30.9
15+
k8s.io/apimachinery v0.30.9
16+
k8s.io/client-go v0.30.9
1717
k8s.io/klog/v2 v2.130.1
18-
sigs.k8s.io/cluster-api v1.8.5
19-
sigs.k8s.io/cluster-api-provider-openstack v0.11.3
20-
sigs.k8s.io/controller-runtime v0.18.5
18+
sigs.k8s.io/cluster-api v1.8.8
19+
sigs.k8s.io/cluster-api-provider-openstack v0.11.4
20+
sigs.k8s.io/controller-runtime v0.18.7
2121
sigs.k8s.io/yaml v1.4.0
2222
)
2323

@@ -40,7 +40,7 @@ require (
4040
github.com/go-openapi/jsonreference v0.20.2 // indirect
4141
github.com/go-openapi/swag v0.22.4 // indirect
4242
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
43-
github.com/gobuffalo/flect v1.0.2 // indirect
43+
github.com/gobuffalo/flect v1.0.3 // indirect
4444
github.com/gofrs/uuid/v5 v5.3.0 // indirect
4545
github.com/gogo/protobuf v1.3.2 // indirect
4646
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -49,14 +49,13 @@ require (
4949
github.com/google/go-cmp v0.6.0 // indirect
5050
github.com/google/go-querystring v1.1.0 // indirect
5151
github.com/google/gofuzz v1.2.0 // indirect
52-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
52+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5353
github.com/google/uuid v1.6.0 // indirect
5454
github.com/imdario/mergo v0.3.15 // indirect
5555
github.com/josharian/intern v1.0.0 // indirect
5656
github.com/json-iterator/go v1.1.12 // indirect
5757
github.com/klauspost/compress v1.17.9 // indirect
5858
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/mitchellh/go-homedir v1.1.0 // indirect
6059
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6160
github.com/modern-go/reflect2 v1.0.2 // indirect
6261
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -72,23 +71,23 @@ require (
7271
github.com/stretchr/objx v0.5.2 // indirect
7372
go.uber.org/multierr v1.11.0 // indirect
7473
go.uber.org/zap v1.27.0 // indirect
75-
golang.org/x/crypto v0.29.0 // indirect
74+
golang.org/x/crypto v0.32.0 // indirect
7675
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
77-
golang.org/x/mod v0.21.0 // indirect
78-
golang.org/x/net v0.30.0 // indirect
79-
golang.org/x/oauth2 v0.21.0 // indirect
80-
golang.org/x/sync v0.9.0 // indirect
81-
golang.org/x/sys v0.27.0 // indirect
82-
golang.org/x/term v0.26.0 // indirect
83-
golang.org/x/text v0.20.0 // indirect
76+
golang.org/x/mod v0.22.0 // indirect
77+
golang.org/x/net v0.33.0 // indirect
78+
golang.org/x/oauth2 v0.24.0 // indirect
79+
golang.org/x/sync v0.10.0 // indirect
80+
golang.org/x/sys v0.29.0 // indirect
81+
golang.org/x/term v0.28.0 // indirect
82+
golang.org/x/text v0.21.0 // indirect
8483
golang.org/x/time v0.5.0 // indirect
85-
golang.org/x/tools v0.26.0 // indirect
84+
golang.org/x/tools v0.28.0 // indirect
8685
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/protobuf v1.35.1 // indirect
86+
google.golang.org/protobuf v1.36.1 // indirect
8887
gopkg.in/inf.v0 v0.9.1 // indirect
8988
gopkg.in/yaml.v2 v2.4.0 // indirect
9089
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/apiextensions-apiserver v0.30.7 // indirect
90+
k8s.io/apiextensions-apiserver v0.30.9 // indirect
9291
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
9392
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
9493
oras.land/oras-go/v2 v2.5.0 // indirect

0 commit comments

Comments
 (0)