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

Add TLS config to S3 client #2652

Closed
wants to merge 2 commits into from

Conversation

LeviHarrison
Copy link
Contributor

@LeviHarrison LeviHarrison commented Aug 4, 2022

What this PR does

Adds the ability to configure the TLS config for the Thanos S3 client.

Note: Although I mostly copied the TLS config from Thanos, I omitted insecure_skip_verify because its value is overridden by the field of the same name in the parent HTTP config and is seemingly useless:

tlsConfig, err := NewTLSConfig(&config.TLSConfig)
if err != nil {
return nil, err
}
tlsConfig.InsecureSkipVerify = config.InsecureSkipVerify

Which issue(s) this PR fixes or relates to

Fixes #1981, Fixes #1796

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
@pracucci
Copy link
Collaborator

pracucci commented Oct 7, 2022

The CHANGELOG has just been cut to prepare for the next Mimir release. Please rebase main and eventually move the CHANGELOG entry added / updated in this PR to the top of the CHANGELOG document. Thanks!

@romangallego
Copy link

romangallego commented Feb 21, 2023

I think the insecure_skip_verify may not be useless as there are cases of S3 with certs errors that need to be handle with this parameter in configuration, as it is for loki. Actually --no-verify-ssl is contained on the aws cli and other tools becuase when the endopoint is on premises like an Hitachi, for example... the certs are not always valid.

@pracucci
Copy link
Collaborator

I'm going to close this PR because stale, but we can open it anytime if someone wants to pick up from here.

@pracucci pracucci closed this Feb 21, 2023
@LeviHarrison
Copy link
Contributor Author

Would be happy help to shepherd this through, was just waiting on reviewers. Or did changelog rebase need to be done before that could happen?

@zalegrala
Copy link
Contributor

I'd love to see this get in, but I also notice that we have a tls config we can pull out of dskit now. https://github.com/grafana/dskit/blob/main/crypto/tls/tls.go#L87

@reidlai
Copy link

reidlai commented Jun 6, 2023

Although source code incudes dskit, but s3.HTTPConfig has ignored Transport attribute under pkg/storage/bucket/s3/config.go

@Itaykal
Copy link
Contributor

Itaykal commented Apr 18, 2024

I'm going to close this PR because stale, but we can open it anytime if someone wants to pick up from here.

I see that the @LeviHarrison did mention they'd like to push this forward, any status on this? I'd love to see this get in.

If the statement is not relevant anymore I'll gladly help

@Itaykal
Copy link
Contributor

Itaykal commented Apr 19, 2024

@pracucci I'll gladly pick it up from here, could you please guide me through the process of continuing a stale PR? Do I edit it and add my branch instead or am I understanding things wrong?

@dimitarvdimitrov
Copy link
Contributor

@pracucci I'll gladly pick it up from here, could you please guide me through the process of continuing a stale PR? Do I edit it and add my branch instead or am I understanding things wrong?

@Itaykal because this PR was opened from Levi's fork, I think cherry-picking their changes onto a branch of yours and opening a new PR is the way to go.

@Itaykal Itaykal mentioned this pull request Apr 24, 2024
2 tasks
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.

Expose S3 client TLS configuration Additional trusted certificates for S3 endpoint
7 participants