From 7ce59d9bc745757ecdecf840978d77d07d5acd5a Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Mon, 23 Mar 2015 10:25:56 -0700
Subject: [PATCH] Rename the JSON for GCEPersistentDisk in internal

I know the internal JSO tags are slated for death.  Until then, make them
correct.  Also fix some examples of v1b3 conversions that did not rename the
JSON field.
---
 examples/gce-pd/v1beta3/testpd.yaml                | 2 +-
 examples/mysql-wordpress-pd/v1beta3/mysql.yaml     | 2 +-
 examples/mysql-wordpress-pd/v1beta3/wordpress.yaml | 2 +-
 pkg/api/types.go                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/gce-pd/v1beta3/testpd.yaml b/examples/gce-pd/v1beta3/testpd.yaml
index 6558bde9e39..336dd763bf4 100644
--- 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
index 014a4429bda..5361c281ed5 100644
--- 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
index 4912763e307..24efa993407 100644
--- 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
index f34a71e98b2..759c33586cb 100644
--- 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.