Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[navi-castle] Add project exclude filter #476

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1724b74
fix pro-api/values.yaml doc (#432)
Ashigo May 6, 2024
b076674
[tiles-api] Upgrade to 4.54.0 (#428)
FreakyGranny May 6, 2024
5e0f53a
Add missing default for enabled_modules->predictors in citylens-web c…
PeterBeklemishev May 8, 2024
5fd2f18
navi-router 6.17.0.8 -> 6.17.1.2 (#434)
i-bogomazov May 13, 2024
07e4068
[PRO-5009] Changed helm/hooks. (#436)
m7v May 17, 2024
ec3cfca
pro-ui: New external style manager config (#426)
kos33rd May 24, 2024
79bc905
GH Actions readme checker workflow (#438)
DAMoskalev May 24, 2024
dc62228
Gh actions readme checker changing name (#440)
DAMoskalev May 24, 2024
7d7f1a5
PRO-UI 2.14.0 (#441)
Aveldin1 May 28, 2024
1380603
Merge master
dbelyaev-nsk May 28, 2024
5ff1e81
PRO-UI fix hooks (#443)
dbelyaev-nsk May 30, 2024
31461f0
[PRO-5181] Обновление pro-api до версии 1.22.0 и pro-ui до версии 2.1…
v-loboda Jun 10, 2024
a1ce1bf
Citylens 1.9.0 & custom CA support (#439)
sergeLeLe Jun 10, 2024
1c85ae0
Fix citylens-web configmap (#448)
PeterBeklemishev Jun 11, 2024
52c05a4
Gis-platform. Мелкие правки по дефолтным параметрам (#450)
v-a-v Jun 17, 2024
651dbd9
[license] Fixed issue with k8s ca automount (#444)
Bolodya1997 Jun 17, 2024
f55281a
WAPI-23444 custom ca twins api (#437)
DemonNSK Jun 18, 2024
a178dcc
Bump citylens to 1.10.0 (#453)
PeterBeklemishev Jun 18, 2024
ca434be
PRO-5559: upgrade key ui to latest (#449)
ostrovskiy2gis Jun 18, 2024
033623c
Правки в чартах mapgl-js-api и floors-api (#420)
itanka9 Jun 19, 2024
9f6b749
release 1.24.0
Jun 19, 2024
8d6c3ff
Add ability to add extra env vars to citylens-web deployment (#455)
PeterBeklemishev Jun 21, 2024
2b50f21
chart/generic-chart syncup (#452)
i-bogomazov Jun 25, 2024
5785840
pro-api serviceAccountOverride support (#456)
DAMoskalev Jun 26, 2024
1d56357
[chart/navi-back] 7.23.0.5 release (#451)
uk-navi-ci Jun 26, 2024
0294050
Merge master
Jun 27, 2024
5871c13
fix conflict
Jun 27, 2024
ebec6e6
[ONPREM-839] Add revisionHistoryLimit (#459)
Ashigo Jul 12, 2024
391e6b5
add revision history limit to navi-services (#458)
Ashigo Jul 12, 2024
5441daa
Add github action with Mattermost Notify (#465)
Efber Jul 19, 2024
9af0681
[DEVOPS-1178] add navi back freeroam (#447)
SanchezzRU Jul 22, 2024
781e696
[PRO-5488] Change-Helm for PRO-UI (#460)
Aveldin1 Jul 22, 2024
34701cc
Add new citylens-workers based worker & add Drivers asset-related top…
PeterBeklemishev Jul 24, 2024
8790dee
Merge master
Jul 25, 2024
6d2fb86
Update Chart.yaml
DAMoskalev Jul 25, 2024
866ddfa
changelog update
Jul 25, 2024
ca3520b
conflict trash fix
Jul 25, 2024
9a91285
update
Jul 25, 2024
6bee75b
[navi-castle] Add project exclude filter
vgivanov Jul 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Breaking-Changes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 2GIS On-Premise Breaking-Changes

## [#.#.#]
## [1.26.0]

### citylens
- Added new worker `worker.dashboardBatchEvents`
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 2GIS On-Premise Changelog

## [1.26.0] (2024-07-25)
#### [Breaking-Changes](Breaking-Changes.md#1260)
#### Images
```
catalog-api
Expand Down
15 changes: 8 additions & 7 deletions charts/navi-castle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |

Expand Down Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion charts/navi-castle/templates/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */}}
5 changes: 5 additions & 0 deletions charts/navi-castle/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions charts/navi-castle/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading