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

Move update servers to SRE #1847

Conversation

jemrobinson
Copy link
Member

@jemrobinson jemrobinson commented Apr 30, 2024

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).
  • You have marked this pull request as a draft and added '[WIP]' to the title if needed (if you're not yet ready to merge).

⤴️ Summary

  • Add Dockerised apt proxy server to the SRE
  • Remove update server VM from SHM
  • Remove unused networking and components from SHM

Note that the workspaces must be deployed after the apt-proxy is fully configured. To achieve this we make the workspace dependent on the apt-proxy private DNS hostname, which itself is dependent on the apt-proxy private IP address which is not available until the container reaches "Running" status.

🌂 Related issues

Closes #1837. Closes #1832.

🔬 Tests

Tested on fresh SHM and SRE deployment

@jemrobinson jemrobinson requested a review from a team as a code owner April 30, 2024 12:48
@jemrobinson jemrobinson force-pushed the 1837-move-update-servers-to-sre branch from 38e23c6 to e943b8b Compare April 30, 2024 13:46
@jemrobinson jemrobinson requested a review from a team April 30, 2024 13:48
@JimMadge
Copy link
Member

Would it be sensible to merge #1820 into this?

@jemrobinson
Copy link
Member Author

I think they're independent. Is #1820 ready to merge?

@JimMadge
Copy link
Member

I think there will be some conflicts (hopefully easy to fix 🤞). config.tags and config.context don't exist any more, for example.

@JimMadge
Copy link
Member

Is #1820 ready to merge?

It definitely breaks the code. So we could either finish the fixes in #1839 first, or merge it and continue #1839. What do you think?

@jemrobinson
Copy link
Member Author

I suggest we do the following:

@jemrobinson jemrobinson force-pushed the 1837-move-update-servers-to-sre branch from ca3356a to 2465b0f Compare May 2, 2024 11:55
Copy link
Contributor

@craddm craddm left a comment

Choose a reason for hiding this comment

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

LGTM

@jemrobinson jemrobinson merged commit d1ddea7 into alan-turing-institute:develop May 3, 2024
10 checks passed
@jemrobinson jemrobinson deleted the 1837-move-update-servers-to-sre branch May 8, 2024 09:55
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.

Move update servers from SHM to SRE Move update proxy to Docker
3 participants