Skip to content

Commit 46d3766

Browse files
authored
Merge branch 'main' into feat/csi_snapshot_controller_helm
2 parents c805e22 + d08fcb3 commit 46d3766

Some content is hidden

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

55 files changed

+2732
-1085
lines changed

.charts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ charts:
88
repository:
99
url: https://helm.cilium.io/
1010
- name: openstack-cloud-controller-manager
11-
version: 2.32.0
11+
version: 2.34.1
1212
repository:
1313
url: https://kubernetes.github.io/cloud-provider-openstack
1414
- name: openstack-cinder-csi

.github/workflows/bump.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
kubernetes:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1313
with:
1414
token: ${{ secrets.VEXXHOST_BOT_PAT }}
1515
- run: ./hack/bump/kubernetes.sh
@@ -27,10 +27,33 @@ jobs:
2727
delete-branch: true
2828
branch: bump/kubernetes
2929

30+
cloud-provider-openstack:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- run: sudo apt-get install patchutils
34+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
35+
with:
36+
token: ${{ secrets.VEXXHOST_BOT_PAT }}
37+
- run: ./hack/bump/cloud-provider-openstack.sh
38+
env:
39+
GH_TOKEN: ${{ github.token }}
40+
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
41+
with:
42+
token: ${{ secrets.VEXXHOST_BOT_PAT }}
43+
push-to-fork: vexxhost-bot/magnum-cluster-api
44+
commit-message: "chore(deps): update cloud-provider-openstack"
45+
signoff: true
46+
title: "chore(deps): update cloud-provider-openstack"
47+
body: |
48+
## Automated `cloud-provider-openstack` update
49+
This PR updates the `cloud-provider-openstack` images to the latest versions.
50+
delete-branch: true
51+
branch: bump/cloud-provider-openstack
52+
3053
cluster-autoscaler:
3154
runs-on: ubuntu-latest
3255
steps:
33-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
56+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3457
with:
3558
token: ${{ secrets.VEXXHOST_BOT_PAT }}
3659
- run: ./hack/bump/cluster-autoscaler.sh

