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

POC: EE-2493: mtls for edge agent #234

Closed
wants to merge 23 commits into from

Conversation

SvenDowideit
Copy link
Contributor

@SvenDowideit SvenDowideit commented Feb 7, 2022

Replaced by #249

again, based on #228 and #229

and requires the matching portainer PR

Signed-off-by: Sven Dowideit <[email protected]>
Signed-off-by: Sven Dowideit <[email protected]>
…0, directly into the docker daemon

Signed-off-by: Sven Dowideit <[email protected]>
@SvenDowideit SvenDowideit force-pushed the feat/EE-2493/add-mtls-for-edge-agent branch from 96b0e2d to d577451 Compare February 10, 2022 22:20
agent.go Outdated Show resolved Hide resolved
cmd/agent/main.go Outdated Show resolved Hide resolved
manager.key.PortainerInstanceURL,
manager.key.EndpointID,
manager.agentOptions.EdgeID,
GetNewHttpClient(10, manager.agentOptions),
Copy link
Contributor

@cheloRydel cheloRydel Feb 16, 2022

Choose a reason for hiding this comment

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

maybe it's cleaner to pass the manager.agentOptions as param and call GetNewHttpClient internally

Copy link
Contributor Author

Choose a reason for hiding this comment

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

atm, there are too many things created internally, breaking both the sharing, and hiding the high number of internal members - so I've been pulling it appart and making it more obvious.
Annoyingly, what I was originally trying to acheive started to be too big a refactor, so I'm currently doing the async thing in at a PortainerClient level, so its possibly true.
Main thrust is that the actual http requests are now in the pluggable PortainerClient, and this set of 3 managers all use the same code - except for the different timeouts, they would use the same PortainerClient instance - but that's something where I don't have time to work out the consequenses of the two 10second constants vs the User tuned one.

Copy link
Contributor

Choose a reason for hiding this comment

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

yep I get that, what I had in mind was to at least pass the timeout value as a parameter and use that to call GetNewHttpClient internally, but it surely can be changed later, it's mostly a readability issue

edge/edge.go Show resolved Hide resolved
edge/edge.go Show resolved Hide resolved
@deviantony deviantony changed the base branch from develop to ce-2.13 February 18, 2022 01:15
os/options.go Outdated Show resolved Hide resolved
@deviantony deviantony marked this pull request as draft February 18, 2022 02:44
@cheloRydel
Copy link
Contributor

Replaced by #234

@cheloRydel cheloRydel closed this Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants