From 837443d37aaf214485c8f4558bb0d0eb42cbb1a7 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 18 Oct 2016 15:25:51 -0700 Subject: [PATCH] Change merge key for VolumeMount to mountPath --- pkg/api/v1/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index fa00a3c9201..93f304fc24e 100644 --- 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.