WAPI-23578 Remove configurable s3 bucket for styles

2gis · Aug 20, 2024 · f7f3e6f · f7f3e6f
1 parent c5b60ac
commit f7f3e6f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/bitnami-config.json b/bitnami-config.json
@@ -5,6 +5,8 @@
   "tags": {
     "param": "@param",
     "section": "@section",
+    "descriptionStart": "@descriptionStart",
+    "descriptionEnd": "@descriptionEnd",
     "skip": "@skip",
     "extra": "@extra"
   },

diff --git a/charts/styles-api/README.md b/charts/styles-api/README.md
@@ -126,18 +126,19 @@ Use this Helm chart to deploy API Styles service, which is a part of 2GIS's [On-
 | `postgres.username` | PostgreSQL username. **Required**                                                   | `""`   |
 | `postgres.password` | PostgreSQL password. **Required**                                                   | `""`   |
 
-### S3 like storage access settings
-
-| Name                 | Description                                                                         | Value    |
-| -------------------- | ----------------------------------------------------------------------------------- | -------- |
-| `s3.endpoint`        | S3 endpoint as `host|ip:port`. **Required**                                         | `""`     |
-| `s3.accessKey`       | S3 access key. **Required**                                                         | `""`     |
-| `s3.secretKey`       | S3 secret key. **Required**                                                         | `""`     |
-| `s3.bucket`          | S3 bucket name. **Required**                                                        | `styles` |
-| `s3.publicDomain`    | S3 public access domain. **Required**                                               | `""`     |
-| `s3.connectTimeout`  | S3 management client connection timeout. If not specified, the default value is 3s. | `3s`     |
-| `s3.requestTimeout`  | S3 management client request timeout. If not specified, the default value is 30s.   | `5s`     |
-| `s3.responseTimeout` | S3 management client response timeout. If not specified, the default value is 3s.   | `5s`     |
+### S3 like storage access settings.
+
+Requires the `styles` bucket in S3 storage.
+
+| Name                 | Description                                                                         | Value |
+| -------------------- | ----------------------------------------------------------------------------------- | ----- |
+| `s3.endpoint`        | S3 endpoint as `host|ip:port`. **Required**                                         | `""`  |
+| `s3.accessKey`       | S3 access key. **Required**                                                         | `""`  |
+| `s3.secretKey`       | S3 secret key. **Required**                                                         | `""`  |
+| `s3.publicDomain`    | S3 public access domain. **Required**                                               | `""`  |
+| `s3.connectTimeout`  | S3 management client connection timeout. If not specified, the default value is 3s. | `3s`  |
+| `s3.requestTimeout`  | S3 management client request timeout. If not specified, the default value is 30s.   | `5s`  |
+| `s3.responseTimeout` | S3 management client response timeout. If not specified, the default value is 3s.   | `5s`  |
 
 ### customCAs **Custom Certificate Authority**
 

diff --git a/charts/styles-api/templates/_helpers.tpl b/charts/styles-api/templates/_helpers.tpl
@@ -89,7 +89,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 - name: MGS_S3_ENDPOINT
   value: "{{ required "A valid .Values.s3.endpoint required" .Values.s3.endpoint }}"
 - name: MGS_S3_BUCKET
-  value: "{{ .Values.s3.bucket }}"
+  value: "styles"
 - name: MGS_S3_PUBLIC_DOMAIN
   value: "{{ .Values.s3.publicDomain }}"
 - name: MGS_S3_CONNECT_TIMEOUT

diff --git a/charts/styles-api/values.yaml b/charts/styles-api/values.yaml
@@ -212,14 +212,17 @@ postgres:
   username: ''
   password: ''
 
-# @section S3 like storage access settings
+# @section S3 like storage access settings.
 
 s3:
 
+  # @descriptionStart
+  # Requires the `styles` bucket in S3 storage.
+  # @descriptionEnd
+
   # @param s3.endpoint S3 endpoint as `host|ip:port`. **Required**
   # @param s3.accessKey S3 access key. **Required**
   # @param s3.secretKey S3 secret key. **Required**
-  # @param s3.bucket S3 bucket name. **Required**
   # @param s3.publicDomain S3 public access domain. **Required**
   # @param s3.connectTimeout S3 management client connection timeout. If not specified, the default value is 3s.
   # @param s3.requestTimeout S3 management client request timeout. If not specified, the default value is 30s.
@@ -228,7 +231,6 @@ s3:
   endpoint: ''
   accessKey: ''
   secretKey: ''
-  bucket: styles
   publicDomain: ''
   connectTimeout: 3s
   requestTimeout: 5s