diff --git a/Breaking-Changes.md b/Breaking-Changes.md index 8faf673ce..ea9465ac0 100644 --- a/Breaking-Changes.md +++ b/Breaking-Changes.md @@ -1,6 +1,6 @@ # 2GIS On-Premise Breaking-Changes -## [#.#.#] +## [1.26.0] ### citylens - Added new worker `worker.dashboardBatchEvents` diff --git a/CHANGELOG.md b/CHANGELOG.md index 72164e7dd..9f76d7896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 2GIS On-Premise Changelog ## [1.26.0] (2024-07-25) +#### [Breaking-Changes](Breaking-Changes.md#1260) #### Images ``` catalog-api diff --git a/charts/navi-castle/README.md b/charts/navi-castle/README.md index 2d56319a7..0365c594b 100644 --- a/charts/navi-castle/README.md +++ b/charts/navi-castle/README.md @@ -32,7 +32,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn | ------------------------- | ------------------------------------- | ----------------------------- | | `castle.image.repository` | Navi-Castle service image repository. | `2gis-on-premise/navi-castle` | | `castle.image.pullPolicy` | Navi-Castle service pull policy. | `IfNotPresent` | -| `castle.image.tag` | Navi-Castle service image tag. | `1.9.2` | +| `castle.image.tag` | Navi-Castle service image tag. | `1.9.4` | | `nginx.image.repository` | Navi-Front image repository. | `2gis-on-premise/navi-front` | | `nginx.image.tag` | Navi-Front image tag. | `1.24.1` | @@ -104,14 +104,15 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn | Name | Description | Value | | -------------------------------------- | --------------------------------------------------- | ------------------------------ | -| `castle.castleDataPath` | Path to the data directory. | `/opt/castle/data/` | +| `castle.castleDataPath` | Path to the data directory | `/opt/castle/data/` | +| `castle.excludeProjects` | Array of project labels to exclude | `[]` | | `castle.restrictions` | Section ignored if castle.restriction.enabled=false | | -| `castle.restrictions.host` | Restrictions API base URL. | `http://restrictions-api.host` | -| `castle.restrictions.key` | Restrictions API key. | `""` | -| `castle.jobs` | Number of parallel downloading jobs. | `1` | +| `castle.restrictions.host` | Restrictions API base URL | `http://restrictions-api.host` | +| `castle.restrictions.key` | Restrictions API key | `""` | +| `castle.jobs` | Number of parallel downloading jobs | `1` | | `castle.startupProbe` | Settings for startup probes | | -| `castle.startupProbe.periodSeconds` | Check period for startup probes. | `5` | -| `castle.startupProbe.failureThreshold` | Threshold for startup probes. | `180` | +| `castle.startupProbe.periodSeconds` | Check period for startup probes | `5` | +| `castle.startupProbe.failureThreshold` | Threshold for startup probes | `180` | ### Navi-Front settings diff --git a/charts/navi-castle/templates/cronjob.yaml b/charts/navi-castle/templates/cronjob.yaml index ff1011da3..caaacaa8e 100644 --- a/charts/navi-castle/templates/cronjob.yaml +++ b/charts/navi-castle/templates/cronjob.yaml @@ -48,6 +48,11 @@ spec: - /opt/config_builder.conf - --service={{ include "castle.serviceParameter" ( dict "flavor" $flavor ) }} - --jobs={{ $.Values.castle.jobs | default 1 | int }} + {{- if .Values.castle.excludeProjects }} + env: + - name: CASTLE_EXCLUDE_PROJECTS + value: {{ join "," .Values.castle.excludeProjects | quote }} + {{- end }} volumeMounts: - name: {{ include "castle.fullname" $ }}-builder-config mountPath: /opt/config_builder.conf @@ -59,7 +64,7 @@ spec: mountPath: {{ $.Values.castle.castleDataPath }} resources: {{- toYaml $.Values.resources | nindent 16 }} -{{- end -}} {{/* if */}} +{{- end -}} {{/* if index $.Values.cron.enabled $flavor */}} {{- end -}} {{/* range $flavor */}} {{- end -}} {{/* range $i, $e */}} {{- end -}} {{/* if */}} diff --git a/charts/navi-castle/templates/statefulset.yaml b/charts/navi-castle/templates/statefulset.yaml index fe2e69159..2e5530226 100644 --- a/charts/navi-castle/templates/statefulset.yaml +++ b/charts/navi-castle/templates/statefulset.yaml @@ -103,6 +103,11 @@ spec: - name: cron-prom containerPort: {{ .Values.cron.prometheusPort | int }} protocol: TCP + {{- if .Values.castle.excludeProjects }} + env: + - name: CASTLE_EXCLUDE_PROJECTS + value: {{ join "," .Values.castle.excludeProjects | quote }} + {{- end }} volumeMounts: - name: {{ include "castle.fullname" $ }}-builder-config mountPath: /opt/config_builder.conf diff --git a/charts/navi-castle/values.yaml b/charts/navi-castle/values.yaml index 4471ee9cb..fd21d3268 100644 --- a/charts/navi-castle/values.yaml +++ b/charts/navi-castle/values.yaml @@ -118,24 +118,26 @@ resources: {} # @section Navi-Castle service settings -# @param castle.castleDataPath Path to the data directory. +# @param castle.castleDataPath Path to the data directory +# @param castle.excludeProjects Array of project labels to exclude # @extra castle.restrictions Section ignored if castle.restriction.enabled=false -# @param castle.restrictions.host Restrictions API base URL. -# @param castle.restrictions.key Restrictions API key. -# @param castle.jobs Number of parallel downloading jobs. +# @param castle.restrictions.host Restrictions API base URL +# @param castle.restrictions.key Restrictions API key +# @param castle.jobs Number of parallel downloading jobs # @extra castle.startupProbe [nullable] Settings for startup probes -# @param castle.startupProbe.periodSeconds Check period for startup probes. -# @param castle.startupProbe.failureThreshold Threshold for startup probes. +# @param castle.startupProbe.periodSeconds Check period for startup probes +# @param castle.startupProbe.failureThreshold Threshold for startup probes castle: image: repository: 2gis-on-premise/navi-castle pullPolicy: IfNotPresent - tag: 1.9.2 + tag: 1.9.4 castleDataPath: /opt/castle/data/ restrictions: host: http://restrictions-api.host key: '' + excludeProjects: [] jobs: 1 startupProbe: periodSeconds: 5