Revert "[JUJU-1558] Validate local bundle" #14449
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
jujubot
added a commit
that referenced
this pull request
Aug 12, 2022
#14452 Pull requests: - #14424 - #14428 - #14430 - #14431 - #14433 - #14434 - #14437 - #14439 - #14440 - #14442 - #14444 - #14445 - #14446 - #14448 - #14453 - Updated `github.com/juju/charm/v9` to v9.0.4. Conflicts: - apiserver/common/tools_test.go - cmd/juju/commands/upgradecontroller_test.go - cmd/juju/commands/upgrademodel_test.go - go.mod - go.sum - scripts/win-installer/setup.iss - snap/snapcraft.yaml - version/version.go Note: ignoring #14427 since this is due to be reverted (see #14449).
jameinel
approved these changes
Aug 16, 2022
manadart
approved these changes
Aug 16, 2022
|
/merge |
Merged
jujubot
added a commit
that referenced
this pull request
Aug 20, 2022
#14488 ``` Merge branch '2.9' into develop # Conflicts: # .github/workflows/smoke.yml # apiserver/common/tools_test.go # apiserver/facades/client/application/application_unit_test.go # apiserver/facades/client/application/mock_test.go # apiserver/facades/client/application/package_test.go # apiserver/facades/client/cloud/cloudV2_test.go # apiserver/facades/client/cloud/cloud_test.go # caas/kubernetes/provider/application/application.go # cmd/juju/commands/upgradecontroller_test.go # cmd/juju/commands/upgrademodel.go # cmd/juju/commands/upgrademodel_test.go # cmd/juju/controller/kill.go # go.mod # go.sum # scripts/win-installer/setup.iss # snap/snapcraft.yaml # tests/suites/deploy/bundles/lxd-profile-bundle.yaml # tests/suites/deploy/bundles/telegraf_bundle.yaml # tests/suites/deploy/bundles/trusted_bundle.yaml # tests/suites/deploy/deploy_charms.sh # tests/suites/network/network_health.sh # tests/suites/ovs_maas/ovs_netplan_config.sh # tests/suites/spaces_ec2/juju_bind.sh # tests/suites/spaces_ec2/upgrade_charm_with_bind.sh # tests/suites/upgrade/streams.sh # upgrades/operations.go # upgrades/upgrade_test.go # version/version.go ``` Includes PRs: - #14424 - #14428 - #14430 - #14431 - #14427 - #14433 - #14434 - #14437 - #14439 - #14440 - #14442 - #14445 - #14446 - #14444 - #14448 - #14453 - #14436 - #14459 - #14462 - #14458 - #14418 - #14419 - #14463 - #14464 - #14455 - #14449 - #14465 - #14470 - #14473 - #14476 - #14468 - #14383 - #14483
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.
Reverts #14427
This change caused a bug to be filed with the opposite issue. Bundles exist with "extra" data well known data now.
https://bugs.launchpad.net/juju/+bug/1984133
While this change is only for local bundles, there are concerns over using force flag. Though the dry-run flag could be used to get more data before using the force flag.
A new approach is being developed.