Merge branch 'vexxhost:main' into fix-dns-list-issue

Author: yaguangtang

.github/workflows/release.yml

@@ -28,9 +28,20 @@ jobs:
         if: ${{ steps.release.outputs.release_created }}
         uses: actions/checkout@v4
 
-      - name: Build package
+      - name: Build package (x86_64)
         if: ${{ steps.release.outputs.release_created }}
-        uses: PyO3/maturin-action@v1
+        uses: vexxhost/maturin-action@1fd4380c3940bda702f839c74df45c5b1392dbcc
         with:
           command: publish
-          args: --non-interactive
+          args: --non-interactive --skip-existing
+          manylinux: '2_28'
+          target: x86_64
+
+      - name: Build package (aarch64)
+        if: ${{ steps.release.outputs.release_created }}
+        uses: vexxhost/maturin-action@1fd4380c3940bda702f839c74df45c5b1392dbcc
+        with:
+          command: publish
+          args: --non-interactive --skip-existing
+          manylinux: '2_28'
+          target: aarch64

.github/workflows/test.yml

@@ -14,50 +14,40 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - runs-on: ubuntu-latest
-            python-version: "3.8"
-          - runs-on: ubuntu-latest
-            python-version: "3.9"
-          - runs-on: ubuntu-latest
-            python-version: "3.10"
+        target: [x86_64, aarch64]
+        python-version: ["3.8", "3.9", "3.10"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
 
       - name: Build package
-        uses: PyO3/maturin-action@v1
+        uses: vexxhost/maturin-action@1fd4380c3940bda702f839c74df45c5b1392dbcc
         with:
           command: build
+          manylinux: '2_28'
           args: --release --sdist
+          target: ${{ matrix.target }}
 
   install:
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - runs-on: ubuntu-latest
-            python-version: "3.8"
-            openstack-version: zed
-          - runs-on: ubuntu-latest
-            python-version: "3.8"
-            openstack-version: "2023.1"
-          - runs-on: ubuntu-latest
-            python-version: "3.10"
-            openstack-version: "2023.2"
+        python-version: ["3.8", "3.9", "3.10"]
+        openstack-version: ["zed", "2023.1", "2023.2", "2024.1", "2024.2"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
 
       - name: Build package
-        uses: PyO3/maturin-action@v1
+        uses: vexxhost/maturin-action@1fd4380c3940bda702f839c74df45c5b1392dbcc
         with:
           command: build
+          manylinux: '2_28'
           args: --release --out dist --sdist
 
       - name: Setup Python

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## [0.26.0](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.8...v0.26.0) (2025-02-21)
+
+
+### Features
+
+* Add aarch64 builds ([#508](https://github.com/vexxhost/magnum-cluster-api/issues/508)) ([11300c6](https://github.com/vexxhost/magnum-cluster-api/commit/11300c6f203b511693482c3bf6fe506136952d86))
+
+## [0.25.8](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.7...v0.25.8) (2025-02-21)
+
+
+### Bug Fixes
+
+* Solve build problems ([#506](https://github.com/vexxhost/magnum-cluster-api/issues/506)) ([00110bd](https://github.com/vexxhost/magnum-cluster-api/commit/00110bdf2bb87199ae645e898e11e28d134dddf5))
+
+## [0.25.7](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.6...v0.25.7) (2025-02-21)
+
+
+### Bug Fixes
+
+* Use pinned GitHub action ([03c5db6](https://github.com/vexxhost/magnum-cluster-api/commit/03c5db6fee97909ff2061c8e5d89bf787c4b52a2))
+
+## [0.25.6](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.5...v0.25.6) (2025-02-21)
+
+
+### Bug Fixes
+
+* add missing env ([c5e6737](https://github.com/vexxhost/magnum-cluster-api/commit/c5e6737b29b82351a592f3e80f060491bf51e330))
+
+## [0.25.5](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.4...v0.25.5) (2025-02-21)
+
+
+### Bug Fixes
+
+* Double-up permissions for release ([5b2aa1a](https://github.com/vexxhost/magnum-cluster-api/commit/5b2aa1a93e5dfccc227cdfb1fa4fbedeba2fdbd3))
+
+## [0.25.4](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.3...v0.25.4) (2025-02-21)
+
+
+### Bug Fixes
+
+* Solve trusted publishing ([f7f665c](https://github.com/vexxhost/magnum-cluster-api/commit/f7f665c76cc35fa2fed8048c131ca47c5d9e146e))
+
 ## [0.25.3](https://github.com/vexxhost/magnum-cluster-api/compare/v0.25.2...v0.25.3) (2025-02-21)
 
 

magnum_cluster_api/driver.py

@@ -246,13 +246,17 @@ def update_cluster_status(
 
             # NOTE(mnaser): We delete the application credentials at this stage
             #               to make sure CAPI doesn't lose access to OpenStack.
+            # NOTE(maximmonin): Keystone policy may forbid extraction of project
+            #                   application credentials with admin rights.
             try:
                 osc.keystone().client.application_credentials.find(
                     name=cluster.uuid,
                     user=cluster.user_id,
                 ).delete()
             except keystoneauth1.exceptions.http.NotFound:
                 pass
+            except keystoneauth1.exceptions.http.Forbidden:
+                pass
 
             resources.CloudConfigSecret(context, self.k8s_api, cluster).delete()
             resources.ApiCertificateAuthoritySecret(

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "magnum-cluster-api"
-version = "0.25.3"
+version = "0.26.0"
 description = "Cluster API driver for Magnum"
 readme = "README.md"
 license = "Apache-2.0"