Merge pull request #387 from jpeeler/master

Update all-in-one proposal to reflect reality

1 files 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 aa12c118..9c91f102 100644
--- a/contributors/design-proposals/all-in-one-volume.md
+++ b/contributors/design-proposals/all-in-one-volume.md
@@ -186,31 +186,40 @@ 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"`
 }
-```
 
-### Additional required modifications
+type SecretProjection struct {
+    LocalObjectReference
+    Items []KeyToPath
+    Optional *bool
+}
 
-Add to the VolumeSource struct:
+type ConfigMapProjection struct {
+    LocalObjectReference
+    Items []KeyToPath
+    Optional *bool
+}
 
-```go
-Projected *Projections `json:"projected,omitempty"`
-// (other existing fields omitted for brevity)
+type DownwardAPIProjection struct {
+    Items []DownwardAPIVolumeFile
+}
 ```
 
-Add to the SecretVolumeSource struct:
+### Additional required modifications
+
+Add to the VolumeSource struct:
 
 ```go
-LocalObjectReference `json:"name,omitempty"`
+Projected *ProjectedVolumeSource `json:"projected,omitempty"`
 // (other existing fields omitted for brevity)
 ```