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

Fix regression deploying k8s charms #11427

Merged
merged 1 commit into from Apr 8, 2020

Conversation

wallyworld
Copy link
Member

Description of change

#11407 introduced a regression when looking up controller API addresses.
This PR ensures we use the controller state when needed to get the cloud service.

QA steps

bootstrap k8s controller
deploy any k8s charm (would fail previously)

Bug reference

https://bugs.launchpad.net/juju/+bug/1871496

We need to use the controller model state when getting api address info.
Copy link
Contributor

@howbazaar howbazaar left a comment

Choose a reason for hiding this comment

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

There is no need to get the state object for the controller model to get controller config.

state/address.go Show resolved Hide resolved
@wallyworld
Copy link
Member Author

$$merge$$

@wallyworld
Copy link
Member Author

@jujubot jujubot merged commit 57b8a04 into juju:2.7 Apr 8, 2020
@wallyworld wallyworld mentioned this pull request Apr 8, 2020
jujubot added a commit that referenced this pull request Apr 8, 2020
#11429

## Description of change

Merge 2.7 with these PRs:

#11415 destroy extra models created in migration CI test
#11421 fix panic migrating application with no bindings
#11424 backport k8s install hook
#11426 add 2.7.6 upgrade step to fix uniter state files
#11427 fix regression deploying k8s charms

## QA steps

run unit tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants