Skip to content

Commit a7c0e20

Browse files
authored
[cinder-csi-plugin]: helm-charts: use /etc/config/ for cloud.conf (#2892)
* Cinder: Use /etc/config/ for cloud.conf in helm charts. This path is used by default in the deployment manifests for cinder-csi as well as in manifests and helm charts for occm. It does not matter much until you reference another file via ca-file=/etc/config/cacert in your cloud.conf and assume that to work. So better align the volumeMount location everywhere. As there is a canonical location where most artifacts already agree on, let's use it in cinder-csi helm charts as well. Signed-off-by: Kurt Garloff <[email protected]> * Bump chart version number as requested by bot. Signed-off-by: Kurt Garloff <[email protected]> --------- Signed-off-by: Kurt Garloff <[email protected]>
1 parent 7853ba8 commit a7c0e20

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

charts/cinder-csi-plugin/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: v1.32.0
33
description: Cinder CSI Chart for OpenStack
44
name: openstack-cinder-csi
5-
version: 2.33.0-alpha.1
5+
version: 2.33.0-alpha.2
66
home: https://github.com/kubernetes/cloud-provider-openstack
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
88
maintainers:

charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ spec:
192192
- name: CSI_ENDPOINT
193193
value: unix://csi/csi.sock
194194
- name: CLOUD_CONFIG
195-
value: /etc/kubernetes/{{ .Values.secret.filename }}
195+
value: /etc/config/{{ .Values.secret.filename }}
196196
- name: CLUSTER_NAME
197197
value: "{{ .Values.clusterID }}"
198198
{{- if .Values.csi.plugin.extraEnv }}
@@ -233,7 +233,7 @@ spec:
233233
{{- else if .Values.secret.hostMount }}
234234
- name: cloud-config
235235
hostPath:
236-
path: /etc/kubernetes
236+
path: /etc/config
237237
{{- end }}
238238
{{- with .Values.csi.plugin.volumes }}
239239
{{- toYaml . | nindent 8 }}

charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ spec:
105105
- name: CSI_ENDPOINT
106106
value: unix://csi/csi.sock
107107
- name: CLOUD_CONFIG
108-
value: /etc/kubernetes/{{ .Values.secret.filename }}
108+
value: /etc/config/{{ .Values.secret.filename }}
109109
{{- if .Values.csi.plugin.extraEnv }}
110110
{{- toYaml .Values.csi.plugin.extraEnv | nindent 12 }}
111111
{{- end }}
@@ -163,7 +163,7 @@ spec:
163163
{{- else if .Values.secret.hostMount }}
164164
- name: cloud-config
165165
hostPath:
166-
path: /etc/kubernetes
166+
path: /etc/config
167167
{{- end }}
168168
{{- with .Values.csi.plugin.volumes }}
169169
{{- toYaml . | nindent 8 }}

charts/cinder-csi-plugin/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ csi:
8686
mountPath: /etc/cacert
8787
readOnly: true
8888
- name: cloud-config
89-
mountPath: /etc/kubernetes
89+
mountPath: /etc/config
9090
readOnly: true
9191
nodePlugin:
9292
dnsPolicy: ClusterFirstWithHostNet

0 commit comments

Comments
 (0)