Merge pull request kubernetes#5794 from thockin/gcepd_name

Rename the JSON for GCEPersistentDisk, fix examples
duda · Mar 24, 2015 · 5c40bd6 · 5c40bd6
2 parents fe65aa5 + 7ce59d9
commit 5c40bd6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/examples/gce-pd/v1beta3/testpd.yaml b/examples/gce-pd/v1beta3/testpd.yaml
@@ -15,7 +15,7 @@ spec:
           mountPath: /testpd
   volumes:
     - name: testpd
-      persistentDisk:
+      gcePersistentDisk:
         # This GCE PD must already exist.
         pdName: %insert_pd_name_here%
         fsType: ext4
diff --git a/examples/mysql-wordpress-pd/v1beta3/mysql.yaml b/examples/mysql-wordpress-pd/v1beta3/mysql.yaml
@@ -33,7 +33,7 @@ spec:
               mountPath: /var/lib/mysql
       volumes:
         - name: mysql-persistent-storage
-          persistentDisk:
+          gcePersistentDisk:
             # This GCE PD must already exist.
             pdName: mysql-disk
             fsType: ext4

diff --git a/examples/mysql-wordpress-pd/v1beta3/wordpress.yaml b/examples/mysql-wordpress-pd/v1beta3/wordpress.yaml
@@ -30,7 +30,7 @@ spec:
               mountPath: /var/www/html
       volumes:
         - name: wordpress-persistent-storage
-          persistentDisk:
+          gcePersistentDisk:
             # This GCE PD must already exist.
             pdName: wordpress-disk
             fsType: ext4

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -186,7 +186,7 @@ type VolumeSource struct {
 	EmptyDir *EmptyDirVolumeSource `json:"emptyDir"`
 	// GCEPersistentDisk represents a GCE Disk resource that is attached to a
 	// 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 *GitRepoVolumeSource `json:"gitRepo"`
 	// Secret represents a secret that should populate this volume.