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

fix(operator): Improve validation of provided S3 storage configuration #12181

Merged
merged 28 commits into from
Apr 5, 2024
Merged

fix(operator): Improve validation of provided S3 storage configuration #12181

merged 28 commits into from
Apr 5, 2024

Conversation

btaani
Copy link
Contributor

@btaani btaani commented Mar 12, 2024

What this PR does / why we need it:
This PR adds a validation step to verify that the endpoint URL is of the pattern https://s3.REGION.amazonaws.com when Amazon AWS S3 is used.

Which issue(s) this PR fixes:
Fixes LOG-5052

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@btaani btaani marked this pull request as ready for review March 12, 2024 14:03
@btaani btaani requested review from periklis, xperimental and a team as code owners March 12, 2024 14:03
@pull-request-size pull-request-size bot added size/L and removed size/M labels Mar 15, 2024
btaani and others added 10 commits March 26, 2024 09:14
@btaani
Merge branch 'main' into s3-secret-validation
d8dfb55
@btaani @xperimental
Update operator/internal/handlers/internal/storage/secrets.go
5761162 
Co-authored-by: Robert Jacob <[email protected]>
@btaani @xperimental
Update operator/internal/handlers/internal/storage/secrets.go
e5054e7 
Co-authored-by: Robert Jacob <[email protected]>
@btaani @xperimental
Update operator/internal/handlers/internal/storage/secrets.go
34c2ee1 
Co-authored-by: Robert Jacob <[email protected]>
@btaani @xperimental
Update operator/internal/handlers/internal/storage/secrets.go
120e0ac 
Co-authored-by: Robert Jacob <[email protected]>
@btaani @xperimental
Update operator/internal/handlers/internal/storage/secrets.go
fd25913 
Co-authored-by: Robert Jacob <[email protected]>
@btaani
address comments
c4f565e
@btaani
Merge branch 'main' into s3-secret-validation
b162ed1
@btaani
Merge branch 'main' into s3-secret-validation
85736b2
@btaani
Merge branch 'main' into s3-secret-validation
96f3abf
JoaoBraveCoding
JoaoBraveCoding reviewed Apr 2, 2024
View reviewed changes
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

Only one comment to be resolved. Appart from that lgtm

operator/internal/handlers/internal/storage/secrets.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/M and removed size/L labels Apr 2, 2024
@pull-request-size pull-request-size bot added size/L and removed size/M labels Apr 4, 2024
@xperimental xperimental merged commit f9350d6 into grafana:main Apr 5, 2024
16 of 17 checks passed
@grafanabot grafanabot mentioned this pull request Apr 12, 2024
Merged
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@btaani @xperimental
@JoaoBraveCoding @rhnasc
fix(operator): Improve validation of provided S3 storage configuration (
849e9e7 
grafana#12181)

Co-authored-by: Robert Jacob <[email protected]>
Co-authored-by: Joao Marcal <[email protected]>
@periklis periklis mentioned this pull request Apr 17, 2024
Closed
@btaani btaani mentioned this pull request Apr 18, 2024
Closed
7 tasks
@grafanabot grafanabot mentioned this pull request Jun 3, 2024
Merged
@loki-gh-app loki-gh-app bot mentioned this pull request Oct 18, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@xperimental xperimental xperimental approved these changes

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

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

Successfully merging this pull request may close these issues.
3 participants
@btaani @xperimental @JoaoBraveCoding