Skip to content

Commit 3909137

Browse files
authored
Remove trailing whitespace (kubernetes#1076)
Signed-off-by: ialidzhikov <i.alidjikov@gmail.com>
1 parent 9bcaa4a commit 3909137

File tree

21 files changed

+69
-70
lines changed

21 files changed

+69
-70
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
- name: cinder-csi-plugin
7070
image: "{{ .Values.csi.plugin.image.repository }}:{{ .Values.csi.plugin.image.tag }}"
7171
imagePullPolicy: {{ .Values.csi.plugin.image.pullPolicy }}
72-
args :
72+
args:
7373
- /bin/cinder-csi-plugin
7474
- "--nodeid=$(NODE_ID)"
7575
- "--endpoint=$(CSI_ENDPOINT)"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
allowPrivilegeEscalation: true
5050
image: "{{ .Values.csi.plugin.image.repository }}:{{ .Values.csi.plugin.image.tag }}"
5151
imagePullPolicy: {{ .Values.csi.plugin.image.pullPolicy }}
52-
args :
52+
args:
5353
- /bin/cinder-csi-plugin
5454
- "--nodeid=$(NODE_ID)"
5555
- "--endpoint=$(CSI_ENDPOINT)"

docs/using-cinder-csi-plugin.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Check [kubernetes CSI Docs](https://kubernetes-csi.github.io/docs/) for flag det
3232

3333
### Deploy
3434

35-
You can either use the manifests under `manifests/cinder-csi-plugin` or the Helm chart `charts/cinder-csi-plugin`.
35+
You can either use the manifests under `manifests/cinder-csi-plugin` or the Helm chart `charts/cinder-csi-plugin`.
3636

3737
#### Using the Helm chart
3838

@@ -85,7 +85,7 @@ csi-cinder-controllerplugin 4/4 Running 0 29h
8585
csi-cinder-nodeplugin 2/2 Running 0 46h
8686
```
8787

88-
you can get information about CSI Drivers running in a cluster, using **CSIDriver** object
88+
you can get information about CSI Drivers running in a cluster, using **CSIDriver** object
8989

9090
```
9191
$ kubectl get csidrivers.storage.k8s.io
@@ -109,15 +109,15 @@ Spec:
109109
Pod Info On Mount: false
110110
Events: <none>
111111
```
112-
112+
113113
### Example Nginx application usage
114114

115115
After performing above steps, you can try to create StorageClass, PersistentVolumeClaim and pod to consume it.
116116
Try following command by using [examples](https://github.com/kubernetes/cloud-provider-openstack/blob/master/examples/cinder-csi-plugin/nginx.yaml):
117117

118118
```kubectl -f examples/cinder-csi-plugin/nginx.yaml create```
119119

120-
You will get pvc which claims one volume from cinder
120+
You will get pvc which claims one volume from cinder
121121

122122
```
123123
$ kubectl get pvc
@@ -214,7 +214,7 @@ Supported parameters for VolumeSnapshotClass:
214214
* `force-create`: Support creating snapshot for a volume in in-use status.
215215

216216
For Snapshot Creation and Volume Restore, please follow below steps:
217-
* Create Storage Class, Snapshot Class and PVC
217+
* Create Storage Class, Snapshot Class and PVC
218218
```
219219
$ kubectl -f examples/cinder-csi-plugin/snapshot/example.yaml create
220220
storageclass.storage.k8s.io/csi-sc-cinderplugin created
@@ -223,19 +223,19 @@ persistentvolumeclaim/pvc-snapshot-demo created
223223
```
224224

225225
* Verify that pvc is bounded
226-
```
226+
```
227227
$ kubectl get pvc --all-namespaces
228228
NAMESPACE NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
229229
default pvc-snapshot-demo Bound pvc-4699fa78-4149-4772-b900-9536891fe200 1Gi RWO
230-
```
231-
* Create Snapshot of the PVC
230+
```
231+
* Create Snapshot of the PVC
232232
```
233233
$ kubectl -f examples/cinder-csi-plugin/snapshot/snapshotcreate.yaml create
234234
volumesnapshot.snapshot.storage.k8s.io/new-snapshot-demo created
235235
```
236-
* Verify that snapshot is created
236+
* Verify that snapshot is created
237237
```
238-
$ kubectl get volumesnapshot
238+
$ kubectl get volumesnapshot
239239
NAME AGE
240240
new-snapshot-demo 2m54s
241241
$ openstack snapshot list
@@ -244,13 +244,13 @@ $ openstack snapshot list
244244
+--------------------------------------+-----------------------------------------------+-------------+-----------+------+
245245
| 1b673af2-3a69-4cc6-8dd0-9ac62e29df9e | snapshot-332a8a7e-c5f2-4df9-b6a0-cf52e18e72b1 | None | available | 1 |
246246
+--------------------------------------+-----------------------------------------------+-------------+-----------+------+
247-
```
248-
* Restore volume from snapshot
247+
```
248+
* Restore volume from snapshot
249249
```
250250
$ kubectl -f examples/cinder-csi-plugin/snapshot/snapshotrestore.yaml create
251251
persistentvolumeclaim/snapshot-demo-restore created
252252
```
253-
* Verify that volume from snapshot is created
253+
* Verify that volume from snapshot is created
254254
```
255255
$ kubectl get pvc
256256
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
@@ -263,7 +263,7 @@ $ openstack volume list
263263
+--------------------------------------+------------------------------------------+-----------+------+-------------------------------------------------+
264264
| 07522a3b-95db-4bfa-847c-ffa179d08c39 | pvc-400b1ca8-8786-435f-a6cc-f684afddbbea | available | 1 | |
265265
| bf8f9ae9-87b4-42bb-b74c-ba4645634be6 | pvc-4699fa78-4149-4772-b900-9536891fe200 | available | 1 | |
266-
```
266+
```
267267
### Example: Raw Block Volume
268268

269269
For consuming a cinder volume as a raw block device
@@ -351,20 +351,20 @@ Not all hypervizors have a `/sys/class/block/XXX/device/rescan` location, theref
351351

352352
### Inline Volumes
353353

354-
This feature allows CSI volumes to be directly embedded in the Pod specification instead of a PersistentVolume. Volumes specified in this way are ephemeral and do not persist across Pod restarts. As of Kubernetes v1.16 this feature is beta so enabled by default. To enable this feature for CSI Driver, `volumeLifecycleModes` needs to be specified in [CSIDriver](https://github.com/kubernetes/cloud-provider-openstack/blob/master/manifests/cinder-csi-plugin/csi-cinder-driver.yaml) object. The driver can run in `Persistent` mode, `Ephemeral` or in both modes. `podInfoOnMount` must be `true` to use this feature.
354+
This feature allows CSI volumes to be directly embedded in the Pod specification instead of a PersistentVolume. Volumes specified in this way are ephemeral and do not persist across Pod restarts. As of Kubernetes v1.16 this feature is beta so enabled by default. To enable this feature for CSI Driver, `volumeLifecycleModes` needs to be specified in [CSIDriver](https://github.com/kubernetes/cloud-provider-openstack/blob/master/manifests/cinder-csi-plugin/csi-cinder-driver.yaml) object. The driver can run in `Persistent` mode, `Ephemeral` or in both modes. `podInfoOnMount` must be `true` to use this feature.
355355

356356
Example:
357-
1. Deploy CSI Driver, in default yamls both modes are enabled.
357+
1. Deploy CSI Driver, in default yamls both modes are enabled.
358358
```
359359
$ kubectl create -f manifests/cinder-csi-plugin/
360360
```
361361
2. Create a pod with inline volume
362362
```
363-
$ kubectl create -f examples/cinder-csi-plugin/inline/inline-example.yaml
363+
$ kubectl create -f examples/cinder-csi-plugin/inline/inline-example.yaml
364364
```
365365
3. Get the pod description, verify created volume in Volumes section.
366366
```
367-
$ kubectl describe pod
367+
$ kubectl describe pod
368368
369369
Volumes:
370370
my-csi-volume:

docs/using-openstack-cloud-controller-manager.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For more information about cloud-controller-manager, please see:
2121
- <https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager>
2222
- <https://kubernetes.io/docs/tasks/administer-cluster/developing-cloud-controller-manager/>
2323

24-
**NOTE: Now, the openstack-cloud-controller-manager implementation is based on OpenStack Octavia, Neutron-LBaaS has been deprecated in OpenStack since Queens release and no longer maintained in openstack-cloud-controller-manager. So make sure to use Octavia if upgrade to the latest openstack-cloud-controller-manager docker image.**
24+
**NOTE: Now, the openstack-cloud-controller-manager implementation is based on OpenStack Octavia, Neutron-LBaaS has been deprecated in OpenStack since Queens release and no longer maintained in openstack-cloud-controller-manager. So make sure to use Octavia if upgrade to the latest openstack-cloud-controller-manager docker image.**
2525

2626
## Deploy a Kubernetes cluster with openstack-cloud-controller-manager using kubeadm
2727

@@ -98,7 +98,7 @@ The options in `Global` section are used for openstack-cloud-controller-manager
9898
* `domain-name`
9999
Keystone user domain name, not required if `domain-id` is set.
100100
* `tenant-id`
101-
Keystone project ID. When using Keystone V3 - which changed the identifier `tenant` to `project` - the `tenant-id` value is automatically mapped to the project construct in the API.
101+
Keystone project ID. When using Keystone V3 - which changed the identifier `tenant` to `project` - the `tenant-id` value is automatically mapped to the project construct in the API.
102102
103103
`tenant-id` is not needed when using `trust-id` or [Keystone application credential](https://docs.openstack.org/keystone/latest/user/application_credentials.html)
104104
* `tenant-name`
@@ -107,7 +107,7 @@ The options in `Global` section are used for openstack-cloud-controller-manager
107107
Keystone project domain ID.
108108
* `tenant-domain-name`
109109
Keystone project domain name.
110-
* `user-domain-id`:
110+
* `user-domain-id`
111111
Keystone user domain ID.
112112
* `user-domain-name`
113113
Keystone user domain name.
@@ -183,7 +183,7 @@ Although the openstack-cloud-controller-manager was initially implemented with N
183183
* `metadataService` - Only retrieve instance metadata from the metadata service.
184184
* `metadataService,configDrive` - Retrieve instance metadata from the metadata service first if available, then the configuration drive.
185185
186-
Not all OpenStack clouds provide both configuration drive and metadata service though and only one or the other may be available which is why the default is to check both. Especially, the metadata on the config drive may grow stale over time, whereas the metadata service always provides the most up to date data.
186+
Not all OpenStack clouds provide both configuration drive and metadata service though and only one or the other may be available which is why the default is to check both. Especially, the metadata on the config drive may grow stale over time, whereas the metadata service always provides the most up to date data.
187187
188188
## Exposing applications using services of LoadBalancer type
189189

examples/cinder-csi-plugin/inline/inline-example.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
kind: Pod
3-
metadata:
3+
metadata:
44
name: inline-pod
55
spec:
66
containers:
@@ -18,4 +18,3 @@ spec:
1818
capacity: 1Gi # default is 1Gi
1919
readOnly: false # default is false
2020
fsType: ext4 # default is ext4
21-

examples/cinder-csi-plugin/nginx.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
apiVersion: v1
2525
kind: Pod
2626
metadata:
27-
name: nginx
27+
name: nginx
2828
spec:
2929
containers:
3030
- image: nginx
@@ -35,7 +35,7 @@ spec:
3535
protocol: TCP
3636
volumeMounts:
3737
- mountPath: /var/lib/www/html
38-
name: csi-data-cinderplugin
38+
name: csi-data-cinderplugin
3939
volumes:
4040
- name: csi-data-cinderplugin
4141
persistentVolumeClaim:

examples/cinder-csi-plugin/resize/example.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
apiVersion: v1
2626
kind: Pod
2727
metadata:
28-
name: nginx
28+
name: nginx
2929
spec:
3030
containers:
3131
- image: nginx
@@ -36,7 +36,7 @@ spec:
3636
protocol: TCP
3737
volumeMounts:
3838
- mountPath: /var/lib/www/html
39-
name: csi-data-cinderplugin
39+
name: csi-data-cinderplugin
4040
volumes:
4141
- name: csi-data-cinderplugin
4242
persistentVolumeClaim:

examples/cinder-csi-plugin/snapshot/snapshotrestore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
storageClassName: csi-sc-cinderplugin
77
dataSource:
8-
name: new-snapshot-demo
8+
name: new-snapshot-demo
99
kind: VolumeSnapshot
1010
apiGroup: snapshot.storage.k8s.io
1111
accessModes:

examples/loadbalancers/README.MD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadata:
3838
name: external-http-nginx-service
3939
annotations:
4040
service.beta.kubernetes.io/openstack-internal-load-balancer: "false"
41-
loadbalancer.openstack.org/floating-network-id: "9be23551-38e2-4d27-b5ea-ea2ea1321bd6"
41+
loadbalancer.openstack.org/floating-network-id: "9be23551-38e2-4d27-b5ea-ea2ea1321bd6"
4242
spec:
4343
selector:
4444
app: nginx
@@ -111,7 +111,7 @@ apiVersion: v1
111111
metadata:
112112
name: internal-http-nginx-service
113113
annotations:
114-
service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
114+
service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
115115
spec:
116116
selector:
117117
app: nginx

examples/manila-csi-plugin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
1. Make sure you've completed all the steps in `docs/using-manila-csi-plugin.md`: e.g. you've deployed CSI NFS and CSI Manila plugins and CSI Manila is running with `--share-protocol-selector=NFS` and `--fwdendpoint=unix:///csi/csi-nfsplugin/csi.sock` (or similar, based on your environment)
44
2. Modify `secrets.yaml` to suite your OpenStack cloud environment. Refer to the _"Secrets, authentication"_ section of CSI Manila docs. You may also use helper scripts from `examples/manila-provisioner` to generate the Secrets manifest.
55
3. The same steps apply to all supported Manila share protocols
6-
4. `exec-bash.sh`, `logs.sh` are convenience scripts for debugging CSI Manila
6+
4. `exec-bash.sh`, `logs.sh` are convenience scripts for debugging CSI Manila
77

88
## Example CSI Manila usage with NFS shares
99

@@ -32,7 +32,7 @@ Files marked with `--> ... <--` may need to be customized.
3232

3333
* `dynamic-provisioning/` : creates a new Manila NFS share and mounts it in a Pod.
3434
* `static-provisioning/` : fetches an existing Manila NFS share and mounts it in a Pod
35-
* `snapshot/` : takes a snapshot from a PVC source, restores it into a new share and mounts it in a Pod. Deploy manifests in `dynamic-provisioning/` first
35+
* `snapshot/` : takes a snapshot from a PVC source, restores it into a new share and mounts it in a Pod. Deploy manifests in `dynamic-provisioning/` first
3636
* `topology-aware/` : topology-aware dynamic provisioning
3737

3838
Make sure the `provisioner` field in `storageclass.yaml` and `snapshotclass.yaml` matches the driver name in your deployment!

0 commit comments

Comments
 (0)