Skip to content

Commit

Permalink
Do not install additional instance of retriever when Encryption is en…
Browse files Browse the repository at this point in the history
…abled.
  • Loading branch information
alexemc committed Jun 17, 2024
1 parent acbcc3d commit 0d06926
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
4 changes: 2 additions & 2 deletions charts/csi-isilon/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: csi-isilon
version: 2.11.0
appVersion: "2.11.0"
version: 2.11.1
appVersion: "2.11.1"
kubeVersion: ">= 1.21.0"
# If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead
# WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
Expand Down
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
image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
command: [ "/csi-metadata-retriever" ]
env:
- 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

0 comments on commit 0d06926

Please sign in to comment.