Merge pull request #35071 from thockin/volume-mount-merge-key

Kubernetes Submit Queue · web-flow · commit 3fc8cff07d66 · 2016-10-19T00:21:03.000-07:00
Automatic merge from submit-queue Change merge key for VolumeMount to mountPath Fixes #34800
diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go
@@ -1403,7 +1403,7 @@ type Container struct {
 	// Pod volumes to mount into the container's filesystem.
 	// Cannot be updated.
 	// +optional
-	VolumeMounts []VolumeMount `json:"volumeMounts,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,9,rep,name=volumeMounts"`
+	VolumeMounts []VolumeMount `json:"volumeMounts,omitempty" patchStrategy:"merge" patchMergeKey:"mountPath" protobuf:"bytes,9,rep,name=volumeMounts"`
 	// Periodic probe of container liveness.
 	// Container will be restarted if the probe fails.
 	// Cannot be updated.
