From a876d97a574350c6384087ed7af72cba1ee6d767 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Tue, 21 Feb 2017 15:47:35 -0500
Subject: [PATCH] Update all-in-one proposal to reflect reality

---
 .../design-proposals/all-in-one-volume.md     | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/contributors/design-proposals/all-in-one-volume.md b/contributors/design-proposals/all-in-one-volume.md
index aa12c118e..9c91f102c 100644
--- a/contributors/design-proposals/all-in-one-volume.md
+++ b/contributors/design-proposals/all-in-one-volume.md
@@ -186,15 +186,31 @@ anything preceding it as before.
 ### Proposed API objects
 
 ```go
-type Projections struct {
+type ProjectedVolumeSource struct {
     Sources           []VolumeProjection `json:"sources"`
-    DefaultMode       *int32                   `json:"defaultMode,omitempty"`
+    DefaultMode       *int32             `json:"defaultMode,omitempty"`
 }
 
 type VolumeProjection struct {
-    Secret      *SecretVolumeSource      `json:"secret,omitempty"`
-    ConfigMap   *ConfigMapVolumeSource   `json:"configMap,omitempty"`
-    DownwardAPI *DownwardAPIVolumeSource `json:"downwardAPI,omitempty"`
+    Secret      *SecretProjection      `json:"secret,omitempty"`
+    ConfigMap   *ConfigMapProjection   `json:"configMap,omitempty"`
+    DownwardAPI *DownwardAPIProjection `json:"downwardAPI,omitempty"`
+}
+
+type SecretProjection struct {
+    LocalObjectReference
+    Items []KeyToPath
+    Optional *bool
+}
+
+type ConfigMapProjection struct {
+    LocalObjectReference
+    Items []KeyToPath
+    Optional *bool
+}
+
+type DownwardAPIProjection struct {
+    Items []DownwardAPIVolumeFile
 }
 ```
 
@@ -203,14 +219,7 @@ type VolumeProjection struct {
 Add to the VolumeSource struct:
 
 ```go
-Projected *Projections `json:"projected,omitempty"`
-// (other existing fields omitted for brevity)
-```
-
-Add to the SecretVolumeSource struct:
-
-```go
-LocalObjectReference `json:"name,omitempty"`
+Projected *ProjectedVolumeSource `json:"projected,omitempty"`
 // (other existing fields omitted for brevity)
 ```