Skip to content

Synchronise master with upstream#276

Open
github-actions[bot] wants to merge 45 commits into
stackhpc/masterfrom
upstream/master-2026-06-01
Open

Synchronise master with upstream#276
github-actions[bot] wants to merge 45 commits into
stackhpc/masterfrom
upstream/master-2026-06-01

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented Jun 1, 2026

This PR contains a snapshot of master from upstream master.

mnasiadka and others added 30 commits May 8, 2026 13:37
This patch removes eventlet usage

Change-Id: I699db8c0720c9c0336e0e1b757041f6d3603f623
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
It was replaced by stestr and has been unused.

Change-Id: I0f4903c21822935b68b182f82a5efd4b11b2630e
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
Change-Id: I810e84b54545f04165b117e6d05e57b049adca54
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Needed for grenade enablement

Change-Id: Ia0941eb3a7d93274b290dffd3161e92b770b9629
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
The magnum core repository should be a driver-agnostic shell
supporting external drivers (e.g. magnum-capi-helm,
magnum-cluster-api).

Remove the Heat-based driver infrastructure and the bundled
k8s_fedora_coreos_v1 driver, along with all associated
configuration, tests, and dependencies.

Depends-On: https://review.opendev.org/c/openstack/magnum-tempest-plugin/+/987846

Change-Id: I8f2133576a9e658f5b28c1287a12837fae2776db
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I2e0d4e16ee06f76844c6461e5ecb6f921c254955
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
k8s_opensuse driver is long gone and not usable anymore
example_template is also not usable anymore

Change-Id: I0f9607c195cf3c5e0e0c9b71d8e97c842b44bf61
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I8f85a9f5ed60040f9c89b8750d267ee75e656fe5
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I7d7613fe01a452567bbf0951ff2d84848289147d
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I4e7596585c0017a642ce7fe380880c667dc5cb22
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: If535eb156ad91b22d31d1286efe2631f8b812919
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: Iae124ab08f6dc31b28181986f97f3e95d45181f7
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: Iff4e0c8ed55597ef3ad2e539cc9ff681dd949b08
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I32b55707050100570b3456cce74af14134532a9e
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
keystonemiddleware dropped admin_user, admin_password, admin_tenant_name,
auth_uri and related v2.0-era options from [keystone_authtoken] in the
2026.2 release (removal of AuthTokenPlugin).

Remove the _get_legacy_auth() fallback and its try/except in _get_auth(),
the import_group() call that pulled those options into Magnum's config,
and the legacy_session_opts deprecated aliases for TLS session options.
Update auth_url to read from [keystone_auth].auth_url first, falling back
to [keystone_authtoken].www_authenticate_uri. Remove the auth_uri fallback
and v2.0->v3 URL rewrite from hooks.py and keystone.py.

Change-Id: I04aafe25068ea82e142cf97da4936d291ef00150
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
During nodegroup creation, Cluster label dict is assigned directly
to the nodegroup and then updated with new labels.

This has the effect of changing the Cluster labels which is not
the desired change.

Closes-bug: #2129739
Change-Id: I3c4f8e2fb0f7620ecb39c882aaf2d3bec1cb1eae
Co-authored-by: Sam Morrison <sorrison@gmail.com>
Signed-off-by: Dale Smith <dale@catalystcloud.nz>
Change-Id: Ia602478236ed53f9d9387c348077a45c0480c495
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Decode certificate secret payloads before passing them to openstacksdk.
The SDK creates secrets with a JSON request body, so byte payloads fail
serialization before the request reaches Barbican.

Closes-Bug: #2152790

Assisted-By: Codex <noreply@openai.com>
Signed-off-by: ricolin <rlin@vexxhost.com>
Change-Id: I4891b3a18296c56c6ef38aa0b50b5b54a630083b
waipeng and others added 14 commits May 18, 2026 14:09
stack_id is not only used by heat, it is also used by magnum-capi-helm
to store the unique cluster name. E.g. for a coe cluster 'jake-1',
a CAPI cluster 'jake-1-sg23zieek7z3' will be created (the 'sg23zieek7z3'
is unique). This name is also used in other resources like openstack
network (k8s-clusterapi-...-jake-1-sg23zieek7z3), etc.

I am not aware of any other way to get the unique cluster name other
than through  this field. This means it is probably a breaking change
for users who rely on this.

Proposing a revert until we can find a alternative solution and
communicate that.

This reverts commit e502c5c.

Change-Id: I20004f79db56759ee6e4a1b31240f33227b962d7
Signed-off-by: Jake Yip <jake.yip@ardc.edu.au>
Barbican rejects JSON null for secret expiration. Only pass the
expiration field to openstacksdk when Magnum has an actual expiration
value, while preserving explicit expiration support.

Assisted-By: OpenAI Codex <noreply@openai.com>
Change-Id: Ifbd9e2975716db093f5482983092e6d3d8bb897e
Related-Bug: #2153128
Signed-off-by: ricolin <rlin@vexxhost.com>
Change-Id: I4e823dfb1ef8f56a5473288634fbf61680842410
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
New release came out, and in latest there's only 1.34.8

Change-Id: I55299ca4962c9f6502c3ddb2f904866f91632e32
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: Ic12d860bdec6bfce079d86be59758aefc6eee4d2
Signed-off-by: Winicius Silva <winiciusab12@gmail.com>
These were somehow omitted during Heat driver drop and these
have been only used by the Heat based driver(s).

Change-Id: I7f9830c8961745a8a3b3a20cdf96ac064a5fa7ca
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
When creating a Magnum Quota, a validation regarding the project_id is
perfomed, but the validator was calling an old method from the Keystone
client instead of using a SDK method.

This patch changes to use get_project() method instead and also add some
tests to cover this case.

Related-Bug: 2153128

Change-Id: Ie4ab8f6ccf8d6fbd9afeabe2403dd3885a742c16
Signed-off-by: Winicius Silva <winiciusab12@gmail.com>
Change-Id: I5d09e664c3e10f884479f1de4585c7d7fc7de191
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
@github-actions github-actions Bot requested a review from a team as a code owner June 1, 2026 08:10
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Jun 1, 2026
@priteau priteau closed this Jun 1, 2026
@priteau priteau reopened this Jun 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants