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

Active standby fixes #2361

Merged
merged 3 commits into from Dec 2, 2020
Merged

Conversation

shreddedbacon
Copy link
Member

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated
  • PR title is ready for changelog and subsystem label(s) applied

Lagoon-charts was updated recently to install dioscuri, this meant that two versions of dioscuri were running and competing for the task.

This PR updates the makefile so that lagoon-remote doesn't install dioscuri.

Dioscuri was also updated to do things slightly differently for when the ingress-nginx admission webhook comes into play, so this PR has references to that branches chart, once confirmed that the tests pass here amazeeio/dioscuri#11 will need to be merged and this PR updated again to use main chart instead of admissionfix

Additional changes were made to the active/standby tasks in kubernetesmisc and openshiftmisc to increase the timeout to 60s as sometimes the task could take slightly longer than the original timeout. This timeout isn't a problem when moving to use the lagoon builddeploy controllers though.

Closing issues

Put closes #XXXX in your comment to auto-close the issue that your PR fixes (if such).

Copy link
Member

@tobybellwood tobybellwood left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants