Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports (stable-5.21) #13645

Merged
merged 82 commits into from
Jun 21, 2024
Merged

Backports (stable-5.21) #13645

merged 82 commits into from
Jun 21, 2024

Conversation

tomponline
Copy link
Member

No description provided.

roosterfish and others added 9 commits June 21, 2024 11:23
@roosterfish @tomponline
api: Add explicit_trust_token extension
0e4f388 
Signed-off-by: Julian Pelizäus <[email protected]>
@stgraber @tomponline
shared/api: Add TrustToken support in CertificatesPost and ClusterPut
014e417 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit 1687b0ee25c89f9a0579eaa6d227d36a17958052)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
lxc: Add support for setting trust token explicitly
fe57971 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit 2287217e353cd05afafb9a09e70da6d372d0cc25)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
client: Allow joining a cluster with token
64006f8 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit 93d810473d2332f913fd3b56df5d73337216b416)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
lxd: Add support for setting trust token explicitly
c2ef078 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit 712070bed5081224ab8a7aa4a463094c2510cde2)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
doc/rest-api: Refresh swagger YAML
d7b167f 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit 3a98ba7f207ca715161d0a475ac34b37c757eb4e)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
tests: Add spawn_lxd_and_join_cluster_with_token func
edc6d6a 
This allows joining a cluster by explicitly specifying the cluster_token field.

Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit a47d14fdeac0d2fb4544553b7a4973e62816a68d)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
tests: Explicitly join a node by token during clustering
a65da90 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit a47d14fdeac0d2fb4544553b7a4973e62816a68d)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
tests: Add trust by explicitly using a token
d5d4a90 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit a47d14fdeac0d2fb4544553b7a4973e62816a68d)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@tomponline tomponline self-assigned this Jun 21, 2024
@github-actions github-actions bot added Documentation Documentation needs updating API Changes to the REST API 5.21 LTS labels Jun 21, 2024
@tomponline
Copy link
Member Author

@ru-fu please can you check f607306 as I had to solve a merge conflict due to the core trust password removal occurring after you landed this change, but in 5.21 we aren't removing trust password.

@tomponline tomponline requested a review from ru-fu June 21, 2024 11:07
@ru-fu
Copy link
Contributor

ru-fu commented Jun 21, 2024

@ru-fu please can you check f607306 as I had to solve a merge conflict due to the core trust password removal occurring after you landed this change, but in 5.21 we aren't removing trust password.

Thanks - the change looks good!
There is one short phrase missing, but it doesn't really add much, so it's better to leave it out to stay consistent between versions.

stgraber and others added 2 commits June 21, 2024 13:37
@stgraber @tomponline
shared/api: Remove core.trust_password from examples
9275f6e 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit de3006a3f0a88f97af9b7c8a54aadd67dc5c2a6f)
Signed-off-by: Julian Pelizäus <[email protected]>
License: Apache-2.0
@roosterfish @tomponline
shared/api: Mark ClusterPassword and Password as deprecated
5e4dbe5 
Signed-off-by: Julian Pelizäus <[email protected]>
@tomponline tomponline force-pushed the stable-5.21 branch 4 times, most recently from 166a2ab to 20c046e Compare June 21, 2024 12:49
@roosterfish @tomponline
test/suites/auth: Use server config keys that contain actual passwords
7f9e6b1 
Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd/patches: Add patchPreLoadClusterConfig patch stage
185273b 
This new stage allows removing cluster configuration options before they are getting
loaded for the first time.

Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd: Run the patchPreLoadClusterConfig patch stage on init
c2aba95 
Signed-off-by: Julian Pelizäus <[email protected]>
roosterfish and others added 25 commits June 21, 2024 13:58
@roosterfish @tomponline
lxd/stroage/drivers/btrfs: Fix typo in comment
2256947 
Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd/storage/drivers: Add waitGone utility func
fb71018 
This function waits until the given path doesn't exist anymore.

Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd/storage/drivers/powerflex: Wait for volume to disappear after unm…
9a6ea54 
…ount

This is critical as LXD might already try to mount the volume if two actions
are executed right after another without much delay.
That might cause the volume which is about to be removed to be discovered again.

