Merge pull request #186 from fgeck/fork-main

dirsigler · Jan 5, 2025 · d71fa8b · d71fa8b
2 parents 6a44773 + 96d5c06
commit d71fa8b
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 3 deletions.
diff --git a/charts/uptime-kuma/Chart.yaml b/charts/uptime-kuma/Chart.yaml
@@ -11,4 +11,4 @@ name: uptime-kuma
 sources:
   - https://github.com/louislam/uptime-kuma
 type: application
-version: 2.21.1
+version: 2.21.2
diff --git a/charts/uptime-kuma/README.md b/charts/uptime-kuma/README.md
@@ -47,6 +47,7 @@ A self-hosted Monitoring tool like "Uptime-Robot".
 | livenessProbe.successThreshold | int | `1` |  |
 | livenessProbe.timeoutSeconds | int | `2` |  |
 | nameOverride | string | `""` |  |
+| namespaceOverride | string | `""` | A custom namespace to override the default namespace for the deployed resources. |
 | networkPolicy | object | `{"allowExternal":true,"egress":true,"enabled":false,"ingress":true,"namespaceSelector":{}}` | Create a NetworkPolicy |
 | networkPolicy.allowExternal | bool | `true` | Allow incoming connections only from specific Pods When set to true, the geoserver will accept connections from any source. When false, only Pods with the label {{ include "geoserver.fullname" . }}-client=true will have network access |
 | networkPolicy.egress | bool | `true` | Enable/disable Egress policy type |

diff --git a/charts/uptime-kuma/templates/_helpers.tpl b/charts/uptime-kuma/templates/_helpers.tpl
@@ -74,3 +74,14 @@ Set automountServiceAccountToken when service account is created
 {{- define "uptime-kuma.automountServiceAccountToken" -}}
 {{- default .Values.serviceAccount.create }}
 {{- end }}
+
+{{/*
+Determine the namespace to use, allowing for a namespace override.
+*/}}
+{{- define "uptime-kuma.namespace" -}}
+  {{- if .Values.namespaceOverride }}
+    {{- .Values.namespaceOverride }}
+  {{- else }}
+    {{- .Release.Namespace }}
+  {{- end }}
+{{- end }}
diff --git a/charts/uptime-kuma/templates/deployment.yaml b/charts/uptime-kuma/templates/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
 spec:

diff --git a/charts/uptime-kuma/templates/ingress.yaml b/charts/uptime-kuma/templates/ingress.yaml
@@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
     {{- if .Values.ingress.extraLabels }}

diff --git a/charts/uptime-kuma/templates/pvc.yaml b/charts/uptime-kuma/templates/pvc.yaml
@@ -4,6 +4,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}-pvc
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
 spec:

diff --git a/charts/uptime-kuma/templates/service.yaml b/charts/uptime-kuma/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

diff --git a/charts/uptime-kuma/templates/serviceaccount.yaml b/charts/uptime-kuma/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "uptime-kuma.serviceAccountName" . }}
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

diff --git a/charts/uptime-kuma/templates/servicemonitor.auth.secret.yaml b/charts/uptime-kuma/templates/servicemonitor.auth.secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}-metrics-basic-auth
-  namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace | default (include "uptime-kuma.namespace" .) }}
 type: kubernetes.io/basic-auth
 stringData:
 {{- range $key, $value := .Values.serviceMonitor.basicAuth }}

diff --git a/charts/uptime-kuma/templates/servicemonitor.yaml b/charts/uptime-kuma/templates/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace | default (include "uptime-kuma.namespace" .) }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
     {{- with .Values.serviceMonitor.selector }}

diff --git a/charts/uptime-kuma/templates/statefulset.yaml b/charts/uptime-kuma/templates/statefulset.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "uptime-kuma.fullname" . }}
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
 spec:

diff --git a/charts/uptime-kuma/templates/tests/test-connection.yaml b/charts/uptime-kuma/templates/tests/test-connection.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ include "uptime-kuma.fullname" . }}-test-connection"
+  namespace: {{ include "uptime-kuma.namespace" . }}
   labels:
     {{- include "uptime-kuma.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/uptime-kuma/values.yaml b/charts/uptime-kuma/values.yaml
@@ -11,6 +11,8 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+# -- A custom namespace to override the default namespace for the deployed resources.
+namespaceOverride: ""
 
 # If this option is set to false a StateFulset instead of a Deployment is used
 useDeploy: true