Merge branch 'main' into renovate/grafana-11.x

Author: hervenicol

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.32.1] - 2026-03-02
+
+### Fixed
+
+- Fix Private endpoint conditions to not render when the installation is public
+
+## [2.32.0] - 2026-03-02
+
 ### Added
 
 - Add Crossplane Azure (CAPZ) support for automated Azure Storage Account and Blob Container provisioning for CNPG backups.
@@ -518,7 +526,9 @@ Added:
 - images retagged for Giant Swarm registries
 - simple functionality test to get login web page
 
-[Unreleased]: https://github.com/giantswarm/grafana-app/compare/v2.31.0...HEAD
+[Unreleased]: https://github.com/giantswarm/grafana-app/compare/v2.32.1...HEAD
+[2.32.1]: https://github.com/giantswarm/grafana-app/compare/v2.32.0...v2.32.1
+[2.32.0]: https://github.com/giantswarm/grafana-app/compare/v2.31.0...v2.32.0
 [2.31.0]: https://github.com/giantswarm/grafana-app/compare/v2.30.0...v2.31.0
 [2.30.0]: https://github.com/giantswarm/grafana-app/compare/v2.29.1...v2.30.0
 [2.29.1]: https://github.com/giantswarm/grafana-app/compare/v2.29.0...v2.29.1

helm/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 2.31.0
+version: 2.32.1
 appVersion: 12.4.0
 kubeVersion: "^1.25.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

helm/grafana/templates/cnpg/crossplane/azure/private-endpoint.yaml

@@ -1,4 +1,4 @@
-{{- if and (include "grafana.crossplane.enabled" .) (include "grafana.crossplane.isAzure" .) .Values.postgresqlCluster.crossplane.azure.enabled -}}
+{{- if and (include "grafana.crossplane.enabled" .) (include "grafana.crossplane.isAzure" .) .Values.postgresqlCluster.crossplane.azure.enabled .Values.postgresqlCluster.crossplane.private -}}
 {{- $tags := include "grafana.crossplane.tags" . | fromYaml -}}
 {{- $clusterName := .Values.postgresqlCluster.crossplane.clusterName -}}
 {{- $resourceGroup := .Values.postgresqlCluster.crossplane.azure.resourceGroup -}}