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

operator: adds AWS sts support #11481

Merged
merged 22 commits into from Jan 10, 2024
Merged

operator: adds AWS sts support #11481

merged 22 commits into from Jan 10, 2024

Conversation

JoaoBraveCoding
Copy link
Contributor

@JoaoBraveCoding JoaoBraveCoding commented Dec 13, 2023

What this PR does / why we need it:

Adds support for users to configure the S3 object storage with AWS STS.

Which issue(s) this PR fixes:

Special notes for your reviewer:

To test you need:

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

Copy link
Contributor

github-actions bot commented Dec 13, 2023

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-24fa648 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-24fa648 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-24fa648 -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-24fa648 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

Copy link
Collaborator

@periklis periklis left a comment

Choose a reason for hiding this comment

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

Looks good to me. Couple of points still missing:

  • Introduce the custom serviceaccount per LokiStack. Maybe we should do this as a pre-requisite PR and consider backporting this?
  • Should we make the audience field in the service account projection volume configurable for non-OpenShift clusters?

operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
@JoaoBraveCoding
Copy link
Contributor Author

Should we make the audience field in the service account projection volume configurable for non-OpenShift clusters?

Yes 💯

In regards to the comments on separating functionality into separate smaller functions, I'm always divided by this, simply because usually it implies having in mind more functions might or not be used in a code path. I have an idea to make the switch case more digestible where we land.

@JoaoBraveCoding JoaoBraveCoding marked this pull request as ready for review December 18, 2023 12:10
operator/internal/manifests/compactor.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@periklis periklis left a comment

Choose a reason for hiding this comment

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

Minor improvements, I think we arrived at the finish line.

operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
operator/internal/manifests/storage/configure.go Outdated Show resolved Hide resolved
@periklis periklis merged commit 4421efe into grafana:main Jan 10, 2024
14 checks passed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
Adds support for users to configure the S3 object storage with AWS STS.

Co-authored-by: Periklis Tsirakidis <periklis@nefeli.eu>
Co-authored-by: Periklis Tsirakidis <periklis@redhat.com>
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.

None yet

2 participants