github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Automatic merge from submit-queue

Change merge key for VolumeMount to mountPath

Fixes #34800
pull/6/head
Kubernetes Submit Queue 2016-10-19 00:21:03 -07:00 committed by GitHub
parent 743e0689cc 837443d37a
commit 3fc8cff07d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/v1/types.go
View File

@ -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.