Skip to content

Backports (v2-edge)#1132

Merged
roosterfish merged 111 commits intocanonical:v2-edgefrom
roosterfish:super_backports
Dec 12, 2025
Merged

Backports (v2-edge)#1132
roosterfish merged 111 commits intocanonical:v2-edgefrom
roosterfish:super_backports

Conversation

@roosterfish
Copy link
Contributor

@roosterfish roosterfish commented Dec 9, 2025

Backports until 1817b57 (December 12, 2025)
Skipped commits:

  • 950ae87 (respective MicroCeph docs not yet released for squid)

Open as draft until the LXD 6.6 support PR is merged so we can also include those commits.

Closes #1113.
Closes #1107.

Can only be merged after #1140.

roosterfish and others added 30 commits December 9, 2025 13:39
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit d79fa07)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 51c5d6f)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit a407612)
I am not a native speaker but as pointed out in canonical#904 (comment)
that extra word at the end of the senctence feels odd.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit d5a35cd)
In one of the last scheduled weekly test runs I have observed that in case the last commit on main
consists only of doc changes, it doesn't run the full test suite:
https://github.com/canonical/microcloud/actions/runs/16545336169
This is due to the fact that we run only the resource intensive code and system tests for changes that actually
affect this part of the code.

By making the check for except_docs dependent on the github.event_name, we can ensure that the code (and system) tests
will always run regardless whether or not the last commit on main contains only doc changes.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 86f9284)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 0c0e592)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 0faa03c)
Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>
(cherry picked from commit 0b95742)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
License: Apache-2.0
(cherry picked from commit 2ce5399)
Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>
(cherry picked from commit 4e1a11c)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
License: Apache-2.0
(cherry picked from commit e03f238)
- Return `map[string][]NetworkInterfaceInfo`
- Import IP validation from call site

Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit e4e8954)
Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>
(cherry picked from commit decd7d7)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
License: Apache-2.0
(cherry picked from commit 4418a9d)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit c249064)
- Add godoc comment
- Change from `var` to typed `string` `const`
- Only include words

Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit 5ddf6ac)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit a56c33c)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit d2ace7e)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit b479d71)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit e730783)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit 43d4606)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit 4112dda)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit e4de6ce)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit e38eae1)
Signed-off-by: Kadin Sayani <kadin.sayani@canonical.com>
(cherry picked from commit 266f172)
This is a request raised in canonical#949.

When printing the fingerprint verification info before entering the passphrase, we are telling the user to perform
an action even though this can only be done after entering the passphrase and the joiner reached out to the initator.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit de32dfc)
We usually prefix the system names with system

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 9e73e03)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit cb48165)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 137bc89)
We only highlight text that stands out.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit c5724c6)
We only require a single newline here.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 9a35dbb)
In case you decide to again remove the last part of the passphrase you cannot anymore because the
text input is blurred.

Instead only blur the text input when exiting the model.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 22d0858)
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 8008931)
…e incorrect in unicast mode

Before this caused falling back to multicast mode and returned 'Error: invalid CIDR address:' when trying to parse the lookup subnet.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit ec86582)
… multicast mode

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 94bc933)
This ensures we validate the preseed file before trying to fetch the local systems address
which might fail in case the preseed file is wrong.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 617529f)
When using the ubuntu-slim runners, we have to make sure snapd is installed before we try to download the snap.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 9c98fba)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 45b8f83)
@roosterfish roosterfish dismissed stale reviews from simondeziel and kadinsayani via effb3b6 December 12, 2025 08:12
@roosterfish
Copy link
Contributor Author

Included all the recent PRs and #1140 to ensure a green test run. Marking this PR as draft until #1140 got merged as it has to come first to not backport something which isn't yet in main.

@roosterfish roosterfish marked this pull request as draft December 12, 2025 10:03
@roosterfish roosterfish marked this pull request as ready for review December 12, 2025 15:11
This allows running an arbitrary command ten times.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit b383433)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit f76a312)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 150a55b)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 0d74b42)
As we are now running tests actively on both edge and candidate channels, we should rather not have this check
to also keep the noise on the pipeline summary page low.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 6c48cd6)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 7fd26d0)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit 4d9fbae)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit d79d4bb)
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
(cherry picked from commit a61ff55)
@roosterfish
Copy link
Contributor Author

Cherry picked the last commits from #1141, ready for a final pass.

Comment on lines +420 to +422
micro01_address="$(lxc ls -f csv | grep micro01 | cut -d',' -f3 | cut -d' ' -f1)"
micro02_address="$(lxc ls -f csv | grep micro02 | cut -d',' -f3 | cut -d' ' -f1)"
micro03_address="$(lxc ls -f csv | grep micro03 | cut -d',' -f3 | cut -d' ' -f1)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a convoluted way to extract IPs IMHO. Not something to be addressed in a backport PR so I'm just pointing it out :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have a look next week. Maybe we can assign the addresses to an array?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking of something like: micro01_address="$(lxc list -f csv -c 4 micro01 | cut -d" " -f1)"

@roosterfish roosterfish merged commit 5c0c914 into canonical:v2-edge Dec 12, 2025
29 checks passed
@roosterfish roosterfish deleted the super_backports branch December 12, 2025 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation Documentation needs updating

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants