Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit b6fa26d

Browse files
committed
Add ability to configure a external s3 instance directly
1 parent 1b4fbe2 commit b6fa26d

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

operator/templates/manager/manager.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ spec:
2929
name: manager
3030
env:
3131
# TODO: integrate with cert manager and auto gen a cert for minio
32+
{{- if .Values.minio.enabled }}
3233
- name: S3_USE_SSL
3334
value: 'false'
3435
- name: S3_ENDPOINT
@@ -47,6 +48,27 @@ spec:
4748
key: secretkey
4849
- name: S3_BUCKET
4950
value: {{ .Values.minio.defaultBucket.name }}
51+
{{- else }}
52+
- name: S3_USE_SSL
53+
# Always use tls when connecting to outside the cluster.
54+
value: "true"
55+
- name: S3_ENDPOINT
56+
value: {{ .Values.s3.endpoint | quote }}
57+
- name: S3_BUCKET
58+
value: {{ .Values.s3.bucket }}
59+
- name: S3_PORT
60+
value: '443'
61+
- name: S3_ACCESS_KEY
62+
valueFrom:
63+
secretKeyRef:
64+
name: {{ .Values.s3.keySecret }}
65+
key: accesskey
66+
- name: S3_SECRET_KEY
67+
valueFrom:
68+
secretKeyRef:
69+
name: {{ .Values.s3.keySecret }}
70+
key: secretkey
71+
{{- end }}
5072
{{- if .Values.lurcher.image.digest }}
5173
- name: LURCHER_IMAGE
5274
value: "{{ .Values.lurcher.image.registry }}/{{ .Values.lurcher.image.repository }}@{{ .Values.lurcher.image.digest }}"

operator/values.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@ lurcher:
1818
pullPolicy: IfNotPresent
1919

2020
s3:
21-
# TODO: Needs to be implemented
22-
# by default uses a locally installed minio instance.
23-
# this field can be used to directly configure s3 or a other api compatible service
2421
enabled: false
25-
endpoint: ""
26-
accessKey: ""
27-
secretKey: ""
28-
bucket: ""
22+
endpoint: "fra1.digitaloceanspaces.com"
23+
bucket: "my-bucket"
24+
# Name to a k8s secret with 'accesskey' and 'secretkey' as attributes in the same namespace as this release
25+
# Example creation via kubectl:
26+
# kubectl create secret generic my-secret --from-literal=accessKey="******" --from-literal=secretKey="******"
27+
keySecret: my-secret
2928

3029
minio:
3130
enabled: true
3231
defaultBucket:
3332
enabled: true
34-
name: "securecodebox"
33+
name: "securecodebox"

0 commit comments

Comments
 (0)