When requesting the path to a specific volume together with mapVolume set to true,
the cleanup hooks should also contain a step to unmap the volume again from the system.

Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd/storage/drivers/powerflex: Remove unnecessary NVMe/TCP disconnect
f5448be 
When deleting the storage pool on LXD, all the volumes are already unmapped from the system.
As part of those unmap operations the NVMe/TCP connection already gets disconnected if no more vols are mapped to this host.

Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish @tomponline
lxd/storage/drivers/powerflex: Lock the entire volume map process
42012b5 
This is not an issue if LXD has a single storage pool pointing to PowerFlex.

If there are multiple LXD storage pools that point to the same PowerFlex storage cluster (same NVMe/TCP connection),
this change of the lock ensures that multiple LXD storage pools can freely map/unmap volumes to this host
and disconnect/connect the NVMe/TCP connection in case there aren't any volumes mapped to the host (regardless of the storage pool).

Signed-off-by: Julian Pelizäus <[email protected]>
@MusicDin @tomponline
test: Add dir storage pool test for empty mounted filesystem
b57be11 
Signed-off-by: Din Music <[email protected]>
@simondeziel @tomponline
doc: readthedocs now supports Go 1.22
00ae7c6 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
doc: use Python 3.12 on readthedocs
46ed0fe 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
Makefile: bump Go min to 1.22.4 (needed by OpenFGA)
383adbe 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
github: bump Go min version to 1.22.4
3a142c1 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
lxd/apparmor/network_forkdns: forkdns binds port 1053 (no need for CA…
3b6ae71 
…P_NET_BIND_SERVICE)

Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
lxd/apparmor/network_forkdns: forkdns talks to dnsmasq which also lis…
a0084d7 
…tens on TCP/53

Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
test/suites/clustering: improve grep patterns to be safer
5bb4076 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
test/suites/clustering: make better use of alternations in grep pattern
059b671 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
Revert "test/lint: Disable licence check."
abea0ad 
This reverts commit f8180de.

It's possible now that we require Go 1.22+. Fixes canonical#13048

Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
github: pull GOMIN from Makefile
cb490f4 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
github: always check compat with GOMIN
6eb00c3 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
github: make sure doc requirement for Go version stays in sync
1b88b11 
Signed-off-by: Simon Deziel <[email protected]>
@simondeziel @tomponline
doc/requirements: bump min Go version to 1.22.4
87e75cf 
Signed-off-by: Simon Deziel <[email protected]>
@ru-fu @tomponline
doc/projects: Add API instructions
46f4d19 
Add API instructions for working with projects.

Signed-off-by: Ruth Fuchss <[email protected]>
@tomponline
doc/rest-api: Refresh swagger YAML
5d66554 
Signed-off-by: Thomas Parrott <[email protected]>
@tomponline
i18n: Update translation templates
54c9762 
Signed-off-by: Thomas Parrott <[email protected]>
@tomponline
gomod: Update deps
5fde536 
Signed-off-by: Thomas Parrott <[email protected]>
@tomponline
test/suites/tls_restrictions.sh: Bring into sync with main
2839e4a 
Signed-off-by: Thomas Parrott <[email protected]>
@tomponline
client/lxd/cluster: Fix linter issues
206bda6 
Signed-off-by: Thomas Parrott <[email protected]>
@tomponline tomponline marked this pull request as ready for review June 21, 2024 13:27
@tomponline tomponline requested a review from roosterfish June 21, 2024 13:27
roosterfish
roosterfish approved these changes Jun 21, 2024
View reviewed changes
Copy link
Contributor

@roosterfish roosterfish left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@tomponline tomponline merged commit e5101ce into canonical:stable-5.21 Jun 21, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roosterfish roosterfish roosterfish approved these changes

@ru-fu ru-fu Awaiting requested review from ru-fu

Assignees

@tomponline tomponline

Labels
5.21 LTS API Changes to the REST API Documentation Documentation needs updating
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@tomponline @ru-fu @roosterfish @stgraber @markylaing @MusicDin @simondeziel @hamistao