Skip to content

Commit 858b381

Browse files
grigory51robot-piglet
authored andcommitted
Fix mounts extra volumes
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=ru. Excess tabs break `helm template`: ``` Error: YAML parse error on perforator/charts/perforator/templates/proxy/deployment.yaml: error converting YAML to JSON: yaml: line 78: did not find expected key ``` --- Pull Request resolved: #30 commit_hash:c9b7e63e0f14a585920b268714f59582dcb49555
1 parent 11cc1d1 commit 858b381

File tree

7 files changed

+45
-42
lines changed

7 files changed

+45
-42
lines changed

perforator/deploy/kubernetes/helm/perforator/templates/agent/daemonset.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ spec:
8989
readOnly: true
9090
{{- end }}
9191
{{- range .Values.agent.mounts.extra }}
92-
- name: {{ .name }}
93-
mountPath: {{ .mountPath }}
94-
subPath: {{ .subPath }}
95-
readOnly: {{ .readOnly }}
92+
- name: {{ .name }}
93+
mountPath: {{ .mountPath }}
94+
subPath: {{ .subPath }}
95+
readOnly: {{ .readOnly }}
9696
{{- end }}
9797
# it may be desirable to set a high priority class to ensure that a DaemonSet Pod
9898
# preempts running Pods
@@ -121,9 +121,9 @@ spec:
121121
path: /var/lib/docker/containers
122122
{{- end }}
123123
{{- range .Values.agent.mounts.extra }}
124-
- name: {{ .name }}
125-
configMap:
126-
name: {{ .configMap }}
124+
- name: {{ .name }}
125+
configMap:
126+
name: {{ .configMap }}
127127
{{- end }}
128128
{{- with .Values.agent.nodeSelector }}
129129
nodeSelector:

perforator/deploy/kubernetes/helm/perforator/templates/gc/deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ spec:
8080
readOnly: true
8181
{{- end }}
8282
{{- range .Values.gc.mounts.extra }}
83-
- name: {{ .name }}
84-
mountPath: {{ .mountPath }}
85-
subPath: {{ .subPath }}
86-
readOnly: {{ .readOnly }}
83+
- name: {{ .name }}
84+
mountPath: {{ .mountPath }}
85+
subPath: {{ .subPath }}
86+
readOnly: {{ .readOnly }}
8787
{{- end }}
8888
env:
8989
- name: CLICKHOUSE_PASSWORD
@@ -110,9 +110,9 @@ spec:
110110
path: /var/lib/docker/containers
111111
{{- end }}
112112
{{- range .Values.gc.mounts.extra }}
113-
- name: {{ .name }}
114-
configMap:
115-
name: {{ .configMap }}
113+
- name: {{ .name }}
114+
configMap:
115+
name: {{ .configMap }}
116116
{{- end }}
117117
{{- with .Values.gc.nodeSelector }}
118118
nodeSelector:

perforator/deploy/kubernetes/helm/perforator/templates/offline-processing/deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ spec:
7676
readOnly: true
7777
{{- end }}
7878
{{- range .Values.offlineprocessing.mounts.extra }}
79-
- name: {{ .name }}
80-
mountPath: {{ .mountPath }}
81-
subPath: {{ .subPath }}
82-
readOnly: {{ .readOnly }}
79+
- name: {{ .name }}
80+
mountPath: {{ .mountPath }}
81+
subPath: {{ .subPath }}
82+
readOnly: {{ .readOnly }}
8383
{{- end }}
8484
env:
8585
- name: CLICKHOUSE_PASSWORD
@@ -108,9 +108,9 @@ spec:
108108
path: /var/lib/docker/containers
109109
{{- end }}
110110
{{- range .Values.offlineprocessing.mounts.extra }}
111-
- name: {{ .name }}
112-
configMap:
113-
name: {{ .configMap }}
111+
- name: {{ .name }}
112+
configMap:
113+
name: {{ .configMap }}
114114
{{- end }}
115115
{{- with .Values.offlineprocessing.nodeSelector }}
116116
nodeSelector:

perforator/deploy/kubernetes/helm/perforator/templates/proxy/deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ spec:
8585
readOnly: true
8686
{{- end }}
8787
{{- range .Values.proxy.mounts.extra }}
88-
- name: {{ .name }}
89-
mountPath: {{ .mountPath }}
90-
subPath: {{ .subPath }}
91-
readOnly: {{ .readOnly }}
88+
- name: {{ .name }}
89+
mountPath: {{ .mountPath }}
90+
subPath: {{ .subPath }}
91+
readOnly: {{ .readOnly }}
9292
{{- end }}
9393
env:
9494
- name: CLICKHOUSE_PASSWORD
@@ -115,9 +115,9 @@ spec:
115115
path: /var/lib/docker/containers
116116
{{- end }}
117117
{{- range .Values.proxy.mounts.extra }}
118-
- name: {{ .name }}
119-
configMap:
120-
name: {{ .configMap }}
118+
- name: {{ .name }}
119+
configMap:
120+
name: {{ .configMap }}
121121
{{- end }}
122122
{{- with .Values.proxy.nodeSelector }}
123123
nodeSelector:

perforator/deploy/kubernetes/helm/perforator/templates/storage/deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ spec:
8383
readOnly: true
8484
{{- end }}
8585
{{- range .Values.storage.mounts.extra }}
86-
- name: {{ .name }}
87-
mountPath: {{ .mountPath }}
88-
subPath: {{ .subPath }}
89-
readOnly: {{ .readOnly }}
86+
- name: {{ .name }}
87+
mountPath: {{ .mountPath }}
88+
subPath: {{ .subPath }}
89+
readOnly: {{ .readOnly }}
9090
{{- end }}
9191
env:
9292
- name: CLICKHOUSE_PASSWORD
@@ -116,9 +116,9 @@ spec:
116116
path: /var/lib/docker/containers
117117
{{- end }}
118118
{{- range .Values.storage.mounts.extra }}
119-
- name: {{ .name }}
120-
configMap:
121-
name: {{ .configMap }}
119+
- name: {{ .name }}
120+
configMap:
121+
name: {{ .configMap }}
122122
{{- end }}
123123
{{- with .Values.storage.nodeSelector }}
124124
nodeSelector:

perforator/deploy/kubernetes/helm/perforator/templates/web/deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ spec:
8181
readOnly: true
8282
{{- end }}
8383
{{- range .Values.web.mounts.extra }}
84-
- name: {{ .name }}
85-
mountPath: {{ .mountPath }}
86-
subPath: {{ .subPath }}
87-
readOnly: {{ .readOnly }}
84+
- name: {{ .name }}
85+
mountPath: {{ .mountPath }}
86+
subPath: {{ .subPath }}
87+
readOnly: {{ .readOnly }}
8888
{{- end }}
8989
volumes:
9090
- name: storage-s3-keys
@@ -104,9 +104,9 @@ spec:
104104
path: /var/lib/docker/containers
105105
{{- end }}
106106
{{- range .Values.web.mounts.extra }}
107-
- name: {{ .name }}
108-
configMap:
109-
name: {{ .configMap }}
107+
- name: {{ .name }}
108+
configMap:
109+
name: {{ .configMap }}
110110
{{- end }}
111111
{{- with .Values.web.nodeSelector }}
112112
nodeSelector:

perforator/deploy/kubernetes/helm/releases.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Unreleased
22

3+
Fixes:
4+
+ Fix mount extra volumes
5+
36
Enhancements:
47
+ Add default images for all components
58
+ (experimental) Add support for automated migrations (see `.databases.{postgresql,clickhouse}.migrations` for details)

0 commit comments

Comments
 (0)