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 upgrade failure when leader is attached to k8s-master #44

Merged
merged 1 commit into from Oct 1, 2019

Conversation

Cynerva
Copy link
Contributor

@Cynerva Cynerva commented Sep 23, 2019

Fixes https://bugs.launchpad.net/charm-canal/+bug/1844605

I tested this with two deployments. For the first one, I did a direct deployment of the canonical-kubernetes-canal bundle from edge using a locally built canal, and ensured that the canal leader was attached to a kubernetes-worker unit. I verified that all calico services, and in particular the calico policy controller, were running.

For the second one, I tried to mimick the bug's failure conditions by deploying canonical-kubernetes-canal-484, ensuring that the canal leader was attached to a kubernetes-master unit, and then upgrading canal. I verified that all calico services upgraded correctly and that I could create new pods after the upgrade.

@sombrafam
Copy link

I also would like to do some testing on this code. Can you please hold the merge until I do so?

@Cynerva
Copy link
Contributor Author

Cynerva commented Sep 24, 2019

Waiting to merge, see discussion in charmed-kubernetes/charm-calico#47

@Cynerva
Copy link
Contributor Author

Cynerva commented Oct 1, 2019

We're not willing to wait any longer to merge this. Merging. If you do encounter any issues in testing, let us know and we'll resolve it in a future PR.

@Cynerva Cynerva merged commit e67e0c9 into master Oct 1, 2019
@Cynerva Cynerva deleted the gkk/fix-upgrade branch October 1, 2019 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants