Skip to content

Commit

Permalink
[bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collis…
Browse files Browse the repository at this point in the history
…ion (#29276)

* [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision

Increase patch version number.

Signed-off-by: Hans Strijker <[email protected]>

* [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision

This commit removes a conflicting label from the prometheusrules template.
Two labels with the key 'app.kubernetes.io/component' existed. This is not possible, and caused issues with FluxCD. This change removes the first label 'app.kubernetes.io/component=nginx' as it was overwritten with 'app.kubernetes.io/component=metrics' during manual installs.


Signed-off-by: Hans Strijker <[email protected]>

* Update CHANGELOG.md

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

---------

Signed-off-by: Hans Strijker <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Co-authored-by: Bitnami Containers <[email protected]>
  • Loading branch information
HStry and bitnami-bot authored Sep 11, 2024
1 parent 88102b4 commit c44ac28
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
8 changes: 6 additions & 2 deletions bitnami/nginx/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 18.1.11 (2024-08-23)
## 18.1.12 (2024-09-06)

* [bitnami/nginx] Release 18.1.11 ([#28993](https://github.com/bitnami/charts/pull/28993))
* [bitnami/nginx] Release 18.1.12 - bugfix prometheusrules label collision ([#29276](https://github.com/bitnami/charts/pull/29276))

## <small>18.1.11 (2024-08-23)</small>

* [bitnami/nginx] Release 18.1.11 (#28993) ([34e0c37](https://github.com/bitnami/charts/commit/34e0c3727b2b67d946bda7b7250be6bc88dfc4e3)), closes [#28993](https://github.com/bitnami/charts/issues/28993)

## <small>18.1.10 (2024-08-21)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/nginx/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ maintainers:
name: nginx
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/nginx
version: 18.1.11
version: 18.1.12
1 change: 0 additions & 1 deletion bitnami/nginx/templates/prometheusrules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ default (include "common.names.namespace" .) .Values.metrics.prometheusRule.namespace | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: nginx
app.kubernetes.io/component: metrics
{{- if .Values.metrics.prometheusRule.additionalLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.additionalLabels "context" $ ) | nindent 4 }}
Expand Down

0 comments on commit c44ac28

Please sign in to comment.