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

chore: helm thanos support #16110

Merged
merged 23 commits into from
Feb 6, 2025
Merged

chore: helm thanos support #16110

merged 23 commits into from
Feb 6, 2025

Conversation

fcjack
Copy link
Contributor

@fcjack fcjack commented Feb 5, 2025

What this PR does / why we need it:

We are adding the support to thanos storage config inside our helm chart.
Together with this we are doing some refactor in our helpers to make our chart more reusable in some components and avoid code duplication.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • 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

@fcjack fcjack self-assigned this Feb 5, 2025

This comment has been minimized.

@pull-request-size pull-request-size bot added size/XL and removed size/L labels Feb 5, 2025

This comment has been minimized.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 5, 2025
Copy link
Contributor

github-actions bot commented Feb 5, 2025

💻 Deploy preview deleted.

This comment has been minimized.

@pull-request-size pull-request-size bot added size/L and removed size/XL labels Feb 6, 2025

This comment has been minimized.

This comment has been minimized.

@fcjack fcjack force-pushed the helm-thanos-support branch from 0c4a6ef to b6c5b6c Compare February 6, 2025 11:19
@fcjack fcjack marked this pull request as ready for review February 6, 2025 11:28
@fcjack fcjack requested a review from a team as a code owner February 6, 2025 11:28

This comment has been minimized.

Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

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

lgtm. left a couple of nits

production/helm/loki/values.yaml Outdated Show resolved Hide resolved
production/helm/loki/templates/_helpers.tpl Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Feb 6, 2025

Helm Diff Output - Summary

Single Binary Scenario
Default Values Scenario
Ingress Values Scenario
Legacy Monitoring Scenario
Simple Scalable AWS Kube IRSA Scenario
Simple Thanos Scenario
520d519
<         prefix: null
522,531c521
<           access_key_id: thanos-minio
<           bucket_name: admin_thanos
<           endpoint: http://minio.minio.svc.cluster.local:9000
<           http:
<             tls_config:
<               insecure_skip_verify: true
<           insecure: true
<           region: us-east-1
<           secret_access_key: thanos-minio123
<           sse: {}
---
>           bucket_name: admin
564,576c554,560
<         object_store:
<           prefix: null
<           s3:
<             access_key_id: thanos-minio
<             bucket_name: chunks_thanos
<             endpoint: http://minio.minio.svc.cluster.local:9000
<             http:
<               tls_config:
<                 insecure_skip_verify: true
<             insecure: true
<             region: us-east-1
<             secret_access_key: thanos-minio123
<             sse: {}
---
>         s3:
>           access_key_id: root-user
>           bucketnames: chunks
>           endpoint: loki-release-minio.default.svc:9000
>           insecure: true
>           s3forcepathstyle: true
>           secret_access_key: supersecretpassword
620,633d603
<     ruler_storage:
<       backend: s3
<       prefix: null
<       s3:
<         access_key_id: thanos-minio
<         bucket_name: ruler_thanos
<         endpoint: http://minio.minio.svc.cluster.local:9000
<         http:
<           tls_config:
<             insecure_skip_verify: true
<         insecure: true
<         region: us-east-1
<         secret_access_key: thanos-minio123
<         sse: {}
1271c1241
<         checksum/config: 1c596ed8933ceee9bd7c5e30b7b4b6b7c8060ceb4c345db76938b297f96a59e4
---
>         checksum/config: 0afeeec017d60fd5bb2d0c8900214e5cdaa121f2c08993d250c03f0821c0d22e
1377c1347
<         checksum/config: 1c596ed8933ceee9bd7c5e30b7b4b6b7c8060ceb4c345db76938b297f96a59e4
---
>         checksum/config: 0afeeec017d60fd5bb2d0c8900214e5cdaa121f2c08993d250c03f0821c0d22e
1481c1451
<         checksum/config: 1c596ed8933ceee9bd7c5e30b7b4b6b7c8060ceb4c345db76938b297f96a59e4
---
>         checksum/config: 0afeeec017d60fd5bb2d0c8900214e5cdaa121f2c08993d250c03f0821c0d22e
1697c1667
<         checksum/config: 1c596ed8933ceee9bd7c5e30b7b4b6b7c8060ceb4c345db76938b297f96a59e4
---
>         checksum/config: 0afeeec017d60fd5bb2d0c8900214e5cdaa121f2c08993d250c03f0821c0d22e
2054c2024
<         checksum/config: 1c596ed8933ceee9bd7c5e30b7b4b6b7c8060ceb4c345db76938b297f96a59e4
---
>         checksum/config: 0afeeec017d60fd5bb2d0c8900214e5cdaa121f2c08993d250c03f0821c0d22e

@ashwanthgoli ashwanthgoli merged commit 5ea628c into main Feb 6, 2025
70 checks passed
@ashwanthgoli ashwanthgoli deleted the helm-thanos-support branch February 6, 2025 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants