From c26e5e4e5f1288e5f681b0cb5b98dd2b5d112090 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 3 Mar 2015 14:48:55 -0800 Subject: [PATCH] Embed VolumeSource in v1beta3 and internal. --- cassandra/v1beta3/cassandra-controller.yaml | 3 +-- mysql-wordpress-pd/v1beta3/mysql.yaml | 10 ++++------ mysql-wordpress-pd/v1beta3/wordpress.yaml | 10 ++++------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/cassandra/v1beta3/cassandra-controller.yaml b/cassandra/v1beta3/cassandra-controller.yaml index 66af9a13..a860c960 100644 --- a/cassandra/v1beta3/cassandra-controller.yaml +++ b/cassandra/v1beta3/cassandra-controller.yaml @@ -38,6 +38,5 @@ spec: name: data volumes: - name: data - source: - emptyDir: {} + emptyDir: {} diff --git a/mysql-wordpress-pd/v1beta3/mysql.yaml b/mysql-wordpress-pd/v1beta3/mysql.yaml index 9ebc4245..014a4429 100644 --- a/mysql-wordpress-pd/v1beta3/mysql.yaml +++ b/mysql-wordpress-pd/v1beta3/mysql.yaml @@ -33,10 +33,8 @@ spec: mountPath: /var/lib/mysql volumes: - name: mysql-persistent-storage - source: - # emptyDir: {} - persistentDisk: - # This GCE PD must already exist. - pdName: mysql-disk - fsType: ext4 + persistentDisk: + # This GCE PD must already exist. + pdName: mysql-disk + fsType: ext4 diff --git a/mysql-wordpress-pd/v1beta3/wordpress.yaml b/mysql-wordpress-pd/v1beta3/wordpress.yaml index 3ee5b12f..4912763e 100644 --- a/mysql-wordpress-pd/v1beta3/wordpress.yaml +++ b/mysql-wordpress-pd/v1beta3/wordpress.yaml @@ -30,10 +30,8 @@ spec: mountPath: /var/www/html volumes: - name: wordpress-persistent-storage - source: - # emptyDir: {} - persistentDisk: - # This GCE PD must already exist. - pdName: wordpress-disk - fsType: ext4 + persistentDisk: + # This GCE PD must already exist. + pdName: wordpress-disk + fsType: ext4