From ef673b5984dea79a8f14963990752e4335a375cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9C=D0=B8=D1=85?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= Date: Mon, 2 Oct 2023 16:05:30 +0700 Subject: [PATCH 1/4] [PRO-3589] Update helm-charts for pro-ui. --- charts/pro-ui/README.md | 2 ++ charts/pro-ui/templates/_helpers.tpl | 4 ++++ charts/pro-ui/values.schema.json | 6 ++++++ charts/pro-ui/values.yaml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/charts/pro-ui/README.md b/charts/pro-ui/README.md index 9e6b9e57a..71215194b 100644 --- a/charts/pro-ui/README.md +++ b/charts/pro-ui/README.md @@ -45,6 +45,8 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On | `ui.appLocale` | Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. | `en_AE` | | `ui.appInitialMapCenter` | Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). | `[46.71, 24.72]` | | `ui.supportDocumentationLink` | Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro/start' | `""` | +| `ui.featureCarsDemoIsEnabled` | A boolean value for enabling cars demo. | `false` | +| `ui.immersiveModels` | A string value for config to enabling 3D-models. | `""` | | `ui.auth.sso` | Flag to turn on/off the authorization. Possible values: `"true"` or `"false"`. | `false` | | `ui.auth.secure` | Flag to turn on/off the https for auth. Possible values: `"true"` or `"false"`. | `true` | | `ui.auth.safeHosts` | a string with regExp, which checks incoming authCodeUrl | `.*` | diff --git a/charts/pro-ui/templates/_helpers.tpl b/charts/pro-ui/templates/_helpers.tpl index 31410c995..fd68f0e97 100644 --- a/charts/pro-ui/templates/_helpers.tpl +++ b/charts/pro-ui/templates/_helpers.tpl @@ -65,10 +65,14 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} value: "{{ .Values.ui.appLocale }}" - name: APP_THEME value: "{{ .Values.ui.appTheme }}" +- name: FEATURE_CARS_DEMO_IS_ENABLED + value: "{{ .Values.ui.featureCarsDemoIsEnabled }}" - name: APP_INITIAL_MAP_CENTER value: "{{ .Values.ui.appInitialMapCenter }}" - name: SUPPORT_DOCUMENTATION_LINK value: "{{ .Values.ui.supportDocumentationLink }}" +- name: IMMERSIVE_MODELS + value: "{{ .Values.ui.immersiveModels }}" - name: HOME value: "/tmp" {{- end }} diff --git a/charts/pro-ui/values.schema.json b/charts/pro-ui/values.schema.json index cb07ff538..296011536 100644 --- a/charts/pro-ui/values.schema.json +++ b/charts/pro-ui/values.schema.json @@ -36,12 +36,18 @@ "type": "string", "enum": ["ar_AE", "en_AE", "ru_RU"] }, + "featureCarsDemoIsEnabled": { + "type": "boolean" + }, "appInitialMapCenter": { "type": "string" }, "supportDocumentationLink": { "type": "string" }, + "immersiveModels": { + "type": "string" + }, "healthcheckPath": { "type": "string" }, diff --git a/charts/pro-ui/values.yaml b/charts/pro-ui/values.yaml index 46db36dbf..b4afc1d45 100644 --- a/charts/pro-ui/values.yaml +++ b/charts/pro-ui/values.yaml @@ -49,6 +49,8 @@ ui: # @param ui.appLocale Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. # @param ui.appInitialMapCenter Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). # @param ui.supportDocumentationLink Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro/start' + # @param ui.featureCarsDemoIsEnabled A boolean value for enabling cars demo. + # @param ui.immersiveModels A string value for config to enabling 3D-models. logLevel: error isOnPremise: true @@ -56,6 +58,8 @@ ui: appLocale: en_AE appInitialMapCenter: '[46.71, 24.72]' supportDocumentationLink: '' + featureCarsDemoIsEnabled: false + immersiveModels: '' # @param ui.auth.sso Flag to turn on/off the authorization. Possible values: `"true"` or `"false"`. # @param ui.auth.secure Flag to turn on/off the https for auth. Possible values: `"true"` or `"false"`. From 30d5cf3103c73cb5dca3403d73e77b5d5700ef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9C=D0=B8=D1=85?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= Date: Mon, 2 Oct 2023 16:23:06 +0700 Subject: [PATCH 2/4] [PRO-3589] Update helm-charts for pro-ui. --- charts/pro-ui/README.md | 1 - charts/pro-ui/templates/_helpers.tpl | 2 -- charts/pro-ui/values.schema.json | 3 --- charts/pro-ui/values.yaml | 2 -- 4 files changed, 8 deletions(-) diff --git a/charts/pro-ui/README.md b/charts/pro-ui/README.md index 71215194b..2873e2ea5 100644 --- a/charts/pro-ui/README.md +++ b/charts/pro-ui/README.md @@ -45,7 +45,6 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On | `ui.appLocale` | Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. | `en_AE` | | `ui.appInitialMapCenter` | Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). | `[46.71, 24.72]` | | `ui.supportDocumentationLink` | Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro/start' | `""` | -| `ui.featureCarsDemoIsEnabled` | A boolean value for enabling cars demo. | `false` | | `ui.immersiveModels` | A string value for config to enabling 3D-models. | `""` | | `ui.auth.sso` | Flag to turn on/off the authorization. Possible values: `"true"` or `"false"`. | `false` | | `ui.auth.secure` | Flag to turn on/off the https for auth. Possible values: `"true"` or `"false"`. | `true` | diff --git a/charts/pro-ui/templates/_helpers.tpl b/charts/pro-ui/templates/_helpers.tpl index fd68f0e97..57ac2e30d 100644 --- a/charts/pro-ui/templates/_helpers.tpl +++ b/charts/pro-ui/templates/_helpers.tpl @@ -65,8 +65,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} value: "{{ .Values.ui.appLocale }}" - name: APP_THEME value: "{{ .Values.ui.appTheme }}" -- name: FEATURE_CARS_DEMO_IS_ENABLED - value: "{{ .Values.ui.featureCarsDemoIsEnabled }}" - name: APP_INITIAL_MAP_CENTER value: "{{ .Values.ui.appInitialMapCenter }}" - name: SUPPORT_DOCUMENTATION_LINK diff --git a/charts/pro-ui/values.schema.json b/charts/pro-ui/values.schema.json index 296011536..9ef53c262 100644 --- a/charts/pro-ui/values.schema.json +++ b/charts/pro-ui/values.schema.json @@ -36,9 +36,6 @@ "type": "string", "enum": ["ar_AE", "en_AE", "ru_RU"] }, - "featureCarsDemoIsEnabled": { - "type": "boolean" - }, "appInitialMapCenter": { "type": "string" }, diff --git a/charts/pro-ui/values.yaml b/charts/pro-ui/values.yaml index b4afc1d45..5c0e9d10c 100644 --- a/charts/pro-ui/values.yaml +++ b/charts/pro-ui/values.yaml @@ -49,7 +49,6 @@ ui: # @param ui.appLocale Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. # @param ui.appInitialMapCenter Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). # @param ui.supportDocumentationLink Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro/start' - # @param ui.featureCarsDemoIsEnabled A boolean value for enabling cars demo. # @param ui.immersiveModels A string value for config to enabling 3D-models. logLevel: error @@ -58,7 +57,6 @@ ui: appLocale: en_AE appInitialMapCenter: '[46.71, 24.72]' supportDocumentationLink: '' - featureCarsDemoIsEnabled: false immersiveModels: '' # @param ui.auth.sso Flag to turn on/off the authorization. Possible values: `"true"` or `"false"`. From 5d17ee95b702d64554f7efa83037ef1599a6c92f Mon Sep 17 00:00:00 2001 From: "morozov.a" Date: Tue, 3 Oct 2023 09:44:32 +0700 Subject: [PATCH 3/4] fix IMMERSIVE_MODELS env --- charts/pro-ui/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pro-ui/templates/_helpers.tpl b/charts/pro-ui/templates/_helpers.tpl index 57ac2e30d..cf133aaab 100644 --- a/charts/pro-ui/templates/_helpers.tpl +++ b/charts/pro-ui/templates/_helpers.tpl @@ -70,7 +70,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} - name: SUPPORT_DOCUMENTATION_LINK value: "{{ .Values.ui.supportDocumentationLink }}" - name: IMMERSIVE_MODELS - value: "{{ .Values.ui.immersiveModels }}" + value: {{ .Values.ui.immersiveModels | quote }} - name: HOME value: "/tmp" {{- end }} From 15c3687b4e2222e84f43a8ba76abf6c02a29d5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9C=D0=B8=D1=85?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= Date: Tue, 3 Oct 2023 18:21:05 +0700 Subject: [PATCH 4/4] [PRO-3589] Update helm-charts for pro-ui. --- charts/pro-ui/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pro-ui/values.yaml b/charts/pro-ui/values.yaml index 5c0e9d10c..548c5a33c 100644 --- a/charts/pro-ui/values.yaml +++ b/charts/pro-ui/values.yaml @@ -49,7 +49,7 @@ ui: # @param ui.appLocale Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. # @param ui.appInitialMapCenter Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). # @param ui.supportDocumentationLink Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro/start' - # @param ui.immersiveModels A string value for config to enabling 3D-models. + # @param ui.immersiveModels A string value for config to enabling 3D-models. Possible values: [{"id":4,"name":"Ground","mapOptions":{"center":[53.287567,23.564967],"styleZoom":19.2,"pitch":45,"rotation":0},"objects":[{"buildingIds":[],"coords":[53.284762,23.569323],"scale":90,"rotateX":0.5,"rotateY":0,"moveX":0,"moveY":0,"moveZ":0,"models":[{"path":"/static/models/adnoc/ground.glb","name":"Ground","displayName":"Ground"}]}]}] logLevel: error isOnPremise: true