Skip to content

Commit 46e0046

Browse files
authored
Merge pull request #354 from Madhu-1/fix-stale-pr-1
Fix indentation problem
2 parents 316534f + c59f408 commit 46e0046

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

deploy/charts/ceph-csi-drivers/templates/operatorConfig.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
grpcTimeout: {{ $config.driverSpecDefaults.grpcTimeout }}
3636
snapshotPolicy: {{ $config.driverSpecDefaults.snapshotPolicy }}
3737
generateOMapInfo: {{ $config.driverSpecDefaults.generateOMapInfo }}
38-
fsGroupPolicy: {{ $config.driverSpecDefaultsfsGroupPolicy }}
38+
fsGroupPolicy: {{ $config.driverSpecDefaults.fsGroupPolicy }}
3939
{{- if $config.driverSpecDefaults.encryption }}
4040
{{- if $config.driverSpecDefaults.encryption.configMapRef.name }}
4141
encryption:
@@ -48,20 +48,22 @@ spec:
4848
cephFsClientType: {{ $config.driverSpecDefaults.cephFsClientType }}
4949
kernelMountOptions:
5050
{{- if $config.driverSpecDefaults.kernelMountOptions }}
51-
{{- toYaml $config.driverSpecDefaults.kernelMountOptions | nindent 4 }}
51+
{{- toYaml $config.driverSpecDefaults.kernelMountOptions | nindent 6 }}
5252
{{- else }}
5353
{} # Empty map if not defined
5454
{{- end }}
5555
fuseMountOptions:
5656
{{- if $config.driverSpecDefaults.fuseMountOptions }}
57-
{{- toYaml $config.driverSpecDefaults.fuseMountOptions | nindent 4 }}
57+
{{- toYaml $config.driverSpecDefaults.fuseMountOptions | nindent 6 }}
5858
{{- else }}
5959
{} # Empty map if not defined
6060
{{- end }}
6161
# Node Plugin Configuration
6262
nodePlugin:
6363
{{- if $config.driverSpecDefaults.nodePlugin }}
64+
{{- if $config.driverSpecDefaults.nodePlugin.updateStrategy }}
6465
updateStrategy: {{ $config.driverSpecDefaults.nodePlugin.updateStrategy | toYaml | nindent 8 }}
66+
{{- end }}
6567
{{- if $config.driverSpecDefaults.nodePlugin.resources }}
6668
resources:
6769
registrar: {{ $config.driverSpecDefaults.nodePlugin.resources.registrar | toYaml | nindent 4 }}

deploy/charts/ceph-csi-drivers/values.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ operatorConfig:
111111
# Pod's priority class name
112112
priorityClassName: ""
113113

114+
# kubelet directory path (default is "/var/lib/kubelet")
115+
kubeletDirPath: "/var/lib/kubelet"
116+
114117
# Custom labels for the pod
115118
labels: {}
116119

@@ -120,6 +123,9 @@ operatorConfig:
120123
# Affinity settings for the pod
121124
affinity: {}
122125

126+
# Daemonset update strategy.
127+
updateStrategy: {}
128+
123129
# List of tolerations for the pod
124130
tolerations: []
125131

@@ -149,6 +155,12 @@ operatorConfig:
149155
# List of tolerations for the controller plugin
150156
tolerations: []
151157

158+
# Affinity settings for the pod
159+
affinity: {}
160+
161+
# Image pull policy
162+
imagePullPolicy: "IfNotPresent"
163+
152164
# Drivers configuration
153165
drivers:
154166
rbd: # Driver name for RBD

docs/helm-charts/drivers-chart.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@ The following table lists the configurable parameters of the ceph-csi-drivers ch
161161
| `operatorConfig.driverSpecDefaults.attachRequired` | | `true` |
162162
| `operatorConfig.driverSpecDefaults.cephFsClientType` | | `"kernel"` |
163163
| `operatorConfig.driverSpecDefaults.clusterName` | | `""` |
164+
| `operatorConfig.driverSpecDefaults.controllerPlugin.affinity` | | `{}` |
164165
| `operatorConfig.driverSpecDefaults.controllerPlugin.deploymentStrategy` | | `{}` |
165166
| `operatorConfig.driverSpecDefaults.controllerPlugin.hostNetwork` | | `false` |
167+
| `operatorConfig.driverSpecDefaults.controllerPlugin.imagePullPolicy` | | `"IfNotPresent"` |
166168
| `operatorConfig.driverSpecDefaults.controllerPlugin.privileged` | | `false` |
167169
| `operatorConfig.driverSpecDefaults.controllerPlugin.replicas` | | `1` |
168170
| `operatorConfig.driverSpecDefaults.controllerPlugin.resources` | | `{}` |
@@ -184,9 +186,11 @@ The following table lists the configurable parameters of the ceph-csi-drivers ch
184186
| `operatorConfig.driverSpecDefaults.nodePlugin.affinity` | | `{}` |
185187
| `operatorConfig.driverSpecDefaults.nodePlugin.annotations` | | `{}` |
186188
| `operatorConfig.driverSpecDefaults.nodePlugin.imagePullPolicy` | | `"IfNotPresent"` |
189+
| `operatorConfig.driverSpecDefaults.nodePlugin.kubeletDirPath` | | `"/var/lib/kubelet"` |
187190
| `operatorConfig.driverSpecDefaults.nodePlugin.labels` | | `{}` |
188191
| `operatorConfig.driverSpecDefaults.nodePlugin.priorityClassName` | | `""` |
189192
| `operatorConfig.driverSpecDefaults.nodePlugin.tolerations` | | `[]` |
193+
| `operatorConfig.driverSpecDefaults.nodePlugin.updateStrategy` | | `{}` |
190194
| `operatorConfig.driverSpecDefaults.nodePlugin.volumes` | | `[]` |
191195
| `operatorConfig.driverSpecDefaults.snapshotPolicy` | | `"none"` |
192196
| `operatorConfig.name` | | `"ceph-csi-operator-config"` |

docs/kubernetes-installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- [3. Deploy Ceph-CSI Drivers](#3-deploy-ceph-csi-drivers)
1616
- [3.1 Deploy the RBD Driver](#31-deploy-the-rbd-driver)
1717
- [3.2 Deploy the CephFS Driver](#32-deploy-the-cephfs-driver)
18-
- [3.3 Deploy the Ceph-NFS Driver](#33-deploy-the-ceph-nfs-driver)
18+
- [3.3 Deploy the Ceph-NFS Driver](#33-deploy-the-ceph-nfs-driver)
1919
- [4. Verify Installation](#4-verify-installation)
2020
- [5. Create CephConnection](#5-create-cephconnection)
2121
- [6. Create ClientProfile](#6-create-clientprofile)
@@ -155,7 +155,7 @@ metadata:
155155
' | kubectl create -f -
156156
```
157157

158-
### 3.3 Deploy the Ceph-NFS Driver
158+
#### 3.3 Deploy the Ceph-NFS Driver
159159

160160
```console
161161
echo '

0 commit comments

Comments
 (0)