updated readme and minor bug fix for external s3 endpoint

IndustryFusion · Apr 30, 2024 · 26c5b0e · 26c5b0e
1 parent cc6435d
commit 26c5b0e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/helm/README.md b/helm/README.md
@@ -206,13 +206,28 @@ s3:
    userSecretKey: <secret key>
 ```
 
-The selection of the environment files is depenend to the selected helmfile profile, if no profile is set, the `environment/default.yaml` file is used. In addition, when external S3 storage is used, Minio should be disabled in the profile:
+The selection of the environment files is depenend to the selected helmfile profile, if no profile is set, the `environment/default.yaml` file is used. In addition, when external S3 storage is used, Minio should be disabled in the profile, create the buckets in external S3 and then update the S3 bucket names in the following sections:
 
 ```
 minio:
    enabled: false
 ```
 
+```
+velero:
+  backupBucket: <External S3 bucket name for Velero>
+```
+
+```
+flink:
+  bucket: <External S3 bucket name for Flink>
+```
+
+```
+db:
+  backupBucket: <External S3 bucket name for Postgres>
+```
+
 Some Kubernetes Resources which are not easy recoverable are backed up once per day by `velero`.
 
 In case of a database corruption, the database can be recoverd from S3 with the following steps:

diff --git a/helm/environment/default.yaml b/helm/environment/default.yaml
@@ -52,6 +52,7 @@ flink:
   taskmanagers: 1
   jobmanager: 1
   defaultParalellism: 1
+  bucket: flink
 
 minio:
   enabled: true

diff --git a/helm/environment/production.yaml b/helm/environment/production.yaml
@@ -52,6 +52,7 @@ flink:
   taskmanagers: 1
   jobmanager: 1
   defaultParalellism: 1
+  bucket: flink
 
 minio:
   enabled: true

diff --git a/helm/values.yaml.gotmpl b/helm/values.yaml.gotmpl
@@ -79,7 +79,7 @@ flink:
   taskmanagers: 1
   jobmanager: 1
   sqlClientPort: 9000
-  bucket: flink
+  bucket: {{ .StateValues.flink.bucket }}
   haDir: recovery
   checkpointDir: checkpoints
   checkpointInterval: 1 min
@@ -282,7 +282,7 @@ velero:
       accessMode: ReadWrite
       config:
         region: de
-        s3Url: {{ if (hasKey $s3 "protocol") }} {{ $s3.protocol }} {{- else }} http{{- end }}://{{ if (hasKey $s3 "endpoint") }}{{ quote $s3.endpoint }}{{- else }}minio.{{ .StateValues.namespace }}.svc.cluster.local{{- end }}
+        s3Url: {{ if (hasKey $s3 "protocol") }} {{ $s3.protocol }} {{- else }} http{{- end }}://{{ if (hasKey $s3 "endpoint") }}{{ $s3.endpoint }}{{- else }}minio.{{ .StateValues.namespace }}.svc.cluster.local{{- end }}
         s3ForcePathStyle: {{- if .StateValues.minio.enabled }} true {{- else }} false {{- end }}
       defaultVolumesToRestic: true
   credentials: