add required field to mapgl ENV values (#504)

2gis · Sep 23, 2024 · 01e0d09 · 01e0d09
1 parent 37d1f21
commit 01e0d09
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/charts/mapgl-js-api/README.md b/charts/mapgl-js-api/README.md
@@ -58,7 +58,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about:
 | `env.MAPGL_TILES_API`           | URL of the Tiles API service, e.g. 'https://tiles-api.ingress.host'                                                       | `""`                                                                                              |
 | `env.MAPGL_TILESET`             | Tileset of the Tiles API service to use.                                                                                  | `web`                                                                                             |
 | `env.MAPGL_IMMERSIVE_TILESET`   | Additional immersive tileset of the Tiles API service to use.                                                             | `web_immersive`                                                                                   |
-| `env.MAPGL_TRAFFICSERVER`       | Domain name of the Traffic Proxy service, e.g. 'https://traffic-proxy.ingress.host'                                       | `""`                                                                                              |
+| `env.MAPGL_TRAFFICSERVER`       | Domain name of the Traffic Proxy service, e.g. 'https://traffic-proxy.ingress.host'                                       | `https://traffic-proxy.ingress.host`                                                              |
 | `env.MAPGL_FLOORSSERVER`        | URL of the Floors API service, e.g. 'https://floors-api.ingress.host'                                                     | `""`                                                                                              |
 | `env.MAPGL_STYLESERVER`         | URL of the Styles API service, e.g. 'https://styles.ingress.host'                                                         | `""`                                                                                              |
 | `env.MAPGL_ICONSPATH`           | URL of the icons directory, e.g. 'https://styles.ingress.host/styles/assets/icons'                                        | `""`                                                                                              |

diff --git a/charts/mapgl-js-api/templates/deployment.yaml b/charts/mapgl-js-api/templates/deployment.yaml
@@ -42,33 +42,33 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: PUBLIC_HOST
-              value: "{{ .Values.env.MAPGL_HOST }}"
+              value: {{ .Values.env.MAPGL_HOST | quote }}
             - name: DEMO_KEY
-              value: "{{ .Values.env.MAPGL_DEMO_KEY }}"
+              value: {{ .Values.env.MAPGL_DEMO_KEY | quote }}
             - name: MAPGL_TILESERVER
-              value: "{{ .Values.env.MAPGL_TILES_API }}"
+              value: {{ required "A valid .Values.env.MAPGL_TILES_API entry required" .Values.env.MAPGL_TILES_API | quote }}
             - name: MAPGL_TILESET
-              value: "{{ .Values.env.MAPGL_TILESET }}"
+              value: {{ .Values.env.MAPGL_TILESET | quote }}
             - name: MAPGL_MODELS_TILESET
-              value: "{{ .Values.env.MAPGL_IMMERSIVE_TILESET }}"
+              value: {{ .Values.env.MAPGL_IMMERSIVE_TILESET | quote }}
             - name: MAPGL_TRAFFICSERVER
-              value: "{{ .Values.env.MAPGL_TRAFFICSERVER }}"
+              value: {{ .Values.env.MAPGL_TRAFFICSERVER | quote }}
             - name: MAPGL_FLOORSSERVER
-              value: "{{ .Values.env.MAPGL_FLOORSSERVER }}"
+              value: {{ .Values.env.MAPGL_FLOORSSERVER | quote }}
             - name: MAPGL_STYLESERVER
-              value: "{{ .Values.env.MAPGL_STYLESERVER }}"
+              value: {{ .Values.env.MAPGL_STYLESERVER | quote }}
             - name: MAPGL_ICONSPATH
-              value: "{{ .Values.env.MAPGL_ICONSPATH }}"
+              value: {{ .Values.env.MAPGL_ICONSPATH | quote }}
             - name: MAPGL_MODELSPATH
-              value: "{{ .Values.env.MAPGL_MODELSPATH }}"
+              value: {{ .Values.env.MAPGL_MODELSPATH | quote }}
             - name: MAPGL_KEYSERVER
-              value: "{{ .Values.env.MAPGL_KEYSERVER }}"
+              value: {{ .Values.env.MAPGL_KEYSERVER | quote }}
             - name: MAPGL_RTLPLUGIN
-              value: "{{ .Values.env.MAPGL_RTLPLUGIN }}"
+              value: {{ .Values.env.MAPGL_RTLPLUGIN | quote }}
             - name: MAPGL_RTLPLUGINHASH
-              value: "{{ .Values.env.MAPGL_RTLPLUGINHASH }}"
+              value: {{ .Values.env.MAPGL_RTLPLUGINHASH | quote }}
             - name: MAPGL_INVALID_KEY_MESSAGE
-              value: "{{ .Values.env.MAPGL_INVALID_KEY_MESSAGE }}"
+              value: {{ .Values.env.MAPGL_INVALID_KEY_MESSAGE | quote }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml
@@ -65,7 +65,7 @@ env:
   MAPGL_TILES_API: ''
   MAPGL_TILESET: web
   MAPGL_IMMERSIVE_TILESET: web_immersive
-  MAPGL_TRAFFICSERVER: ''
+  MAPGL_TRAFFICSERVER: 'https://traffic-proxy.ingress.host'
   MAPGL_FLOORSSERVER: ''
   MAPGL_STYLESERVER: ''
   MAPGL_ICONSPATH: ''