From 8e4f0fa5fc9e570b1a31d6d9fea5b0c880afc6fe Mon Sep 17 00:00:00 2001
From: Quentin GODRON <quentin.godron@enioka.com>
Date: Fri, 5 Sep 2025 14:26:42 +0200
Subject: [PATCH] helm: Add ability to specify the namespace for the default
 instance

---
 .../s3-operator/templates/default-s3instance.yaml      | 10 +++++++---
 deploy/charts/s3-operator/values.yaml                  |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deploy/charts/s3-operator/templates/default-s3instance.yaml b/deploy/charts/s3-operator/templates/default-s3instance.yaml
index 24fd93a..0965327 100644
--- a/deploy/charts/s3-operator/templates/default-s3instance.yaml
+++ b/deploy/charts/s3-operator/templates/default-s3instance.yaml
@@ -1,9 +1,11 @@
 {{- if .Values.s3.default.enabled -}}
+{{- if .Values.s3.default.createNamespace }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: s3-operator
+  name: {{ .Values.s3.default.namespace }}
+{{- end }}
 ---
 apiVersion: s3.onyxia.sh/v1alpha1
 kind: S3Instance
@@ -15,7 +17,7 @@ metadata:
     control-plane: controller-manager
     {{- include "s3-operator.labels" . | nindent 4 }}
   name: default
-  namespace: s3-operator
+  namespace: {{ .Values.s3.default.namespace }}
 spec:
   s3Provider: {{ .Values.s3.default.s3Provider }}
   url: {{ .Values.s3.default.url }}
@@ -53,6 +55,7 @@ metadata:
     control-plane: controller-manager
     {{- include "s3-operator.labels" . | nindent 4 }}
   name: default-s3instance-credentials
+  namespace: {{ .Values.s3.default.namespace }}
 type: Opaque
 stringData:
   S3_ACCESS_KEY: {{ .Values.s3.default.accessKey }}
@@ -74,8 +77,9 @@ metadata:
     control-plane: controller-manager
     {{- include "s3-operator.labels" . | nindent 4 }}
   name: default-s3instance-certificates
+  namespace: {{ .Values.s3.default.namespace }}
 type: Opaque
 data:
   ca.crt: {{ .Values.s3.default.caCertificatesBase64 }}
 {{- end }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/deploy/charts/s3-operator/values.yaml b/deploy/charts/s3-operator/values.yaml
index 1ae7df5..30f8f85 100644
--- a/deploy/charts/s3-operator/values.yaml
+++ b/deploy/charts/s3-operator/values.yaml
@@ -35,6 +35,8 @@ kubernetes:
 s3:
   default:
     enabled: false
+    createNamespace: true
+    namespace: "s3-operator"
     s3Provider: minio
     url: "https://localhost:9000"
     accessKey: "accessKey"