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.

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

Pin LXD dependency to stable-5.21 #277

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Conversation

roosterfish
Copy link
Contributor

No description provided.

Signed-off-by: Julian Pelizäus <[email protected]>
(cherry picked from commit d9bb070)
Makefile Outdated Show resolved Hide resolved
tomponline
tomponline previously approved these changes Nov 6, 2024
Signed-off-by: Julian Pelizäus <[email protected]>
Signed-off-by: Julian Pelizäus <[email protected]>
This reverts commit 36dc14a.

Signed-off-by: Julian Pelizäus <[email protected]>
This reverts commit bda756d.

Signed-off-by: Julian Pelizäus <[email protected]>
@roosterfish
Copy link
Contributor Author

Mhhh looks we have to revert the changes to the Response's Render(w http.ResponseWriter) error as @stable-5.21 doesn't contain the changes from canonical/lxd#13825 which we already had in microcluster/v2.

But as it only affects the internal package it shouldn't be too much of an issue either.

@roosterfish roosterfish marked this pull request as ready for review November 6, 2024 10:26
@tomponline
Copy link
Member

Mhhh looks we have to revert the changes to the Response's Render(w http.ResponseWriter) error as @stable-5.21 doesn't contain the changes from canonical/lxd#13825 which we already had in microcluster/v2.

But as it only affects the internal package it shouldn't be too much of an issue either.

I can backport if needed, which commit do you need?

@tomponline
Copy link
Member

If its only internal, feel free to revert for now, but be warned it will make it into stable-5.21 eventually.

@tomponline tomponline merged commit beb4f0b into canonical:v2 Nov 6, 2024
5 checks passed
@roosterfish roosterfish deleted the stable_lxd branch November 6, 2024 10:44
@roosterfish
Copy link
Contributor Author

@tomponline I have quickly resolved the required chain of commits:

The first produces a conflict because canonical/lxd@7798c53 potentially already got backported.

tomponline added a commit to canonical/lxd that referenced this pull request Nov 6, 2024
This backports the necessary commits into `stable-5.21` that allow
passing the request into the response `Render` func.

See
canonical/microcluster#277 (comment)
for the origin of this request.
tomponline added a commit that referenced this pull request Nov 6, 2024
As part of #277 the
changes to `Render` (originally introduced in
#252) got reverted to
allow tracking `[email protected]` which didn't contain the necessary
changes to `Render`.

After backporting the changes to LXD's `stable-5.21` with
canonical/lxd#14409, we can restore the original
changes using the latest version of LXD in `stable-5.21`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants