fix(upgrade): fix broken upgrade on k8s #17762
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Upgrades on k8s were broken duue to the oci image fat manifest format not being supported by Juju.
hpidcock
approved these changes
Jul 18, 2024
Yeah, full rewrite totally out of scope here :-) |
|
/merge |
Merged
Merged
jujubot
added a commit
that referenced
this pull request
Jul 18, 2024
jujubot
added a commit
that referenced
this pull request
Jul 22, 2024
#17783 Merges the following patches: - #17761 - #17768 - #17578 - #17764 - #17763 - #17762 - #17760 - #17745 - #17486 ### Conflicts - apiserver/facades/client/client/client.go - apiserver/facades/client/client/client_test.go - apiserver/facades/client/controller/controller.go - apiserver/facades/client/controller/controller_test.go - apiserver/facades/client/controller/destroy_test.go - apiserver/facades/client/controller/register.go - apiserver/facades/client/modelupgrader/upgrader_test.go - caas/kubernetes/provider/application/application_test.go - cmd/containeragent/initialize/command.go - cmd/containeragent/initialize/package_test.go - cmd/juju/metricsdebug/collectmetrics.go - cmd/juju/metricsdebug/metrics.go - cmd/juju/waitfor/waitfor.go - docker/registry/mocks/registry_mock.go - go.mod - go.sum
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upgrades on k8s were broken due to the oci image fat manifest format not being supported by Juju.
The fix is to add this format to what Juju can ingest. The manifest contains multiple architectures, so the GetArchitecture() method is changed to GetArchitectures() and the clients that call it are adapted to suit. The clients are looking for a single arch, so the check becomes does the wanted arch exist in the set.
Also, the arches were not being normalised. The registry returns ppc64le but juju uses ppc64el. We hadn't noticed since only amd64 or arm64 was in common use.
QA steps
Check bootstrap
juju bootstrap microk8s --agent-version=3.4.2 --config caas-image-repo=public.ecr.aws/jujuChange version.go to 3.4.3 and compile and push image to microk8s.
bootstrap a 3.4.3 controller
juju upgrade-controller --dry-run
juju upgrade-controller
Should pick 3.4.4
Links
https://bugs.launchpad.net/bugs/2073301
Jira card: JUJU-6391