.github/workflows/ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ jobs:
2323
matrix:
2424
target: [x86_64, aarch64]
2525
steps:
26-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2727
- uses: rui314/setup-mold@v1
28-
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
28+
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
2929
- run: rustup show
3030
- uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
3131
with:
32+
maturin-version: v1.9.6
3233
command: build
3334
manylinux: "2_28"
3435
args: --release --sdist
@@ -37,8 +38,10 @@ jobs:
3738
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3839
with:
3940
name: wheel-${{ matrix.target }}
40-
path: target/wheels/*.whl
4141
if-no-files-found: error
42+
path: |
43+
target/wheels/*.whl
44+
target/wheels/*.tar.gz
4245
4346
coinstall:
4447
runs-on: ubuntu-latest
@@ -67,7 +70,7 @@ jobs:
6770
- openstack-version: "2023.2"
6871
python-version: "3.12"
6972
steps:
70-
- uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
73+
- uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
7174
with:
7275
ignore-empty-workdir: true
7376
python-version: ${{ matrix.python-version }}
@@ -81,13 +84,13 @@ jobs:
8184
pre-commit:
8285
runs-on: ubuntu-latest
8386
steps:
84-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
87+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
8588
with:
8689
ref: ${{ github.head_ref }}
8790
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
8891
token: ${{ secrets.VEXXHOST_BOT_PAT || github.token }}
8992
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
90-
- uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
93+
- uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7.0.0
9194
if: github.event_name == 'pull_request' && github.event.pull_request.user.id == '29139614' && always()
9295
with:
9396
commit_message: "chore: apply pre-commit hook updates"
@@ -96,8 +99,8 @@ jobs:
9699
chart-vendor:
97100
runs-on: ubuntu-latest
98101
steps:
99-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
100-
- uses: vexxhost/chart-vendor@54afe5fa09325aa8e7438eb29bf892579e6528ef # main
102+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
103+
- uses: vexxhost/chart-vendor@d242f2d52e9f707faaf66de927936e337eb9679e # main
101104
with:
102105
charts-root: magnum_cluster_api/charts
103106

@@ -109,15 +112,14 @@ jobs:
109112
matrix:
110113
network-driver: [calico, cilium]
111114
kubernetes-version:
112-
- 1.31.13
113-
- 1.32.9
114-
- 1.33.5
115-
- 1.34.1
115+
- 1.32.10
116+
- 1.33.7
117+
- 1.34.3
116118
concurrency:
117119
group: sonobuoy-${{ matrix.kubernetes-version }}-${{ matrix.network-driver }}-${{ github.event.pull_request.number }}
118120
cancel-in-progress: true
119121
steps:
120-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
122+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
121123
with:
122124
path: magnum-cluster-api
123125
- run: sudo mkdir -p /opt/stack

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout project
18-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1919

2020
- name: Install Earthly
2121
uses: earthly/actions-setup@43211c7a0eae5344d6d79fb4aaf209c8f8866203 # v1.0.13

.github/workflows/image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5959

6060
- name: Checkout project
61-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
61+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
6262

6363
- name: Generate image metadata
6464
id: meta
@@ -71,7 +71,7 @@ jobs:
7171
type=raw,value=latest,enable={{is_default_branch}}
7272
7373
- name: Authenticate with Quay.io
74-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
74+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
7575
if: ${{ github.event_name == 'push' || github.event_name == 'tag' || (github.event_name == 'workflow_dispatch' && inputs.image_push == true) }}
7676
with:
7777
registry: quay.io

.github/workflows/release-please.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
steps:
1818
- uses: googleapis/release-please-action@c2a5a2bd6a758a0937f1ddb1e8950609867ed15c # v4.3.0
1919
id: release
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2121
if: ${{ steps.release.outputs.release_created }}
2222
- name: Build package (x86_64)
2323
if: ${{ steps.release.outputs.release_created }}
2424
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
2525
with:
26+
maturin-version: v1.9.6
2627
command: publish
2728
args: --non-interactive --skip-existing
2829
manylinux: '2_28'
@@ -31,6 +32,7 @@ jobs:
3132
if: ${{ steps.release.outputs.release_created }}
3233
uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
3334
with:
35+
maturin-version: v1.9.6
3436
command: publish
3537
args: --non-interactive --skip-existing
3638
manylinux: '2_28'

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.31.2"
2+
".": "0.34.2"
33
}

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,60 @@
11
# Changelog
22

3+
## [0.34.2](https://github.com/vexxhost/magnum-cluster-api/compare/v0.34.1...v0.34.2) (2025-11-18)
4+
5+
6+
### Miscellaneous Chores
7+
8+
* release 0.34.2 ([2ec4bd6](https://github.com/vexxhost/magnum-cluster-api/commit/2ec4bd6889109452cec4c4793d726cee8bf309c8))
9+
10+
## [0.34.1](https://github.com/vexxhost/magnum-cluster-api/compare/v0.34.0...v0.34.1) (2025-11-17)
11+
12+
13+
### Miscellaneous Chores
14+
15+
* release 0.34.1 ([405fe56](https://github.com/vexxhost/magnum-cluster-api/commit/405fe5613882d41cc847a2fffe1467aa4d03e8e2))
16+
17+
## [0.34.0](https://github.com/vexxhost/magnum-cluster-api/compare/v0.33.0...v0.34.0) (2025-11-17)
18+
19+
20+
### Features
21+
22+
* refresh service account token automatically ([#846](https://github.com/vexxhost/magnum-cluster-api/issues/846)) ([be65f9b](https://github.com/vexxhost/magnum-cluster-api/commit/be65f9b592f2b971b63bbd8f0f6615bd6c3b8aa8))
23+
24+
25+
### Bug Fixes
26+
27+
* install patchutils in CI ([#839](https://github.com/vexxhost/magnum-cluster-api/issues/839)) ([d5c50af](https://github.com/vexxhost/magnum-cluster-api/commit/d5c50af73886ebe5c6aecaa477d54398dbffd33d))
28+
* make apiServerLoadbalancer sub-fields optional ([#850](https://github.com/vexxhost/magnum-cluster-api/issues/850)) ([aec4d2d](https://github.com/vexxhost/magnum-cluster-api/commit/aec4d2d022a0424656f9c5448e81c9f259098e4f))
29+
30+
## [0.33.0](https://github.com/vexxhost/magnum-cluster-api/compare/v0.32.0...v0.33.0) (2025-10-15)
31+
32+
33+
### Features
34+
35+
* bump cpo + add tool for autobumps ([#831](https://github.com/vexxhost/magnum-cluster-api/issues/831)) ([ad297aa](https://github.com/vexxhost/magnum-cluster-api/commit/ad297aa7e03fd73bd557aabd7389b0bf40b17ef9))
36+
37+
## [0.32.0](https://github.com/vexxhost/magnum-cluster-api/compare/v0.31.2...v0.32.0) (2025-10-14)
38+
39+
40+
### Features
41+
42+
* Add AZ, Flavor, and Floating IP labels for apiServerLoadBalancer [#510](https://github.com/vexxhost/magnum-cluster-api/issues/510) ([#798](https://github.com/vexxhost/magnum-cluster-api/issues/798)) ([0043157](https://github.com/vexxhost/magnum-cluster-api/commit/004315737efe5eb1c4b1d067c2a5533788fcbd61))
43+
44+
45+
### Bug Fixes
46+
47+
* **deps:** update pyo3 ([#783](https://github.com/vexxhost/magnum-cluster-api/issues/783)) ([551268b](https://github.com/vexxhost/magnum-cluster-api/commit/551268bde1cf9b6a2f9f5ba1836746fe4f82f9d3))
48+
* **deps:** update rust crate json-patch to v4.1.0 ([#811](https://github.com/vexxhost/magnum-cluster-api/issues/811)) ([a68104a](https://github.com/vexxhost/magnum-cluster-api/commit/a68104afc9498e7e9061e8839d699140520cabf5))
49+
* **deps:** update rust crate log to v0.4.28 ([#792](https://github.com/vexxhost/magnum-cluster-api/issues/792)) ([1b2dcc6](https://github.com/vexxhost/magnum-cluster-api/commit/1b2dcc61299bce906ad32159aae61185ce6a739c))
50+
* **deps:** update rust crate serde to v1.0.223 ([#802](https://github.com/vexxhost/magnum-cluster-api/issues/802)) ([939e2f2](https://github.com/vexxhost/magnum-cluster-api/commit/939e2f2b5f8d0895fa864fec9f14edc6e4e9f234))
51+
* **deps:** update rust crate serde to v1.0.225 ([#808](https://github.com/vexxhost/magnum-cluster-api/issues/808)) ([a920727](https://github.com/vexxhost/magnum-cluster-api/commit/a92072712770a6915fa810a41197ba05fdbb445b))
52+
* **deps:** update rust crate serde_json to v1.0.145 ([#803](https://github.com/vexxhost/magnum-cluster-api/issues/803)) ([4c387b8](https://github.com/vexxhost/magnum-cluster-api/commit/4c387b8734f5fa499a7a180b549a73d48c32ff5d))
53+
* **deps:** update rust crate tempfile to v3.22.0 ([#796](https://github.com/vexxhost/magnum-cluster-api/issues/796)) ([d265ad7](https://github.com/vexxhost/magnum-cluster-api/commit/d265ad7f957e95b511fd532184b9a882590cad93))
54+
* **deps:** update rust crate typed-builder to 0.22.0 ([#809](https://github.com/vexxhost/magnum-cluster-api/issues/809)) ([c80c869](https://github.com/vexxhost/magnum-cluster-api/commit/c80c869e1eab80336a6998561fbccc001726650f))
55+
* image release path ([#806](https://github.com/vexxhost/magnum-cluster-api/issues/806)) ([9fa843a](https://github.com/vexxhost/magnum-cluster-api/commit/9fa843ab39e0937616137e0c998d78ba34fea2fb))
56+
* set failure domain as none for existing clusters ([#825](https://github.com/vexxhost/magnum-cluster-api/issues/825)) ([41a1fe0](https://github.com/vexxhost/magnum-cluster-api/commit/41a1fe05f91777829e5ae9da243ab299f7eeba19))
57+
358
## [0.31.2](https://github.com/vexxhost/magnum-cluster-api/compare/v0.31.1...v0.31.2) (2025-09-02)
459

560

0 commit comments

Comments
 (0)