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

csi-isilon: second csi-metadata-retriever instance eliminated #453

Merged
merged 1 commit into from
Jun 17, 2024
Merged
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions charts/csi-isilon/templates/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -273,20 +273,6 @@ spec:
mountPath: /var/run/csi
{{ end }}
{{ end }}
- name: csi-metadata-retriever{{ $csiSidecarSuffix }}
image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
args:
- "--csi-address={{ $driverSockPath }}"
- "--timeout=120s"
- "--v=5"
command: [ "/csi-metadata-retriever" ]
env:
- name: CSI_RETRIEVER_ENDPOINT
value: /var/run/csi/csi_retriever{{ $csiSidecarSuffix }}.sock
volumeMounts:
- name: socket-dir
mountPath: /var/run/csi
- name: attacher{{ $csiSidecarSuffix }}
image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
Expand All @@ -310,6 +296,16 @@ spec:
- name: socket-dir
mountPath: /var/run/csi
{{- if not $encrypted }}
- name: csi-metadata-retriever
alexemc marked this conversation as resolved.
Show resolved Hide resolved
image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
command: [ "/csi-metadata-retriever" ]
alexemc marked this conversation as resolved.
Show resolved Hide resolved
env:
alexemc marked this conversation as resolved.
Show resolved Hide resolved
- name: CSI_RETRIEVER_ENDPOINT
value: /var/run/csi/csi_retriever.sock
volumeMounts:
- name: socket-dir
mountPath: /var/run/csi
{{- if hasKey .Values.controller "healthMonitor" }}
{{- if eq .Values.controller.healthMonitor.enabled true }}
- name: external-health-monitor-controller
Expand Down
Loading