apply namespace fix for alert

fix secret name
fix name generation
2025-12-20 18:40:22 -06:00 · 2025-12-17 19:04:37 -06:00 · 2025-12-17 18:12:07 -06:00 · 2025-12-17 17:57:09 -06:00
8 changed files with 14 additions and 10 deletions
--- a/charts/cloudflared/Chart.yaml
+++ b/charts/cloudflared/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.1.1
+version: 2.1.4
 description: Cloudflared Tunnel
 keywords:
  - cloudflare
--- a/charts/cloudflared/README.md
+++ b/charts/cloudflared/README.md
@@ -1,6 +1,6 @@
 # cloudflared

-![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
+![Version: 2.1.4](https://img.shields.io/badge/Version-2.1.4-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)

 Cloudflared Tunnel

@@ -26,7 +26,7 @@ Cloudflared Tunnel
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"cloudflare/cloudflared","tag":"2025.11.1"}` | Default image |
-| name | string | `"rgw"` | Name override of release |
+| name | string | `""` | Name override of release |
 | resources | object | `{"requests":{"cpu":"10m","memory":"128Mi"}}` | Default resources |
 | secret | object | `{"existingSecret":{"key":"cf-tunnel-token","name":"cloudflared-secret"},"externalSecret":{"additionalLabels":{},"enabled":true,"nameOverride":"","store":{"name":"vault","path":"/cloudflare/tunnels","property":"token"}}}` | Secret configuration |
 | secret.existingSecret | object | `{"key":"cf-tunnel-token","name":"cloudflared-secret"}` | Name of existing secret that contains Cloudflare token |
--- a/charts/cloudflared/templates/_helpers.tpl
+++ b/charts/cloudflared/templates/_helpers.tpl
@@ -17,7 +17,7 @@ Generate the secret name
    {{- if .Values.secret.externalSecret.nameOverride }}
      {{- .Values.secret.externalSecret.nameOverride | trunc 63 | trimSuffix "-" }}
    {{- else }}
-      {{- printf "%s-secret" (include "cloudflared.name" .) -}}
+      {{- printf "%s-%s-secret" .Release.Name (include "cloudflared.name" .) -}}
    {{- end }}
  {{- else if .Values.secret.existingSecret.name }}
    {{- printf "%s" .Values.secret.existingSecret.name -}}
@@ -44,7 +44,11 @@ Generate path in the secret store
 */}}
 {{- define "secret.path" -}}
  {{- if and (.Values.secret.externalSecret.enabled) (.Values.secret.externalSecret.store.path) }}
-    {{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
+    {{- if .Values.name }}
+      {{- printf "%s/%s-%s" .Values.secret.externalSecret.store.path .Release.Name .Values.name -}}
+    {{- else }}
+      {{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
+    {{- end }}
  {{- else }}
    {{ fail "No Secret Store Path Found!" }}
  {{- end }}
--- a/charts/cloudflared/templates/external-secret.yaml
+++ b/charts/cloudflared/templates/external-secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: {{ .Release.Name }}-{{ include "secret.name" . }}
+  name: {{ include "secret.name" . }}
  namespace: {{ .Release.Namespace }}
  labels:
    {{- include "secret.labels" . | nindent 4 }}
--- a/charts/cloudflared/values.yaml
+++ b/charts/cloudflared/values.yaml
@@ -1,5 +1,5 @@
 # -- Name override of release
-name: "rgw"
+name: ""

 # -- Secret configuration
 secret:
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 7.1.3
+version: 7.1.4
 description: Cloudnative-pg Cluster
 keywords:
  - database
--- a/charts/postgres-cluster/README.md
+++ b/charts/postgres-cluster/README.md
@@ -1,6 +1,6 @@
 # postgres-cluster

-![Version: 7.1.3](https://img.shields.io/badge/Version-7.1.3-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)
+![Version: 7.1.4](https://img.shields.io/badge/Version-7.1.4-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)

 Cloudnative-pg Cluster

--- a/charts/postgres-cluster/prometheus_rules/cluster-pg_replication-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-pg_replication-warning.yaml
@@ -6,7 +6,7 @@ annotations:
  description: |-
    Standby is lagging behind by over 300 seconds (5 minutes)
 expr: |
-  cnpg_pg_replication_lag > 300
+  cnpg_pg_replication_lag{namespace="{{ .namespace }}"} > 300
 for: 1m
 labels:
  severity: warning
Author	SHA1	Message	Date
Alex Lebens	9a83d9bc59	apply namespace fix for alert All checks were successful lint-and-test / lint-helm (push) Successful in 8s Details release-charts-postgres-cluster / release (push) Successful in 26s Details renovate / renovate (push) Successful in 30s Details lint-and-test / chart-testing (push) Successful in 33s Details	2025-12-20 18:40:22 -06:00
Alex Lebens	a7cec76210	fix secret name All checks were successful lint-and-test / lint-helm (push) Successful in 14s Details lint-and-test / chart-testing (push) Successful in 18s Details release-charts-cloudflared / release (push) Successful in 23s Details renovate / renovate (push) Successful in 1m0s Details	2025-12-17 19:04:37 -06:00
Alex Lebens	69b32b7563	fix name generation All checks were successful lint-and-test / lint-helm (push) Successful in 8s Details release-charts-cloudflared / release (push) Successful in 23s Details lint-and-test / chart-testing (push) Successful in 24s Details renovate / renovate (push) Successful in 31s Details	2025-12-17 18:12:07 -06:00
Alex Lebens	5da9e52dc6	fix incorrect value All checks were successful lint-and-test / lint-helm (push) Successful in 10s Details release-charts-cloudflared / release (push) Successful in 18s Details lint-and-test / chart-testing (push) Successful in 19s Details renovate / renovate (push) Successful in 43s Details	2025-12-17 17:57:09 -06:00