Skip to content

K
k3s
Commit 3fc8cff0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

Automatic merge from submit-queue Change merge key for VolumeMount to mountPath Fixes #34800
parents 743e0689 837443d3
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/api/v1/types.go
View file @ 3fc8cff0
...@@ -1403,7 +1403,7 @@ type Container struct { ...@@ -1403,7 +1403,7 @@ type Container struct {
// Pod volumes to mount into the container's filesystem. // Pod volumes to mount into the container's filesystem.
// Cannot be updated. // Cannot be updated.
// +optional // +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. // Periodic probe of container liveness.
// Container will be restarted if the probe fails. // Container will be restarted if the probe fails.
// Cannot be updated. // Cannot be updated.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment