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.

Sign up for GitHub

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

Jump to bottom

[JUJU-3842] Fixed deploy_aks clean-up stage #15657

Merged
merged 1 commit into from
May 25, 2023
Merged

[JUJU-3842] Fixed deploy_aks clean-up stage #15657

merged 1 commit into from
May 25, 2023

Conversation

anvial
Copy link
Member

@anvial anvial commented May 25, 2023 •
edited
Loading

This PR adds an explicit definition that deploy_aks used the k8s bootstrap provider. That will avoid errors on clean-up stage.

Checklist

  • Code style: imports ordered, good names, simple structure, etc
  • Comments saying why design decisions were made
  • Go unit tests, with comments saying what you're testing

QA steps

cd tests
./main.sh -v deploy_aks

@anvial anvial changed the title [JUJU-3842] WIP: Fixed deploy_aks clean-up stage [JUJU-3842] Fixed deploy_aks clean-up stage May 25, 2023
jack-w-shaw
jack-w-shaw reviewed May 25, 2023
View reviewed changes
Copy link
Member

@jack-w-shaw jack-w-shaw left a comment

Choose a reason for hiding this comment

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

I don't think this will solve the problem. Probably an improvement though

I'd add export KILL_CONTROLLER=true before destroy_controller to make destruction more reliable personally. This _may_help

jack-w-shaw
jack-w-shaw approved these changes May 25, 2023
View reviewed changes
Copy link
Member

@jack-w-shaw jack-w-shaw left a comment

Choose a reason for hiding this comment

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

LGTM

Make sure to squash the commits

@anvial anvial force-pushed the JUJU-3842-fix-deploy-aks-clean-up-stage branch from 7906711 to 7e81208 Compare May 25, 2023 13:30
@anvial
Adds BOOTSTRAP_PROVIDER=k8s before aks-controller boostraping.
682a4b0 
Fixes spaces and tabs issues.

Adds kill-controller for more relable removal.
@anvial anvial force-pushed the JUJU-3842-fix-deploy-aks-clean-up-stage branch from 7e81208 to 682a4b0 Compare May 25, 2023 13:33
@anvial
Copy link
Member Author

anvial commented May 25, 2023

/merge

@jujubot jujubot merged commit f16dd80 into juju:2.9 May 25, 2023
4 of 5 checks passed
@hpidcock hpidcock mentioned this pull request May 30, 2023
Merged
jujubot added a commit that referenced this pull request Jun 2, 2023
@jujubot
Merge pull request #15674 from hpidcock/merge-2.9-3.1-sidecar-teardown
5869687 
#15674

Forward ports:
- #15636
- #15650
- #15652
- #15653
- #15633
- #15657
- #15660
- #15661
- #15662
- #15663

Back ports:
- #15336

New changes:
- juju/description/v4 to v4.0.9

Minor conflicts across most files.
@hpidcock hpidcock mentioned this pull request Jun 2, 2023
Merged
jujubot added a commit that referenced this pull request Jun 2, 2023
@jujubot
Merge pull request #15693 from hpidcock/merge-3.1-3.2-20230602
29d7f87 
#15693

Forward ports:
- #15636
- #15650
- #15652
- #15653
- #15633
- #15657
- #15660
- #15661
- #15662
- #15663
- #15313
- #15542
- #15674

Conflicts:
- cmd/containeragent/unit/manifolds.go
- cmd/containeragent/unit/manifolds_test.go
- tests/suites/machine/machine.sh
- tests/suites/refresh/refresh.sh
@wallyworld wallyworld mentioned this pull request Jun 9, 2023
Merged
jujubot added a commit that referenced this pull request Jun 9, 2023
@jujubot
Merge pull request #15719 from wallyworld/20230609
78b635d 
#15719

Merge 3.2

No conflicts. Upgrade steps were deleted.

