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

Add custom certificate CA support for s3 #4946

Merged
merged 4 commits into from
Dec 18, 2021
Merged

Add custom certificate CA support for s3 #4946

merged 4 commits into from
Dec 18, 2021

Conversation

clyang82
Copy link
Contributor

@clyang82 clyang82 commented Dec 13, 2021 •
edited
Loading

Signed-off-by: clyang82 chuyang@redhat.com

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

use prometheus common tls_config to connect with s3 object store so that we can pass the certificate in.

part of #4820

Verification

GiedriusS
GiedriusS previously approved these changes Dec 15, 2021
View reviewed changes
Copy link
Member

@GiedriusS GiedriusS left a comment

Choose a reason for hiding this comment

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

Some suggestions on the test but otherwise LGTM

pkg/objstore/s3/s3_test.go Outdated Show resolved Hide resolved
pkg/objstore/s3/s3_test.go Outdated Show resolved Hide resolved
@clyang82
Copy link
Contributor Author

clyang82 commented Dec 16, 2021 •
edited
Loading

@GiedriusS Thanks for your comments. I found that omitempty is forbidden for config. Do I need to copy github.com/prometheus/common/config.TLSConfig to thanos repo? any suggestions here? Thanks.

@clyang82
Add custom certificate CA support for s3
b698814 
Signed-off-by: clyang82 <chuyang@redhat.com>
@clyang82
Update CHANGELOG.md and address review comments
f00ae19 
Signed-off-by: clyang82 <chuyang@redhat.com>
@clyang82
fix storage document
b2cf577 
Signed-off-by: clyang82 <chuyang@redhat.com>
@pull-request-size pull-request-size bot added size/L and removed size/M labels Dec 17, 2021
@clyang82
define TLSConfig struct
26f0750 
Signed-off-by: clyang82 <chuyang@redhat.com>
yeya24
yeya24 approved these changes Dec 18, 2021
View reviewed changes
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the contribution.

@yeya24 yeya24 merged commit b60b286 into thanos-io:main Dec 18, 2021
@clyang82 clyang82 deleted the custom_ca branch December 20, 2021 09:50
@MarkusBauerBE MarkusBauerBE mentioned this pull request Jun 23, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yeya24 yeya24 yeya24 approved these changes

@GiedriusS GiedriusS Awaiting requested review from GiedriusS

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@clyang82 @GiedriusS @yeya24