Skip to content

[bitnami/prometheus] Allow tpl for ingress hostnames and allow ingress annotations to be both map object and string#33525

Merged
juan131 merged 11 commits intobitnami:mainfrom
KorenP1:ingress-annotations-types-both-object-and-string
May 12, 2025
Merged

[bitnami/prometheus] Allow tpl for ingress hostnames and allow ingress annotations to be both map object and string#33525
juan131 merged 11 commits intobitnami:mainfrom
KorenP1:ingress-annotations-types-both-object-and-string

Conversation

@KorenP1
Copy link
Contributor

@KorenP1 KorenP1 commented May 7, 2025 •
edited by carrodher
Loading

Allowing the tpl of ingress hostnames to match bitnami standards and allow the dynamic allocation of hostnames based on global configuration

Allowing the ingress annotations to be also type string. (Was only map object type)
This allows using string tpl in the annotations key.
Example values that is now allowed:

myGlobalMap:
  a: b
  c: d
  e: f
  
server:
  ingress:
    enabled: true
    annotations: '{{ .Values.myGlobalMap | toYaml }}'

KorenP1 added 6 commits May 7, 2025 17:12
@KorenP1
Update values.schema.json
ce457c1 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update Chart.yaml
c0e581c 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update ingress.yaml
c8df450 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update thanos-ingress.yaml
b45a50b 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update ingress.yaml
03ef358 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update values.schema.json
a06e0d0 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@github-actions github-actions bot added prometheus triage Triage is needed labels May 7, 2025
@github-actions github-actions bot requested a review from javsalgar May 7, 2025 14:28
@bitnami-bot
Update CHANGELOG.md
5fcc738 
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
@KorenP1
Copy link
Contributor Author

KorenP1 commented May 8, 2025 •
edited
Loading

@javsalgar @juan131

KorenP1 and others added 3 commits May 8, 2025 20:45
@KorenP1
Merge branch 'main' into ingress-annotations-types-both-object-and-st…
bdad7d7 
…ring

Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@KorenP1
Update Chart.yaml
4ef36d9 
Signed-off-by: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
@bitnami-bot
Update CHANGELOG.md
e488a5c 
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
@javsalgar javsalgar added verify Execute verification workflow for these changes in-progress labels May 9, 2025
@github-actions github-actions bot removed the triage Triage is needed label May 9, 2025
@github-actions github-actions bot removed the request for review from javsalgar May 9, 2025 05:48
@github-actions github-actions bot requested a review from juan131 May 9, 2025 05:48
@bitnami-bot
Update CHANGELOG.md
c14c985 
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
juan131
juan131 approved these changes May 12, 2025
View reviewed changes
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 improvement! LGTM

@juan131 juan131 merged commit ed61248 into bitnami:main May 12, 2025
10 checks passed
@KorenP1 KorenP1 deleted the ingress-annotations-types-both-object-and-string branch May 12, 2025 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juan131 juan131 juan131 approved these changes

Assignees

@juan131 juan131

Labels

prometheus solved verify Execute verification workflow for these changes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@KorenP1 @juan131 @javsalgar @bitnami-bot