#15636 [from jack-w-shaw/JUJU-3822_replace_ubuntu_w…](1a2759d)
#15650 [from SimonRichardson/fix-machine-test-logs-aws](c316413)
#15652 [from barrettj12/ojson](4436840)
#15653 [from barrettj12/teardown-logs](ee886dd)
#15633 [from anvial/JUJU-3821-fix-test-deploy-aks-c…](0bb6df2)
#15657 [from anvial/JUJU-3842-fix-deploy-aks-clean-…](f16dd80)
#15660 [from hpidcock/ignore-delete-network-interface](686b6f2)
#15661 [from hpidcock/fix-data-race-getosfromseries](f639f09)
#15662 [from hpidcock/fix-relation-departing-test](68ef945)
#15663 [from hpidcock/fix-test-branch](c14bcb3)
#15313 [from tlm/teardown-2.0](243fd66)
#15542 [from masnax/project-fix](8ba03ec)
#15676 [from wallyworld/newer-clients-migrate](7c1f884)
#15672 [from hpidcock/bump-juju-description-v3.0.15](acec126)
#15683 [from hpidcock/fix-persistent-storage-test](460dd21358378e7d1204348c37a9ba26e49b5871)https://github.com/juju/juju/pull/15673 [from barrettj12/check-merge](5c253c3)
#15677 [from barrettj12/invalid-offer](3cb3f8b)
#15654 [from ycliuhw/fix/backendRefCount](4e5ae3c)
#15692 [from wallyworld/fix-secrets-cmr](a1fb0c4)
#15709 [from wallyworld/hook-secret-revison](840bc09)
#15701 [from hpidcock/fix-upgrade-podspec-sidecar](d465c93)
#15681 [from anvial/JUJU-3882-fix-test-deploy-test-…](f54c1ad)
#15573 [from jack-w-shaw/JUJU-3447_implement_ModelF…](f7082ca)
#15714 [from wallyworld/offer-consume=sameapp](6390036)

## QA steps

See PRs
@wallyworld wallyworld mentioned this pull request Jun 9, 2023
Merged
jujubot added a commit that referenced this pull request Jun 9, 2023
@jujubot
Merge pull request #15721 from wallyworld/merge-3.3-20230609
541db75 
#15721

Merge 3.3


#15636 [from jack-w-shaw/JUJU-3822_replace_ubuntu_w…](1a2759d)
#15650 [from SimonRichardson/fix-machine-test-logs-aws](c316413)
#15652 [from barrettj12/ojson](4436840)
#15653 [from barrettj12/teardown-logs](ee886dd)
#15633 [from anvial/JUJU-3821-fix-test-deploy-aks-c…](0bb6df2)
#15657 [from anvial/JUJU-3842-fix-deploy-aks-clean-…](f16dd80)
#15660 [from hpidcock/ignore-delete-network-interface](686b6f2)
#15661 [from hpidcock/fix-data-race-getosfromseries](f639f09)
#15662 [from hpidcock/fix-relation-departing-test](68ef945)
#15663 [from hpidcock/fix-test-branch](c14bcb3)
#15313 [from tlm/teardown-2.0](243fd66)
#15542 [from masnax/project-fix](8ba03ec)
#15676 [from wallyworld/newer-clients-migrate](7c1f884)
#15672 [from hpidcock/bump-juju-description-v3.0.15](acec126)
#15683 [from hpidcock/fix-persistent-storage-test](460dd21358378e7d1204348c37a9ba26e49b5871)https://github.com/juju/juju/pull/15673 [from barrettj12/check-merge](5c253c3)
#15677 [from barrettj12/invalid-offer](3cb3f8b)
#15654 [from ycliuhw/fix/backendRefCount](4e5ae3c)
#15692 [from wallyworld/fix-secrets-cmr](a1fb0c4)
#15709 [from wallyworld/hook-secret-revison](840bc09)
#15701 [from hpidcock/fix-upgrade-podspec-sidecar](d465c93)
#15681 [from anvial/JUJU-3882-fix-test-deploy-test-…](f54c1ad)
#15573 [from jack-w-shaw/JUJU-3447_implement_ModelF…](f7082ca)
#15714 [from wallyworld/offer-consume=sameapp](6390036)

Conflicts
```
# Conflicts:
# apiserver/facades/client/client/client_test.go
# featuretests/package_test.go
#
```

## QA steps

See PRs
@anvial anvial deleted the JUJU-3842-fix-deploy-aks-clean-up-stage branch June 19, 2023 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jack-w-shaw jack-w-shaw jack-w-shaw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@anvial @jack-w-shaw @jujubot