Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: v.oleynikov <[email protected]>
  • Loading branch information
duckhawk committed Jul 4, 2024
1 parent eb0f37f commit 9db6978
Showing 1 changed file with 4 additions and 26 deletions.
30 changes: 4 additions & 26 deletions templates/csi/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- "--driver-name=csi.huawei.com"
- "--controller"
- "--backend-update-interval=60"
- "--logging-module=file"
- "--logging-module=console"
- "--log-level=info"
- "--volume-name-prefix=pvc"
- "--enable-label=false"
Expand All @@ -34,30 +34,22 @@
{{- end }}

{{- define "csi_additional_controller_volume" }}
- hostPath:
path: /var/log/
type: Directory
name: log
- hostPath:
path: /etc/localtime
type: File
name: host-time
{{- end }}

{{- define "csi_additional_controller_volume_mounts" }}
- mountPath: /var/log
name: log
{{- end }}

{{- $csiControllerImage := include "helm_lib_module_image" (list . "csiHuawei") }}

{{- define "csi_additional_containers" }}
{{- $csiControllerImage := index . 0 }}
- args:
- --logging-module=file
- --logging-module=console
- --log-level=info
- --log-file-dir=/var/log/huawei
- --log-file-size=20M
- --max-backups=9
- --web-hook-port=4433
- --web-hook-address=$(POD_IP)
Expand Down Expand Up @@ -95,15 +87,11 @@
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /var/log
name: log
- mountPath: /etc/localtime
name: host-time
- args:
- --logging-module=file
- --logging-module=console
- --log-level=info
- --log-file-dir=/var/log/huawei
- --log-file-size=20M
- --max-backups=9
- --backend-update-interval=60
- --dr-endpoint=$(DRCSI_ENDPOINT)
Expand Down Expand Up @@ -132,8 +120,6 @@
volumeMounts:
- mountPath: /csi
name: socket-dir
- mountPath: /var/log
name: log
- mountPath: /etc/localtime
name: host-time
{{- end }}
Expand Down Expand Up @@ -170,10 +156,8 @@
- "--nvme-multipath-type=HW-UltraPath-NVMe"
- "--scan-volume-timeout=3"
- "--exec-command-timeout=30"
- "--logging-module=file"
- "--logging-module=console"
- "--log-level=info"
- "--log-file-dir=/var/log/huawei"
- "--log-file-size=20M"
- "--max-backups=9"
{{- end }}

Expand All @@ -200,10 +184,6 @@
path: /var/lib/iscsi
type: ""
name: iscsi-dir
- hostPath:
path: /var/log/
type: Directory
name: log-dir
- hostPath:
path: /etc/iscsi
type: DirectoryOrCreate
Expand All @@ -219,8 +199,6 @@
{{- end }}

{{- define "csi_additional_node_volume_mounts" }}
- mountPath: /var/log
name: log-dir
- mountPath: /var/lib/iscsi
name: iscsi-dir
- mountPath: /etc/iscsi
Expand Down

0 comments on commit 9db6978

Please sign in to comment.