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

Migrate VPN and rp service to Docker Compose #3882

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Migrate VPN and rp service to Docker Compose #3882

wants to merge 5 commits into from

Conversation

shubhadapaithankar
Copy link
Collaborator

@shubhadapaithankar shubhadapaithankar commented Oct 3, 2024 •
edited
Loading

Which issue this PR addresses:

Fixes : ARO-9501

What this PR does / why we need it:

This PR migrates both the VPN and RP services to Docker Compose. This migration simplifies the management of these services by containerizing them. The VPN configuration is now managed via docker-compose.yml with an associated Dockerfile.vpn, while the RP service uses Dockerfile.ci-rp and Makefile. By leveraging Docker Compose, the environment setup and service orchestration are more efficient and maintainable.

Other Important Highlights

  • Updated Azure DevOps pipeline to ensure correct variable definitions (REGISTRY, VERSION, LOCAL_ARO_RP_IMAGE, etc.).
  • Refactored template to handle Docker authentication and image tagging/pushing with the correct use of VERSION.
  • Updated Docker Compose file to consistently use pipeline variables for image names, tags, and build arguments.
  • Simplified Makefile by removing redundant variable definitions and ensuring compatibility with pipeline-defined variables.

Test plan for issue:

  • The VPN service was tested using Docker Compose.
  • Verified that the VPN connects successfully with the provided OpenVPN configuration.
  • The RP service was also tested in Docker Compose, ensuring it runs with proper health checks.
  • Health checks confirm that both the VPN and RP services are operational

Is there any documentation that needs to be updated for this PR?

N/A

How do you know this will function as expected in production?

@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from 41d8d97 to a6ded87 Compare October 3, 2024 23:55
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar shubhadapaithankar changed the title migrate VPN service to Docker Compose Migrate VPN and rp service to Docker Compose Oct 4, 2024
@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from 06a3626 to 0cd9623 Compare October 4, 2024 17:28
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch 4 times, most recently from dfe3526 to 559bbdd Compare October 4, 2024 18:11
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch 2 times, most recently from f4579b5 to d5512bb Compare October 4, 2024 19:24
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from d5512bb to f0d19df Compare October 4, 2024 19:52
SudoBrendan
SudoBrendan reviewed Oct 4, 2024
View reviewed changes
Dockerfile.vpn
@@ -0,0 +1,8 @@
# Use a Microsoft-approved image
FROM mcr.microsoft.com/azure-cli:2.61.0 AS base
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: the Azure-CLI is a python app, so this image is likely quite large with a lot of dependencies we don't need. We could probably get by with a super-slim image - maybe Mariner?

SudoBrendan
SudoBrendan reviewed Oct 4, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
SudoBrendan
SudoBrendan reviewed Oct 4, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from 33b7512 to 626c80b Compare October 4, 2024 20:52
SudoBrendan
SudoBrendan reviewed Oct 4, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from 934d94f to 3f00bcf Compare October 4, 2024 22:07
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jewzaam jewzaam Awaiting requested review from jewzaam jewzaam is a code owner

@bennerv bennerv Awaiting requested review from bennerv bennerv is a code owner

@hawkowl hawkowl Awaiting requested review from hawkowl hawkowl is a code owner

@rogbas rogbas Awaiting requested review from rogbas rogbas is a code owner

@petrkotas petrkotas Awaiting requested review from petrkotas petrkotas is a code owner

@jharrington22 jharrington22 Awaiting requested review from jharrington22 jharrington22 is a code owner

@cblecker cblecker Awaiting requested review from cblecker cblecker is a code owner

@cadenmarchese cadenmarchese Awaiting requested review from cadenmarchese cadenmarchese is a code owner

@UlrichSchlueter UlrichSchlueter Awaiting requested review from UlrichSchlueter UlrichSchlueter is a code owner

@yjst2012 yjst2012 Awaiting requested review from yjst2012 yjst2012 is a code owner

@jaitaiwan jaitaiwan Awaiting requested review from jaitaiwan jaitaiwan is a code owner

@anshulvermapatel anshulvermapatel Awaiting requested review from anshulvermapatel anshulvermapatel is a code owner

@hlipsig hlipsig Awaiting requested review from hlipsig hlipsig is a code owner

@tiguelu tiguelu Awaiting requested review from tiguelu tiguelu is a code owner

@SrinivasAtmakuri SrinivasAtmakuri Awaiting requested review from SrinivasAtmakuri SrinivasAtmakuri is a code owner

@mociarain mociarain Awaiting requested review from mociarain mociarain is a code owner

@kimorris27 kimorris27 Awaiting requested review from kimorris27 kimorris27 is a code owner

@tsatam tsatam Awaiting requested review from tsatam tsatam is a code owner

@bitoku bitoku Awaiting requested review from bitoku bitoku is a code owner

@fahlmant fahlmant Awaiting requested review from fahlmant fahlmant is a code owner

@SudoBrendan SudoBrendan Awaiting requested review from SudoBrendan SudoBrendan is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
loki ready-for-review size-small Size small
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shubhadapaithankar @SudoBrendan