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

[bitnami/thanos] feature: allow configuring labels fir query ingress #32202

Conversation

viyullas
Copy link
Contributor

Allow setting labels for the query ingress just as annotations are allowed

Description of the change

Add the labels on the ingress template along with the common labels already present

Benefits

Now you can set labels on the query ingress if you need

Possible drawbacks

Applicable issues

  • fixes #

Additional information

Checklist

  • Chart version bumped in Chart.yaml according to semver. This is not necessary when the changes only affect README.md files.
  • Variables are documented in the values.yaml and added to the README.md using readme-generator-for-helm
  • Title of the pull request follows this pattern [bitnami/<name_of_the_chart>] Descriptive title
  • All commits signed off and in agreement of Developer Certificate of Origin (DCO)

@github-actions github-actions bot added thanos triage Triage is needed labels Feb 27, 2025
@github-actions github-actions bot requested a review from javsalgar February 27, 2025 15:36
@carrodher
Copy link
Member

Thank you for the PR! As in the other case, your fork doesn't allow @bitnami-bot to access it as a maintainer, which is required for the GitHub Actions to succeed. Could you please check this?

@drodbar
Copy link

drodbar commented Feb 28, 2025

Thanks for your quick response, @carrodher! We have now added @bitnami-bot to the project with the maintainer role. Is there something else we need to do to re-launch the github-actions involved in the PR approval?

@carrodher carrodher added verify Execute verification workflow for these changes in-progress labels Feb 28, 2025
@github-actions github-actions bot removed the triage Triage is needed label Feb 28, 2025
@github-actions github-actions bot removed the request for review from javsalgar February 28, 2025 09:15
@github-actions github-actions bot requested a review from juan131 February 28, 2025 09:15
Copy link
Contributor

@juan131 juan131 left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution! Please check my comments

Comment on lines 12 to 15
{{- if or .Values.query.ingress.labels .Values.commonLabels }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.labels .Values.commonLabels ) "context" . ) }}
labels: {{- include "common.tplvalues.render" ( dict "value" $labels "context" $) | nindent 4 }}
{{- end }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Labels should be set regardless they're .Values.query.ingress.labels OR .Values.commonLabels are set:

Suggested change
{{- if or .Values.query.ingress.labels .Values.commonLabels }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.labels .Values.commonLabels ) "context" . ) }}
labels: {{- include "common.tplvalues.render" ( dict "value" $labels "context" $) | nindent 4 }}
{{- end }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.ingress.labels .Values.commonLabels ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: query

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, you are right.
I've applied the proposed changes

@viyullas viyullas requested a review from juan131 March 3, 2025 12:23
leoarry and others added 7 commits March 3, 2025 14:00
bitnami#31607)

* [bitnami/elasticsearch] fix: 🐛 Mount emptyDir in /bitnami/elasticsearch to allow init scripts

Signed-off-by: leoarry <[email protected]>

---------

Signed-off-by: leoarry <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Carlos Rodríguez Hernández <[email protected]>
Co-authored-by: leoarry <[email protected]>
Co-authored-by: Bitnami Containers <[email protected]>
Co-authored-by: Carlos Rodríguez Hernández <[email protected]>
Signed-off-by: Angel Abella <[email protected]>
* [bitnami/concourse] Release 5.1.15 updating components versions

Signed-off-by: Bitnami Containers <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <[email protected]>

---------

Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Angel Abella <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Angel Abella <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Angel Abella <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Signed-off-by: Angel Abella <[email protected]>
@viyullas viyullas force-pushed the feature/thanos-query-ingress-allow-labels branch from 14261b4 to 1c270fd Compare March 3, 2025 13:00
Copy link
Contributor

@juan131 juan131 left a comment

Choose a reason for hiding this comment

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

Hi @viyullas

It seems your fork's branch isn't properly rebased with latest changes on main branch given now several changes affecting other charts appear

@viyullas viyullas closed this Mar 3, 2025
@github-actions github-actions bot added the solved label Mar 3, 2025
@viyullas
Copy link
Contributor Author

viyullas commented Mar 3, 2025

I've closed this PR and started again on #32240

@viyullas viyullas deleted the feature/thanos-query-ingress-allow-labels branch March 5, 2025 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
solved thanos verify Execute verification workflow for these changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants