Skip to content

Commit 447bf3a

Browse files
graindcafeDonatien26
authored andcommitted
helm: Add ability to specify the namespace for the default instance
1 parent e74030a commit 447bf3a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

deploy/charts/s3-operator/templates/default-s3instance.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{{- if .Values.s3.default.enabled -}}
2+
{{- if .Values.s3.default.createNamespace }}
23
---
34
apiVersion: v1
45
kind: Namespace
56
metadata:
6-
name: s3-operator
7+
name: {{ .Values.s3.default.namespace }}
8+
{{- end }}
79
---
810
apiVersion: s3.onyxia.sh/v1alpha1
911
kind: S3Instance
@@ -15,7 +17,7 @@ metadata:
1517
control-plane: controller-manager
1618
{{- include "s3-operator.labels" . | nindent 4 }}
1719
name: default
18-
namespace: s3-operator
20+
namespace: {{ .Values.s3.default.namespace }}
1921
spec:
2022
s3Provider: {{ .Values.s3.default.s3Provider }}
2123
url: {{ .Values.s3.default.url }}
@@ -53,6 +55,7 @@ metadata:
5355
control-plane: controller-manager
5456
{{- include "s3-operator.labels" . | nindent 4 }}
5557
name: default-s3instance-credentials
58+
namespace: {{ .Values.s3.default.namespace }}
5659
type: Opaque
5760
stringData:
5861
S3_ACCESS_KEY: {{ .Values.s3.default.accessKey }}
@@ -74,8 +77,9 @@ metadata:
7477
control-plane: controller-manager
7578
{{- include "s3-operator.labels" . | nindent 4 }}
7679
name: default-s3instance-certificates
80+
namespace: {{ .Values.s3.default.namespace }}
7781
type: Opaque
7882
data:
7983
ca.crt: {{ .Values.s3.default.caCertificatesBase64 }}
8084
{{- end }}
81-
{{- end -}}
85+
{{- end -}}

deploy/charts/s3-operator/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ kubernetes:
3535
s3:
3636
default:
3737
enabled: false
38+
createNamespace: true
39+
namespace: "s3-operator"
3840
s3Provider: minio
3941
url: "https://localhost:9000"
4042
accessKey: "accessKey"

0 commit comments

Comments
 (0)