generated files

pkg/api/v1/generated.proto

@@ -1193,6 +1193,16 @@ message Handler {
   optional TCPSocketAction tcpSocket = 3;
 }
 
+// HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+// pod's hosts file.
+message HostAlias {
+  // IP address of the host file entry.
+  optional string ip = 1;
+
+  // Hostnames for the the above IP address.
+  repeated string hostnames = 2;
+}
+
 // Represents a host path mapped into a pod.
 // Host path volumes do not support ownership management or SELinux relabeling.
 message HostPathVolumeSource {
@@ -2734,6 +2744,13 @@ message PodSpec {
   // If specified, the pod's tolerations.
   // +optional
   repeated Toleration tolerations = 22;
+
+  // 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
+  // +patchStrategy=merge
+  repeated HostAlias hostMappings = 23;
 }
 
 // PodStatus represents information about the status of a pod. Status may trail the actual

pkg/api/v1/types_swagger_doc_generated.go

@@ -640,6 +640,16 @@ func (Handler) SwaggerDoc() map[string]string {
 	return map_Handler
 }
 
+var map_HostAlias = map[string]string{
+	"":          "HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the pod's hosts file.",
+	"ip":        "IP address of the host file entry.",
+	"hostnames": "Hostnames for the the above IP address.",
+}
+
+func (HostAlias) SwaggerDoc() map[string]string {
+	return map_HostAlias
+}
+
 var map_HostPathVolumeSource = map[string]string{
 	"":     "Represents a host path mapped into a pod. Host path volumes do not support ownership management or SELinux relabeling.",
 	"path": "Path of the directory on the host. More info: http://kubernetes.io/docs/user-guide/volumes#hostpath",
@@ -1350,6 +1360,7 @@ var map_PodSpec = map[string]string{
 	"affinity":                      "If specified, the pod's scheduling constraints",
 	"schedulerName":                 "If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.",
 	"tolerations":                   "If specified, the pod's tolerations.",
+	"hostMappings":                  "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.",
 }
 
 func (PodSpec) SwaggerDoc() map[string]string {

pkg/api/v1/zz_generated.conversion.go

@@ -145,6 +145,8 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 		Convert_api_HTTPHeader_To_v1_HTTPHeader,
 		Convert_v1_Handler_To_api_Handler,
 		Convert_api_Handler_To_v1_Handler,
+		Convert_v1_HostAlias_To_api_HostAlias,
+		Convert_api_HostAlias_To_v1_HostAlias,
 		Convert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource,
 		Convert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource,
 		Convert_v1_ISCSIVolumeSource_To_api_ISCSIVolumeSource,
@@ -1788,6 +1790,28 @@ func Convert_api_Handler_To_v1_Handler(in *api.Handler, out *Handler, s conversi
 	return autoConvert_api_Handler_To_v1_Handler(in, out, s)
 }
 
+func autoConvert_v1_HostAlias_To_api_HostAlias(in *HostAlias, out *api.HostAlias, s conversion.Scope) error {
+	out.IP = in.IP
+	out.Hostnames = *(*[]string)(unsafe.Pointer(&in.Hostnames))
+	return nil
+}
+
+// Convert_v1_HostAlias_To_api_HostAlias is an autogenerated conversion function.
+func Convert_v1_HostAlias_To_api_HostAlias(in *HostAlias, out *api.HostAlias, s conversion.Scope) error {
+	return autoConvert_v1_HostAlias_To_api_HostAlias(in, out, s)
+}
+
+func autoConvert_api_HostAlias_To_v1_HostAlias(in *api.HostAlias, out *HostAlias, s conversion.Scope) error {
+	out.IP = in.IP
+	out.Hostnames = *(*[]string)(unsafe.Pointer(&in.Hostnames))
+	return nil
+}
+
+// Convert_api_HostAlias_To_v1_HostAlias is an autogenerated conversion function.
+func Convert_api_HostAlias_To_v1_HostAlias(in *api.HostAlias, out *HostAlias, s conversion.Scope) error {
+	return autoConvert_api_HostAlias_To_v1_HostAlias(in, out, s)
+}
+
 func autoConvert_v1_HostPathVolumeSource_To_api_HostPathVolumeSource(in *HostPathVolumeSource, out *api.HostPathVolumeSource, s conversion.Scope) error {
 	out.Path = in.Path
 	return nil
@@ -3468,6 +3492,7 @@ func autoConvert_v1_PodSpec_To_api_PodSpec(in *PodSpec, out *api.PodSpec, s conv
 	out.Affinity = (*api.Affinity)(unsafe.Pointer(in.Affinity))
 	out.SchedulerName = in.SchedulerName
 	out.Tolerations = *(*[]api.Toleration)(unsafe.Pointer(&in.Tolerations))
+	out.HostAliases = *(*[]api.HostAlias)(unsafe.Pointer(&in.HostAliases))
 	return nil
 }
 
@@ -3512,6 +3537,7 @@ func autoConvert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conv
 	out.Affinity = (*Affinity)(unsafe.Pointer(in.Affinity))
 	out.SchedulerName = in.SchedulerName
 	out.Tolerations = *(*[]Toleration)(unsafe.Pointer(&in.Tolerations))
+	out.HostAliases = *(*[]HostAlias)(unsafe.Pointer(&in.HostAliases))
 	return nil
 }
 

pkg/api/v1/zz_generated.deepcopy.go

@@ -90,6 +90,7 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPGetAction, InType: reflect.TypeOf(&HTTPGetAction{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPHeader, InType: reflect.TypeOf(&HTTPHeader{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Handler, InType: reflect.TypeOf(&Handler{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HostAlias, InType: reflect.TypeOf(&HostAlias{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HostPathVolumeSource, InType: reflect.TypeOf(&HostPathVolumeSource{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ISCSIVolumeSource, InType: reflect.TypeOf(&ISCSIVolumeSource{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_KeyToPath, InType: reflect.TypeOf(&KeyToPath{})},
@@ -1179,6 +1180,20 @@ func DeepCopy_v1_Handler(in interface{}, out interface{}, c *conversion.Cloner)
 	}
 }
 
+func DeepCopy_v1_HostAlias(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*HostAlias)
+		out := out.(*HostAlias)
+		*out = *in
+		if in.Hostnames != nil {
+			in, out := &in.Hostnames, &out.Hostnames
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		}
+		return nil
+	}
+}
+
 func DeepCopy_v1_HostPathVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error {
 	{
 		in := in.(*HostPathVolumeSource)
@@ -2423,6 +2438,15 @@ func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner)
 				}
 			}
 		}
+		if in.HostAliases != nil {
+			in, out := &in.HostAliases, &out.HostAliases
+			*out = make([]HostAlias, len(*in))
+			for i := range *in {
+				if err := DeepCopy_v1_HostAlias(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		}
 		return nil
 	}
 }