Remove namespace field from metadata and helper completely

michaelstingl · michaelstingl · commit 929fefaf348c · 2025-05-06T19:26:27.000+02:00
- Remove namespace field from metadata sections of all resources - Remove opencloud.namespace helper function - Use .Release.Namespace directly only where necessary in spec sections - Follows Helm best practices as suggested by @wrenix This is a comprehensive change across all templates to simplify namespace handling.
diff --git a/charts/opencloud/templates/NOTES.txt b/charts/opencloud/templates/NOTES.txt
@@ -57,7 +57,7 @@ The following services have been deployed:
 {{- if .Values.httpRoute.enabled }}
 IMPORTANT: This chart includes HTTPRoute resources that route traffic to the OpenCloud, Keycloak, and MinIO services.
 All HTTPRoutes are configured to use the Gateway named "{{ .Values.httpRoute.gateway.name }}" in the
-{{ if .Values.httpRoute.gateway.namespace }}{{ .Values.httpRoute.gateway.namespace }}{{ else }}{{ include "opencloud.namespace" . }}{{ end }} namespace.
+{{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }} namespace.
 
 Make sure the Gateway exists and is properly configured to accept traffic for the following domains:
 - OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
diff --git a/charts/opencloud/templates/_helpers/tpl.yaml b/charts/opencloud/templates/_helpers/tpl.yaml
@@ -139,12 +139,7 @@ Create a fully qualified Tika name.
 {{- printf "%s-tika" (include "opencloud.fullname" .) | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{/*
-Return the namespace to use
-*/}}
-{{- define "opencloud.namespace" -}}
-{{- .Release.Namespace -}}
-{{- end }}
+{{/* namespace helper removed - use .Release.Namespace directly */}}
 
 {{/*
 Return the appropriate apiVersion for ingress
diff --git a/charts/opencloud/templates/collaboration/deployment.yaml b/charts/opencloud/templates/collaboration/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.fullname" . }}-collaboration
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: collaboration
@@ -55,7 +54,7 @@ spec:
             - name: MICRO_REGISTRY
               value: "nats-js-kv"
             - name: MICRO_REGISTRY_ADDRESS
-              value: "{{ include "opencloud.opencloud.fullname" . }}.{{ include "opencloud.namespace" . }}.svc.cluster.local:9233"
+              value: "{{ include "opencloud.opencloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:9233"
             - name: COLLABORATION_WOPI_SRC
               value: "https://{{ include "opencloud.wopi.domain" . }}"
             - name: COLLABORATION_APP_NAME
diff --git a/charts/opencloud/templates/collaboration/service.yaml b/charts/opencloud/templates/collaboration/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.fullname" . }}-collaboration
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: collaboration
diff --git a/charts/opencloud/templates/gateway/collaboration-httproute.yaml b/charts/opencloud/templates/gateway/collaboration-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-collaboration-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: collaboration
diff --git a/charts/opencloud/templates/gateway/https-httproute.yaml b/charts/opencloud/templates/gateway/https-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
 spec:
diff --git a/charts/opencloud/templates/gateway/keycloak-https-httproute.yaml b/charts/opencloud/templates/gateway/keycloak-https-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-keycloak-http-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak
diff --git a/charts/opencloud/templates/gateway/minio-httproute.yaml b/charts/opencloud/templates/gateway/minio-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-minio-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: minio
diff --git a/charts/opencloud/templates/gateway/onlyoffice-httproute-echo.yaml b/charts/opencloud/templates/gateway/onlyoffice-httproute-echo.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice-httproute-echo
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/gateway/onlyoffice-httproute.yaml b/charts/opencloud/templates/gateway/onlyoffice-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/gateway/onlyoffice-tlsroute.yaml b/charts/opencloud/templates/gateway/onlyoffice-tlsroute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TLSRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice-tlsroute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/gateway/reference-grant.yaml b/charts/opencloud/templates/gateway/reference-grant.yaml
@@ -10,7 +10,7 @@ spec:
   from:
     - group: gateway.networking.k8s.io
       kind: HTTPRoute
-      namespace: {{ include "opencloud.namespace" . }}
+      namespace: {{ .Release.Namespace }}
   to:
     - group: gateway.networking.k8s.io
       kind: Gateway
@@ -20,7 +20,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: ReferenceGrant
 metadata:
   name: {{ include "opencloud.fullname" . }}-cert-reference-grant
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
 spec:
diff --git a/charts/opencloud/templates/gateway/traefik-middleware.yaml b/charts/opencloud/templates/gateway/traefik-middleware.yaml
@@ -3,7 +3,6 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: add-x-forwarded-proto-https
-  namespace: {{ include "opencloud.namespace" . }}
 spec:
   headers:
     customRequestHeaders:
diff --git a/charts/opencloud/templates/gateway/wopi-https-httproute.yaml b/charts/opencloud/templates/gateway/wopi-https-httproute.yaml
@@ -3,7 +3,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-wopi-httproute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: wopi
diff --git a/charts/opencloud/templates/gateway/wopi-tlsroute.yaml b/charts/opencloud/templates/gateway/wopi-tlsroute.yaml
@@ -4,7 +4,6 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: {{ include "opencloud.fullname" . }}-wopi-tlsroute
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: wopiserver
diff --git a/charts/opencloud/templates/keycloak/deployment.yaml b/charts/opencloud/templates/keycloak/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.keycloak.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak
diff --git a/charts/opencloud/templates/keycloak/realm-configmap.yaml b/charts/opencloud/templates/keycloak/realm-configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.keycloak.fullname" . }}-realm
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak
diff --git a/charts/opencloud/templates/keycloak/script-configmap.yaml b/charts/opencloud/templates/keycloak/script-configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.keycloak.fullname" . }}-script
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak
diff --git a/charts/opencloud/templates/keycloak/service.yaml b/charts/opencloud/templates/keycloak/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.keycloak.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak
diff --git a/charts/opencloud/templates/minio/deployment.yaml b/charts/opencloud/templates/minio/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.minio.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: minio
diff --git a/charts/opencloud/templates/minio/pvc.yaml b/charts/opencloud/templates/minio/pvc.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "opencloud.minio.fullname" . }}-data
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     "helm.sh/resource-policy": "keep"
   labels:
diff --git a/charts/opencloud/templates/minio/service.yaml b/charts/opencloud/templates/minio/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.minio.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: minio
diff --git a/charts/opencloud/templates/onlyoffice/configmap.yaml b/charts/opencloud/templates/onlyoffice/configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice-config
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/onlyoffice/deployment.yaml b/charts/opencloud/templates/onlyoffice/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/onlyoffice/pvc.yaml b/charts/opencloud/templates/onlyoffice/pvc.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice-data
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     "helm.sh/resource-policy": "keep"
   labels:
diff --git a/charts/opencloud/templates/onlyoffice/service.yaml b/charts/opencloud/templates/onlyoffice/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.fullname" . }}-onlyoffice
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: onlyoffice
diff --git a/charts/opencloud/templates/opencloud/config-json-configmap.yaml b/charts/opencloud/templates/opencloud/config-json-configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}-config-json
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: opencloud
diff --git a/charts/opencloud/templates/opencloud/configmap.yaml b/charts/opencloud/templates/opencloud/configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}-config
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: opencloud
diff --git a/charts/opencloud/templates/opencloud/deployment.yaml b/charts/opencloud/templates/opencloud/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: opencloud
diff --git a/charts/opencloud/templates/opencloud/pvc.yaml b/charts/opencloud/templates/opencloud/pvc.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}-config
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     "helm.sh/resource-policy": "keep"
   labels:
@@ -27,7 +26,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}-data
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     "helm.sh/resource-policy": "keep"
   labels:
diff --git a/charts/opencloud/templates/opencloud/service.yaml b/charts/opencloud/templates/opencloud/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: opencloud
diff --git a/charts/opencloud/templates/opencloud/web-extensions-init.yaml b/charts/opencloud/templates/opencloud/web-extensions-init.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "opencloud.opencloud.fullname" . }}-web-extensions-init
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: opencloud
diff --git a/charts/opencloud/templates/postgres/deployment.yaml b/charts/opencloud/templates/postgres/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.postgres.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: postgres
diff --git a/charts/opencloud/templates/postgres/pvc.yaml b/charts/opencloud/templates/postgres/pvc.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "opencloud.postgres.fullname" . }}-data
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     "helm.sh/resource-policy": "keep"
   labels:
diff --git a/charts/opencloud/templates/postgres/service.yaml b/charts/opencloud/templates/postgres/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.postgres.fullname" . }}
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: postgres
diff --git a/charts/opencloud/templates/tika/deployment.yaml b/charts/opencloud/templates/tika/deployment.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.fullname" . }}-tika
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: tika
diff --git a/charts/opencloud/templates/tika/service.yaml b/charts/opencloud/templates/tika/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.fullname" . }}-tika
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: tika
