Merge pull request #5794 from thockin/gcepd_name

Rename the JSON for GCEPersistentDisk, fix examples
This commit is contained in:
Robert Bailey 2015-03-23 17:12:32 -07:00
commit 5c40bd61e4
4 changed files with 4 additions and 4 deletions

View File

@ -15,7 +15,7 @@ spec:
mountPath: /testpd mountPath: /testpd
volumes: volumes:
- name: testpd - name: testpd
persistentDisk: gcePersistentDisk:
# This GCE PD must already exist. # This GCE PD must already exist.
pdName: %insert_pd_name_here% pdName: %insert_pd_name_here%
fsType: ext4 fsType: ext4

View File

@ -33,7 +33,7 @@ spec:
mountPath: /var/lib/mysql mountPath: /var/lib/mysql
volumes: volumes:
- name: mysql-persistent-storage - name: mysql-persistent-storage
persistentDisk: gcePersistentDisk:
# This GCE PD must already exist. # This GCE PD must already exist.
pdName: mysql-disk pdName: mysql-disk
fsType: ext4 fsType: ext4

View File

@ -30,7 +30,7 @@ spec:
mountPath: /var/www/html mountPath: /var/www/html
volumes: volumes:
- name: wordpress-persistent-storage - name: wordpress-persistent-storage
persistentDisk: gcePersistentDisk:
# This GCE PD must already exist. # This GCE PD must already exist.
pdName: wordpress-disk pdName: wordpress-disk
fsType: ext4 fsType: ext4

View File

@ -186,7 +186,7 @@ type VolumeSource struct {
EmptyDir *EmptyDirVolumeSource `json:"emptyDir"` EmptyDir *EmptyDirVolumeSource `json:"emptyDir"`
// GCEPersistentDisk represents a GCE Disk resource that is attached to a // GCEPersistentDisk represents a GCE Disk resource that is attached to a
// kubelet's host machine and then exposed to the pod. // kubelet's host machine and then exposed to the pod.
GCEPersistentDisk *GCEPersistentDiskVolumeSource `json:"persistentDisk"` GCEPersistentDisk *GCEPersistentDiskVolumeSource `json:"gcePersistentDisk"`
// GitRepo represents a git repository at a particular revision. // GitRepo represents a git repository at a particular revision.
GitRepo *GitRepoVolumeSource `json:"gitRepo"` GitRepo *GitRepoVolumeSource `json:"gitRepo"`
// Secret represents a secret that should populate this volume. // Secret represents a secret that should populate this volume.