-
Notifications
You must be signed in to change notification settings - Fork 9
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
[chart/navi-attractor] chart syncup #519
base: develop
Are you sure you want to change the base?
Conversation
7f38062
to
453ce5d
Compare
453ce5d
to
b542aa9
Compare
b542aa9
to
207ad5c
Compare
{{- if .Values.s3.suffix }} | ||
"suffix": {{ .Values.s3.suffix | quote }}, | ||
{{- end }} | ||
"endpoint": {{ .Values.s3.host | quote }}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Отсутствует required
для обязательных параметров S3 если он включен в настройках.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
добавил
annotations: | ||
{{- include "tplvalues.render" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }} | ||
{{- end }} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Лишняя пустая строка.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
{{- if .Values.service.http.annotations }} | ||
{{- include "tplvalues.render" ( dict "value" .Values.service.http.annotations "context" $) | nindent 4 }} | ||
{{- end }} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Лишняя пустая строка.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
labels: | ||
{{- include "generic-chart.labels" . | nindent 4 }} | ||
rule: {{ .Values.attractor.app_rule | default "" | quote }} | ||
navigroup: {{ .Values.navigroup | default "" | quote }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Описание переменной отсутствует в values.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
добавил
name: {{ include "generic-chart.fullname" . }} | ||
labels: | ||
{{- include "generic-chart.labels" . | nindent 4 }} | ||
rule: {{ .Values.attractor.app_rule | default "" | quote }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Описание переменной отсутствует в values.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
добавил
{{- end }}{{- /* .Values.attractor.indices.geoImport.enabled */}} | ||
|
||
|
||
{{- if eq .Values.attractor.type "truck" }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Описание переменной отсутствует в values.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
{{- end -}} | ||
{{ $rules | toPrettyJson | nindent 6 -}} | ||
{{- end -}} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Разное число пустых строк между блоками. Где-то одна, где-то две.
Предлагаю привести к везде к одной.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
привёл
Override generic-chart | ||
TODO: rewrite https://github.com/helm/helm/issues/11291 | ||
*/}} | ||
{{- define "generic-chart.containerName" -}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Объявление нового шаблона с именем из чужого домена.
При чтении чарта не понятно где её искать. В этом чарте или в чарте generic-chart
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
да, ровно это и написано в комментарии выше
charts/navi-attractor/values.yaml
Outdated
|
||
# @section Frozen data settings | ||
|
||
# @param frozenData.enabled If use frozen data is enabled. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Возможно стоит скипнуть переменные frozenData
. Вряд-ли они где-то востребованы.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
charts/navi-attractor/values.yaml
Outdated
# @param attractor.rtr.enabled Enable real time restrictions. | ||
# @param attractor.rtr.url URL real time restrictions server. | ||
# @param attractor.rtr.updatePeriod Update period from real time restrictions server. | ||
# @param attractor.mock If mock service being deployed. For test purposes only. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Возможно стоит скипнуть эту настройку.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
# @param ingress.enabled If Ingress is enabled for the service. | ||
# @param ingress.hosts[0].host Hostname for the Ingress service. | ||
|
||
ingress: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Описание ingress нужно расширить по аналогии, иначе не понятно куда и как определять секреты для tls.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
расширил
# @param resources.limits.cpu [nullable] CPU limit, recommended value `3000m`. | ||
# @param resources.limits.memory [nullable] Memory limit, recommended value `8Gi`. | ||
|
||
resources: {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Тут вопрос. Если выше написаны рекомендованные значение, то почему бы не перенести их сюда?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
потому что так не рекомендуется делать, вот мы и не делаем
# @extra vpa.maxAllowed.cpu Upper limit for the number of CPUs to which the autoscaler can scale up. | ||
# @extra vpa.maxAllowed.memory Upper limit for the RAM size to which the autoscaler can scale up. | ||
|
||
vpa: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Описание vpa
нужно расширить по аналогии.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
описание полностью совпадает
charts/navi-attractor/values.yaml
Outdated
# @param image.tag Tag | ||
|
||
image: | ||
repository: 2gis-on-premise/attractord |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
repository: 2gis-on-premise/attractord | |
repository: 2gis-on-premise/navi-attractor |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
исправил
enabled: true | ||
snImport: | ||
enabled: false | ||
attractor: {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
аттрактор для аттрактора? это точно нужно?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
да, настройка аналогична тому, что в navi-back
charts/navi-attractor/values.yaml
Outdated
overrideConfig: '' | ||
rtr: | ||
enabled: false | ||
url: http://rtr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
нужно убрать дефолт и сделать обязательным параметром
url: http://rtr | |
url: '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
charts/navi-attractor/values.yaml
Outdated
enabled: false | ||
groupId: navi_attractor | ||
handlersNumber: 2 | ||
properties: | ||
bootstrap.servers: kafka.host:9092 | ||
security.protocol: PLAINTEXT | ||
fileProperties: {} | ||
distanceMatrix: | ||
taskTopic: task_topic | ||
cancelTopic: cancel_topic | ||
statusTopic: status_topic |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
нужно убрать дефолт и сделать обязательными параметрами
enabled: false | |
groupId: navi_attractor | |
handlersNumber: 2 | |
properties: | |
bootstrap.servers: kafka.host:9092 | |
security.protocol: PLAINTEXT | |
fileProperties: {} | |
distanceMatrix: | |
taskTopic: task_topic | |
cancelTopic: cancel_topic | |
statusTopic: status_topic | |
enabled: false | |
groupId: '' | |
handlersNumber: 2 | |
properties: | |
bootstrap.servers: '' | |
security.protocol: PLAINTEXT | |
fileProperties: {} | |
distanceMatrix: | |
taskTopic: '' | |
cancelTopic: '' | |
statusTopic: '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
убрал
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
group_id
дефолтный правильный, его оставил
207ad5c
to
aa2e795
Compare
Pull Request description
Changelog
navi-back
functionality implemented as a separate service, required for DMA for TrucksBreaking changes
Check-list. Чек-лист код-ревью
helm lint charts/search-api