[citylens] routes 1.6.x

changelogs/citylens/CITYLENS-Breaking-Changes.md

@@ -1,8 +1,19 @@
 # Citylens Breaking-Changes
 
+## [2.2.0]
+
+### citylens
+
+- Added new required parameters:
+  - `.Values.routes.adminCredentials.password`
+  - `.Values.routes.adminCredentials.username`
+  - `.Values.routes.endpointInternalApiKey.dataScience`
+  - `.Values.routes.endpointInternalApiKey.companies`
+
 ## [2.1.0]
 
 ### citylens
+
 - Changed REST request logging: `extended` -> `extendedRestLogging`
 - Modified service database connection: moved to a separate block, `maxPoolSize` and `pooling` replaced with `poolSize`:
 ```

changelogs/citylens/CITYLENS-CHANGELOG.md

@@ -31,4 +31,3 @@ citylens-routes-ui
 	+ citylens-routes-ui:1.3.2
 
 ```
-

charts/citylens/templates/routes-api/deployment.yaml

@@ -109,13 +109,18 @@ spec:
             - name: Common__Logging__ExtendedSqlLogging
               value: {{ .Values.routes.api.logging.extendedSqlLogging | quote }}
 
+            - name: Common__OpenApi
+              value: {{ .Values.routes.api.openApi | quote }}
+
             - name: Postgres__ReadWrite__ConnectionString
               value: {{ include "routes-api.connectionString" . }}
             - name: Postgres__ReadWrite__Password
               valueFrom:
                 secretKeyRef:
                   key: postgresPassword
                   name: {{ include "citylens.routes.api.name" . }}-secret
+            - name: PgSettings__MultiTenantEnabled
+              value: {{ $.Values.routes.features.multiTenantEnabled | quote }}
 
             - name: Postgres__ReadOnly__ConnectionString
               value: {{ include "routes-api.connectionString" . }}
@@ -133,31 +138,17 @@ spec:
                   key: postgresPassword
                   name: {{ include "citylens.routes.api.name" . }}-secret
 
-            - name: S3__BucketPrefix
-              value: {{ required "A valid .Values.s3.bucketPrefix entry required" $.Values.s3.bucketPrefix | quote }}
-            - name: S3__LogsBucketPrefix
-              value: {{ required "A valid .Values.s3.logsBucketPrefix entry required" $.Values.s3.logsBucketPrefix | quote }}
-            - name: S3__AccessKey
-              valueFrom:
-                secretKeyRef:
-                  key: s3AccessKey
-                  name: {{ include "citylens.routes.api.name" . }}-secret
-            - name: S3__SecretAccessKey
-              valueFrom:
-                secretKeyRef:
-                  key: s3SecretAccessKey
-                  name: {{ include "citylens.routes.api.name" . }}-secret
-            - name: S3__Region
-              value: {{ $.Values.s3.region | quote }}
-
             - name: Clients__Navigation__Enabled
               value: "true"
             - name: Clients__Navigation__Url
               value: {{ required "A valid .Values.routes.navi.url entry required" $.Values.routes.navi.url | quote }}
             - name: Clients__Navigation__TimeoutSeconds
               value: {{ $.Values.routes.navi.timeout | quote }}
             - name: Clients__Navigation__ApiKey
