Merge pull request #25 from regulaforensics/faceapi-release

storage.s3.endpoint -> storage.s3.endpointUrl; fix s3 secure default …
regulaforensics · Jan 4, 2024 · 08c2cb1 · 08c2cb1
2 parents ea99ab3 + 223086e
commit 08c2cb1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/charts/faceapi/Chart.yaml b/charts/faceapi/Chart.yaml
@@ -3,7 +3,7 @@
 apiVersion: v2
 name: faceapi
 home: https://faceapi.regulaforensics.com/
-version: 1.0.1
+version: 1.0.2
 appVersion: nightly
 description: Face Recognition Service. On-premise and cloud integration
 icon: https://secure.gravatar.com/avatar/71a5efd69d82e444129ad18f51224bbb.jpg

diff --git a/charts/faceapi/README.md b/charts/faceapi/README.md
@@ -141,10 +141,9 @@ The command removes all the Kubernetes components associated with the chart and
 | `storage.type`                            | Global storage type. Possible values: `fs`, `s3`, `gcs`, `az`                     | `fs`                                                      |
 | `storage.s3.accessKey`                    | S3 Access Key                                                                     | `""`                                                      |
 | `storage.s3.accessSecret`                 | S3 Secret Access Key                                                              | `""`                                                      |
-| `storage.s3.endpoint`                     | S3 endpoint                                                                       | `"https://s3.amazonaws.com"`                              |
-| `storage.s3.region`                       | S3 region                                                                         | `"eu-central-1"`                                          |
+| `storage.s3.region`                       | S3 region                                                                         | `"us-east-1"`                                             |
 | `storage.s3.secure`                       | Secure connection                                                                 | `"true"`                                                  |
-| `storage.s3.endpoint`                     | Enpoint to the S3 compatible storage                                              | `""`                                                      |
+| `storage.s3.endpointUrl`                  | Enpoint URL to the S3 compatible storage                                          | `"https://s3.amazonaws.com"`                              |
 | `storage.s3.awsCredentialsSecretName`     | Secret name containing AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY credentials        | `""`                                                      |
 | `storage.gcs.gcsKeyJsonSecretName`        | Secret name containing Google Service Account key (json file)                     | `""`                                                      |
 | `storage.az.connectionString`             | Azure Storage Account connection string                                           | `""`                                                      |

diff --git a/charts/faceapi/templates/config.tpl b/charts/faceapi/templates/config.tpl
@@ -57,9 +57,9 @@ service:
       accessKey: {{ .Values.storage.s3.accessKey }}
       accessSecret: {{ .Values.storage.s3.accessSecret }}
       {{- end }}
-      endpoint: {{ default "https://s3.amazonaws.com" .Values.storage.s3.endpoint }}
-      region: {{ default "eu-central-1" .Values.storage.s3.region }}
-      secure: {{ default "true" .Values.storage.s3.secure }}
+      region: {{ default "us-east-1" .Values.storage.s3.region | quote }}
+      secure: {{ ne .Values.storage.s3.secure false }}
+      endpointUrl: {{ default "https://s3.amazonaws.com" .Values.storage.s3.endpointUrl | quote }}
     {{- end }}
     {{- if eq .Values.storage.type "gcs" }}
     type: gcs

diff --git a/charts/faceapi/values.yaml b/charts/faceapi/values.yaml
@@ -158,9 +158,9 @@ storage:
   # s3:
   #   accessKey: <AWS_ACCESS_KEY_ID>
   #   accessSecret: <AWS_SECRET_ACCESS_KEY>
-  #   endpoint: "https://s3.amazonaws.com"
-  #   region: "eu-central-1"
+  #   region: "us-east-1"
   #   secure: true
+  #   endpointUrl: "https://s3.amazonaws.com"
   #   #  awsCredentialsSecretName overrides storage.s3.accessKey/s3.accessSecret values
   #   #  Supply the name of existing secret with AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY keys.
   #   #  You can load it to a k8s generic secret via the following command: