From 62c7e4df69b34f9b79068bbb12b1c9bcc4e53349 Mon Sep 17 00:00:00 2001 From: Ricky Pai Date: Tue, 20 Jun 2017 11:45:19 -0700 Subject: [PATCH] fix patchMergyKey to ip instead of IP --- pkg/api/v1/types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 9bbd07a9ddd..cdb0088c46d 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -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 // file if specified. This is only valid for non-hostNetwork pods. // +optional - // +patchMergeKey=IP + // +patchMergeKey=ip // +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