-              value: {{ $.Values.routes.navi.key | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: naviApiKey
+                  name: {{ include "citylens.routes.api.name" . }}-secret
 
             - name: Clients__Keys__Enabled
               value: "true"
@@ -171,7 +162,10 @@ spec:
             - name: Clients__ProClient__Url
               value: {{ $.Values.pro.baseUrl | quote }}
             - name: Clients__ProClient__AuthorizationToken
-              value: {{ $.Values.routes.pro.authorizationToken | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: proAuthToken
+                  name: {{ include "citylens.routes.api.name" . }}-secret
 
             - name: Clients__RealTimeData__Enabled
               value: "true"
@@ -184,10 +178,42 @@ spec:
               value: {{ $.Values.routes.features.oidcMobileAuthorizationEnabled | quote }}
             - name: Features__CoverageRatioEnabled
               value: {{ $.Values.routes.features.coverageRatioEnabled | quote }}
+            - name: Features__MultiTenantEnabled
+              value: {{ $.Values.routes.features.multiTenantEnabled | quote }}
 
             - name: TasksAssetSettings__SystemAccessToken
-              value: {{ $.Values.routes.tasksAssetSettings.systemAccessToken | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: proTasksAssetAccessToken
+                  name: {{ include "citylens.routes.api.name" . }}-secret
             - name: TasksAssetSettings__PlannedTasksAssetId
               value: {{ $.Values.routes.tasksAssetSettings.plannedTasksAssetId | quote }}
             - name: TasksAssetSettings__CompletedTasksAssetId
               value: {{ $.Values.routes.tasksAssetSettings.completedTasksAssetId | quote }}
+
+            - name: Hangfire__DashboardAuthorization__Enabled
+              value: "true"
+            - name: Hangfire__DashboardAuthorization__Username
+              value: {{ required "A valid .Values.routes.adminCredentials.username entry required" $.Values.routes.adminCredentials.username | quote }}
+            - name: Hangfire__DashboardAuthorization__Password
+              valueFrom:
+                secretKeyRef:
+                  key: adminPassword
+                  name: {{ include "citylens.routes.api.name" . }}-secret
+
+            - name: EndpointApiKey__Enabled
+              value: "true"
+            - name: EndpointApiKey__Data__0__Controller
+              value: "DataScience"
+            - name: EndpointApiKey__Data__0__Key
+              valueFrom:
+                secretKeyRef:
+                  key: dataScienceApiKey
+                  name: {{ include "citylens.routes.api.name" . }}-api-key-secret
+            - name: EndpointApiKey__Data__1__Controller
+              value: "Companies"
+            - name: EndpointApiKey__Data__1__Key
+              valueFrom:
+                secretKeyRef:
+                  key: companiesApiKey
+                  name: {{ include "citylens.routes.api.name" . }}-api-key-secret

charts/citylens/templates/routes-realtime-data-api/deployment.yaml

@@ -108,6 +108,9 @@ spec:
             - name: Common__Logging__ExtendedSqlLogging
               value: {{ .Values.routes.realtimeDataApi.logging.extendedSqlLogging | quote }}
 
+            - name: Common__OpenApi
+              value: {{ .Values.routes.realtimeDataApi.openApi | quote }}
+
             - name: Postgres__ReadWrite__ConnectionString
               value: {{ include "routes-realtime-data-api.connectionString" . }}
             - name: Postgres__ReadWrite__Password

charts/citylens/templates/routes-worker/deployment.yaml

@@ -157,7 +157,10 @@ spec:
               value: {{ $.Values.routes.worker.busConfig.consumers.appEvents.workersCount | quote }}
 
             - name: TasksAssetSettings__SystemAccessToken
-              value: {{ $.Values.routes.tasksAssetSettings.systemAccessToken | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: proTasksAssetAccessToken
+                  name: {{ include "citylens.routes.api.name" . }}-secret
             - name: TasksAssetSettings__PlannedTasksAssetId
               value: {{ $.Values.routes.tasksAssetSettings.plannedTasksAssetId | quote }}
             - name: TasksAssetSettings__CompletedTasksAssetId
@@ -168,7 +171,10 @@ spec:
             - name: Clients__ProClient__Url
               value: {{ $.Values.pro.baseUrl | quote }}
             - name: Clients__ProClient__AuthorizationToken
-              value: {{ $.Values.routes.pro.authorizationToken | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: proAuthToken
+                  name: {{ include "citylens.routes.api.name" . }}-secret
 
             - name: Clients__Navigation__Enabled
               value: "true"
@@ -177,7 +183,10 @@ spec:
             - name: Clients__Navigation__TimeoutSeconds
               value: {{ $.Values.routes.navi.timeout | quote }}
             - name: Clients__Navigation__ApiKey
-              value: {{ $.Values.routes.navi.key | quote }}
+              valueFrom:
+                secretKeyRef:
+                  key: naviApiKey
+                  name: {{ include "citylens.routes.api.name" . }}-secret
 
             - name: Features__CoverageRatioEnabled
               value: {{ $.Values.routes.features.coverageRatioEnabled | quote }}

charts/citylens/templates/secrets.api-key.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "citylens.routes.api.name" . }}-api-key-secret
+type: Opaque
+data:
+  dataScienceApiKey: {{ required "Valid .Values.routes.endpointInternalApiKey.dataScience required!" .Values.routes.endpointInternalApiKey.dataScience | b64enc }}
+  companiesApiKey: {{ required "Valid .Values.routes.endpointInternalApiKey.companies required!" .Values.routes.endpointInternalApiKey.companies | b64enc }}

charts/citylens/templates/secrets.routes.yaml

@@ -6,5 +6,7 @@ type: Opaque
 data:
   postgresPassword: {{ required "Valid .Values.postgres.password required!" .Values.postgres.password | b64enc }}
   busConfigSaslPassword: {{ required "Valid .Values.kafka.password required!" .Values.kafka.password | b64enc }}
-  s3AccessKey: {{ required "Valid .Values.s3.accessKey required!" .Values.s3.accessKey | b64enc }}
-  s3SecretAccessKey: {{ required "Valid .Values.s3.secretAccessKey required!" .Values.s3.secretAccessKey | b64enc }}
+  adminPassword: {{ required "Valid .Values.routes.adminCredentials.password required!" .Values.routes.adminCredentials.password | b64enc  }}
+  proAuthToken: {{ .Values.routes.pro.authorizationToken | b64enc }}
+  proTasksAssetAccessToken: {{ .Values.routes.tasksAssetSettings.systemAccessToken | b64enc }}
+  naviApiKey: {{ required "Valid .Values.routes.navi.key required!" .Values.routes.navi.key | b64enc }}