-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #568 from 2gis/develop
Release 1.33.0 (master)
- Loading branch information
Showing
70 changed files
with
701 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
charts/citylens/templates/web/workers/deployment-map-matcher.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| {{- if .Values.worker.mapMatcher.enabled }} | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ include "citylens.map-matcher.name" . }} | ||
| {{- if .Values.worker.mapMatcher.annotations }} | ||
| annotations: | ||
| {{- toYaml .Values.worker.mapMatcher.annotations | nindent 4 }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "citylens.map-matcher.labels" . | nindent 4 }} | ||
| {{- if .Values.worker.mapMatcher.labels }} | ||
| {{- toYaml .Values.worker.mapMatcher.labels | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| replicas: {{ .Values.worker.mapMatcher.replicas }} | ||
| revisionHistoryLimit: {{ .Values.worker.mapMatcher.revisionHistoryLimit }} | ||
| selector: | ||
| matchLabels: | ||
| {{- include "citylens.map-matcher.selectorLabels" . | nindent 6 }} | ||
| strategy: | ||
| type: RollingUpdate | ||
| rollingUpdate: | ||
| maxSurge: 1 | ||
| maxUnavailable: 0 | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| checksum/config: {{ include (print $.Template.BasePath "/web/configmap.yaml") . | sha256sum }} | ||
| checksum/custom-ca: {{ include "citylens.checksum" (merge (dict "path" "/custom-ca.configmap.yaml") $) }} | ||
| {{- with .Values.worker.mapMatcher.podAnnotations }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "citylens.map-matcher.labels" . | nindent 8 }} | ||
| spec: | ||
| containers: | ||
| - name: {{ include "citylens.map-matcher.name" . }} | ||
| image: {{ required "A valid .Values.dgctlDockerRegistry entry required" .Values.dgctlDockerRegistry }}/{{ .Values.web.image.repository }}:{{ .Values.web.image.tag }} | ||
| imagePullPolicy: {{ .Values.web.image.pullPolicy }} | ||
| command: [ "/bin/sh", "-c" ] | ||
| args: [ "flask map_matching match" ] | ||
| env: | ||
| - name: CONFIG_PATH | ||
| value: /opt/worker/config/dashboard_config.yaml | ||
| {{- if $.Values.customCAs.bundle }} | ||
| - name: SSL_CERT_DIR | ||
| value: {{ include "citylens.customCA.mountPath" $ }} | ||
| {{- end }} | ||
| resources: | ||
| {{- toYaml .Values.worker.resources | nindent 12 }} | ||
| volumeMounts: | ||
| - name: config-volume | ||
| mountPath: /opt/worker/config | ||
| {{- if $.Values.customCAs.bundle }} | ||
| - mountPath: {{ include "citylens.customCA.mountPath" $ }} | ||
| name: custom-ca | ||
| readOnly: true | ||
| {{- end }} | ||
| volumes: | ||
| - name: config-volume | ||
| configMap: | ||
| name: {{ include "citylens.web.name" . }}-configmap | ||
| {{- if $.Values.customCAs.bundle }} | ||
| - name: custom-ca | ||
| configMap: | ||
| name: {{ include "citylens.name" $ }}-custom-ca-configmap | ||
| {{- end }} | ||
| {{- with .Values.worker.mapMatcher.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.worker.mapMatcher.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.worker.mapMatcher.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.