github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

fix patchMergyKey to ip instead of IP

Browse Source
This commit is contained in:
Ricky Pai 2017-06-20 11:45:19 -07:00
parent 35f9a047f5
commit 62c7e4df69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2517,9 +2517,9 @@ type PodSpec struct {
// HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts // HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts
// file if specified. This is only valid for non-hostNetwork pods. // file if specified. This is only valid for non-hostNetwork pods.
// +optional // +optional
// +patchMergeKey=IP // +patchMergeKey=ip
// +patchStrategy=merge // +patchStrategy=merge
HostAliases []HostAlias `json:"hostAliases,omitempty" patchStrategy:"merge" patchMergeKey:"IP" protobuf:"bytes,23,rep,name=hostAliases"` HostAliases []HostAlias `json:"hostAliases,omitempty" patchStrategy:"merge" patchMergeKey:"ip" protobuf:"bytes,23,rep,name=hostAliases"`
} }
// HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the // HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the