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

Pin nginx-ingress-integrator charm in k8s test to avoid charm issue #16974

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

wallyworld
Copy link
Member

The nginx-ingress-integrator charm updated to rev 84, and this broke our ci because it would no longer integrate with the hello-kubecon charm. This PR pins the revision to 83 as a short term ci fix.

QA steps

run secrets_k8s ci test

@jujubot
Copy link
Collaborator

jujubot commented Feb 27, 2024

Thanks for opening a pull request! Please follow the instructions here to ensure your pull request is ready for review. Then, a maintainer will review your patch.

@hpidcock @anvial

@wallyworld
Copy link
Member Author

/merge

@jujubot jujubot merged commit 3e20d59 into juju:3.3 Feb 27, 2024
7 of 8 checks passed
@Aflynn50 Aflynn50 mentioned this pull request Mar 1, 2024
jujubot added a commit that referenced this pull request Mar 4, 2024
#17000

There were minor conflicts with version numbers in various places and the upgrade steps #16969 had to be updated to target upgrades through 3.4.1. The upgrade steps present for 3.3.1 that had made there way in here by accident were removed on the advice of @wallyworld.

 The PRs included in this merge up are:
- #16999 from Aflynn50
- #16997 from wallyworld
- #16969 from jack-w-shaw
- #16988 from tlm
- #16983 from Aflynn50
- #16973 from Aflynn50
- #16980 from juju
- #16976 from Aflynn50
- #16974 from wallyworld
- #16972 from jack-w-shaw
- #16970 from tlm
- #16959 from juju
- #16957 from jameinel
- #16932 from hpidcock
- #16945 from benhoyt
- #16943 from wallyworld
@Aflynn50 Aflynn50 mentioned this pull request Mar 8, 2024
jujubot added a commit that referenced this pull request Mar 11, 2024
#17025

Merge up 3.4 to 3.5.
The only conflicts were for the pebble version in go.mod, resolved in favor of the high version.

Commits included here:
- #17016 from hmlanigan
 - #16978 from hmlanigan 
 - #16993 from hmlanigan
 - #16992 from hmlanigan
- #17011 from benhoyt
- #17000 from Aflynn50
 - #16999 from Aflynn50
 - #16997 from wallyworld
 - #16969 from jack-w-shaw
 - Removed upgrade steps added here as they are not relevant for 3.5
 - #16988 from tlm
 - #16983 from Aflynn50
 - #16973 from Aflynn50
 - #16980 from juju
 - #16976 from Aflynn50
 - #16974 from wallyworld
 - #16972 from jack-w-shaw
 - #16970 from tlm
 - #16959 from juju
 - #16957 from jameinel
 - #16932 from hpidcock
 - #16945 from benhoyt
 - #16943 from wallyworld 
- #16981 from benhoyt
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