diff --git a/bitnami/redis/CHANGELOG.md b/bitnami/redis/CHANGELOG.md index b2da6eb663..c9db37fa15 100644 --- a/bitnami/redis/CHANGELOG.md +++ b/bitnami/redis/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 21.1.13 (2025-06-06) +## 21.2.0 (2025-06-06) -* [bitnami/redis] :zap: :arrow_up: Update dependency references ([#34214](https://github.com/bitnami/charts/pull/34214)) +* [bitnami/redis] Service Monitor support tlsConfig ([#34108](https://github.com/bitnami/charts/pull/34108)) + +## 21.1.13 (2025-06-06) + +* [bitnami/redis] :zap: :arrow_up: Update dependency references (#34214) ([691094e](https://github.com/bitnami/charts/commit/691094e50763fa6ca3697ab5425988ccad6c7166)), closes [#34214](https://github.com/bitnami/charts/issues/34214) ## 21.1.12 (2025-06-06) diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml index 64db7ef850..aee1e1b9c8 100644 --- a/bitnami/redis/Chart.yaml +++ b/bitnami/redis/Chart.yaml @@ -39,4 +39,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis -version: 21.1.13 +version: 21.2.0 diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 71f503a418..e33dd3511b 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -993,6 +993,7 @@ helm install my-release --set master.persistence.existingClaim=PVC_NAME oci://RE | `metrics.serviceMonitor.port` | the service port to scrape metrics from | `http-metrics` | | `metrics.serviceMonitor.enabled` | Create ServiceMonitor resource(s) for scraping metrics using PrometheusOperator | `false` | | `metrics.serviceMonitor.namespace` | The namespace in which the ServiceMonitor will be created | `""` | +| `metrics.serviceMonitor.tlsConfig` | TLS configuration used for scrape endpoints used by Prometheus | `{}` | | `metrics.serviceMonitor.interval` | The interval at which metrics should be scraped | `30s` | | `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | | `metrics.serviceMonitor.relabelings` | Metrics RelabelConfigs to apply to samples before scraping. | `[]` | @@ -1006,6 +1007,7 @@ helm install my-release --set master.persistence.existingClaim=PVC_NAME oci://RE | `metrics.podMonitor.port` | the pod port to scrape metrics from | `metrics` | | `metrics.podMonitor.enabled` | Create PodMonitor resource(s) for scraping metrics using PrometheusOperator | `false` | | `metrics.podMonitor.namespace` | The namespace in which the PodMonitor will be created | `""` | +| `metrics.podMonitor.tlsConfig` | TLS configuration used for scrape endpoints used by Prometheus | `{}` | | `metrics.podMonitor.interval` | The interval at which metrics should be scraped | `30s` | | `metrics.podMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | | `metrics.podMonitor.relabelings` | Metrics RelabelConfigs to apply to samples before scraping. | `[]` | @@ -1333,4 +1335,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/bitnami/redis/templates/podmonitor.yaml b/bitnami/redis/templates/podmonitor.yaml index 3598ac9596..088c104528 100644 --- a/bitnami/redis/templates/podmonitor.yaml +++ b/bitnami/redis/templates/podmonitor.yaml @@ -19,6 +19,10 @@ metadata: spec: podMetricsEndpoints: - port: {{ .Values.metrics.podMonitor.port }} + {{- if .Values.metrics.serviceMonitor.tlsConfig }} + scheme: https + tlsConfig: {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 8 }} + {{- end }} {{- if .Values.metrics.podMonitor.interval }} interval: {{ .Values.metrics.podMonitor.interval }} {{- end }} @@ -36,6 +40,10 @@ spec: {{- end }} {{- range .Values.metrics.podMonitor.additionalEndpoints }} - port: {{ .port }} + {{- if .tlsConfig }} + scheme: https + tlsConfig: {{- toYaml .tlsConfig | nindent 8 }} + {{- end }} {{- if .interval }} interval: {{ .interval }} {{- end }} diff --git a/bitnami/redis/templates/servicemonitor.yaml b/bitnami/redis/templates/servicemonitor.yaml index 1a9f6eea34..3af93470d0 100644 --- a/bitnami/redis/templates/servicemonitor.yaml +++ b/bitnami/redis/templates/servicemonitor.yaml @@ -19,6 +19,10 @@ metadata: spec: endpoints: - port: {{ .Values.metrics.serviceMonitor.port }} + {{- if .Values.metrics.serviceMonitor.tlsConfig }} + scheme: https + tlsConfig: {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 8 }} + {{- end }} {{- if .Values.metrics.serviceMonitor.interval }} interval: {{ .Values.metrics.serviceMonitor.interval }} {{- end }} @@ -36,6 +40,10 @@ spec: {{- end }} {{- range .Values.metrics.serviceMonitor.additionalEndpoints }} - port: {{ .port }} + {{- if .tlsConfig }} + scheme: https + tlsConfig: {{- toYaml .tlsConfig | nindent 8 }} + {{- end }} {{- if .interval }} interval: {{ .interval }} {{- end }} diff --git a/bitnami/redis/values.schema.json b/bitnami/redis/values.schema.json index a675192545..e5a8964a94 100644 --- a/bitnami/redis/values.schema.json +++ b/bitnami/redis/values.schema.json @@ -2866,6 +2866,11 @@ "description": "The namespace in which the ServiceMonitor will be created", "default": "" }, + "tlsConfig": { + "type": "object", + "description": "TLS configuration used for scrape endpoints used by Prometheus", + "default": {} + }, "interval": { "type": "string", "description": "The interval at which metrics should be scraped", @@ -2940,6 +2945,11 @@ "description": "The namespace in which the PodMonitor will be created", "default": "" }, + "tlsConfig": { + "type": "object", + "description": "TLS configuration used for scrape endpoints used by Prometheus", + "default": {} + }, "interval": { "type": "string", "description": "The interval at which metrics should be scraped", @@ -3294,4 +3304,4 @@ } } } -} \ No newline at end of file +} diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml index 83abe7658a..c417dd8d68 100644 --- a/bitnami/redis/values.yaml +++ b/bitnami/redis/values.yaml @@ -1576,7 +1576,7 @@ sentinel: ## @param sentinel.extraPodSpec Optionally specify extra PodSpec for the Redis(R) Sentinel pod(s) ## extraPodSpec: {} - + externalAccess: ## @param sentinel.externalAccess.enabled Enable external access to the Redis ## @@ -1592,10 +1592,10 @@ sentinel: ## @param sentinel.externalAccess.service.redisPort Port for the services used to expose redis-server ## redisPort: 6379 - + ## @param sentinel.externalAccess.service.sentinelPort Port for the services used to expose redis-sentinel - ## - sentinelPort: 26379 + ## + sentinelPort: 26379 ## @param sentinel.externalAccess.service.loadBalancerIP Array of load balancer IPs for each Redis(R) node. Length must be the same as sentinel.replicaCount ## loadBalancerIP: [] @@ -1985,6 +1985,9 @@ metrics: ## @param metrics.serviceMonitor.namespace The namespace in which the ServiceMonitor will be created ## namespace: "" + ## @param metrics.serviceMonitor.tlsConfig [object] TLS configuration used for scrape endpoints used by Prometheus + ## + tlsConfig: {} ## @param metrics.serviceMonitor.interval The interval at which metrics should be scraped ## interval: 30s @@ -2042,6 +2045,9 @@ metrics: ## @param metrics.podMonitor.namespace The namespace in which the PodMonitor will be created ## namespace: "" + ## @param metrics.podMonitor.tlsConfig [object] TLS configuration used for scrape endpoints used by Prometheus + ## + tlsConfig: {} ## @param metrics.podMonitor.interval The interval at which metrics should be scraped ## interval: 30s