Merge branch 'main' into collabora

Author: butonic

README.md

@@ -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 }}{{ .Values.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)

charts/opencloud/README.md

@@ -146,16 +146,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" -}}
-{{- if .Values.namespace -}}
-{{- .Values.namespace -}}
-{{- else -}}
-{{- .Release.Namespace -}}
-{{- end -}}
-{{- end }}
+{{/* namespace helper removed - use .Release.Namespace directly */}}
 
 {{/*
 Return the appropriate apiVersion for ingress

charts/opencloud/templates/NOTES.txt

@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencloud.fullname" . }}-collabora
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: collabora

charts/opencloud/templates/_helpers/tpl.yaml

@@ -3,7 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "opencloud.fullname" . }}-collabora
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     {{- toYaml .Values.ingress.annotations | nindent 4 }}
 spec:

charts/opencloud/templates/collabora/deployment.yaml

@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "opencloud.fullname" . }}-collabora
-  namespace: {{ include "opencloud.namespace" . }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
     app.kubernetes.io/component: collabora

charts/opencloud/templates/collabora/ingress.yaml

@@ -6,7 +6,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
@@ -66,7 +65,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"
             {{- if .Values.onlyoffice.enabled }}
             - name: COLLABORATION_WOPI_SRC
               # onlyoffice has to connect to the wopi server from the web

charts/opencloud/templates/collabora/service.yaml

@@ -3,7 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "opencloud.fullname" . }}-collaboration
-  namespace: {{ include "opencloud.namespace" . }}
   annotations:
     {{- toYaml .Values.ingress.annotations | nindent 4 }}
 spec:

charts/opencloud/templates/collaboration/deployment.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