Remove ContainerBridgeName bootstrap configuration #13414
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
retrieve agent config for bridges, because it is never set.
This should never be encountered, because way upstream we ensure that the input interfaces are never empty.
This is always set during finishNetworkConfig, which precedes the call to this method in all cases.
It is not used anywhere downstream and is therefore removed from container.NetworkConfig.
manadart
force-pushed
the
2.9-remove-container-bridge-name
branch
from
c224d8e
to
964b085
Compare
now-removed container network config fall-backs.
container network config.
hmlanigan
reviewed
Oct 13, 2021
manadart
force-pushed
the
2.9-remove-container-bridge-name
branch
from
964b085
to
1188dde
Compare
We should never be in the fallback case based on bridge policy logic.
|
Tested on lxd, aws and openstack, but not Maas |
hmlanigan
approved these changes
Oct 14, 2021
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Oct 15, 2021
#13421 Merge 2.9 #13406 Take into account manual machine arches when validating constraints #13409 Fix podspec deployment/statefulset/daemonset upgrade. #13410 update-k8s also updates any controller proxy #13411 Acceptance tests - move away from unsupported series #13402 grab bag of metrics updates #13414 Remove ContainerBridgeName bootstrap configuration #13415 Introduce assumes expression sat checker #13420 Sync tools help msg #13413 Worker v3 fixes The restorewatcher files in conflict have been deleted from develop branch. ``` # Conflicts: # apiserver/params/charms.go # caas/kubernetes/provider/bootstrap_test.go # charmhub/refresh.go # go.mod # go.sum # state/open.go # worker/restorewatcher/manifold.go # worker/restorewatcher/manifold_test.go # worker/restorewatcher/worker.go # worker/restorewatcher/worker_test.go ``` ## QA steps See PRs
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.
Once upon a time we pro-actively set up a
juju-br0, and allowed the user to change the default name via the bootstrap configuration articleContainerBridgeName.It is long since Juju worked in this way, but we have retained a bunch of unnecessary logic around it.
Here we do the following:
ControllerBridgeNameconfiguration item.This is all safe, because the bridge policy logic throws errors on all paths where we fail to determine the correct device to use, or to generate a NIC configuration to pass into container creation logic - we never use the fall-back logic path.
QA steps
Documentation changes
None.
Bug reference
N/A