mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-14 22:33:34 +00:00
core/v1: remove note about hostAliases not working with hostNetwork
Support for this was added in 1.8 by PR 50646. Local tests confirm that the feature indeed works. E2e tests seem to be missing.
This commit is contained in:
parent
38f4f9d8c4
commit
47ee56a7f2
2
api/openapi-spec/swagger.json
generated
2
api/openapi-spec/swagger.json
generated
@ -8917,7 +8917,7 @@
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
},
|
||||
"hostAliases": {
|
||||
"description": "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.",
|
||||
"description": "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
"items": {
|
||||
"$ref": "#/definitions/io.k8s.api.core.v1.HostAlias"
|
||||
},
|
||||
|
@ -5307,7 +5307,7 @@
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
},
|
||||
"hostAliases": {
|
||||
"description": "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.",
|
||||
"description": "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
"items": {
|
||||
"allOf": [
|
||||
{
|
||||
|
@ -3724,7 +3724,7 @@
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
},
|
||||
"hostAliases": {
|
||||
"description": "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.",
|
||||
"description": "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
"items": {
|
||||
"allOf": [
|
||||
{
|
||||
|
@ -2879,7 +2879,7 @@
|
||||
"x-kubernetes-patch-strategy": "merge"
|
||||
},
|
||||
"hostAliases": {
|
||||
"description": "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.",
|
||||
"description": "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
"items": {
|
||||
"allOf": [
|
||||
{
|
||||
|
@ -3255,7 +3255,7 @@ type PodSpec struct {
|
||||
// +optional
|
||||
Tolerations []Toleration
|
||||
// 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.
|
||||
// +optional
|
||||
HostAliases []HostAlias
|
||||
// If specified, indicates the pod's priority. "system-node-critical" and
|
||||
|
2
pkg/generated/openapi/zz_generated.openapi.go
generated
2
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -25973,7 +25973,7 @@ func schema_k8sio_api_core_v1_PodSpec(ref common.ReferenceCallback) common.OpenA
|
||||
},
|
||||
},
|
||||
SchemaProps: spec.SchemaProps{
|
||||
Description: "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.",
|
||||
Description: "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
Type: []string{"array"},
|
||||
Items: &spec.SchemaOrArray{
|
||||
Schema: &spec.Schema{
|
||||
|
@ -4063,7 +4063,7 @@ message PodSpec {
|
||||
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.
|
||||
// file if specified.
|
||||
// +optional
|
||||
// +patchMergeKey=ip
|
||||
// +patchStrategy=merge
|
||||
|
@ -3670,7 +3670,7 @@ type PodSpec struct {
|
||||
// +listType=atomic
|
||||
Tolerations []Toleration `json:"tolerations,omitempty" protobuf:"bytes,22,opt,name=tolerations"`
|
||||
// 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.
|
||||
// +optional
|
||||
// +patchMergeKey=ip
|
||||
// +patchStrategy=merge
|
||||
|
@ -1755,7 +1755,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.",
|
||||
"hostAliases": "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.",
|
||||
"hostAliases": "HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.",
|
||||
"priorityClassName": "If specified, indicates the pod's priority. \"system-node-critical\" and \"system-cluster-critical\" are two special keywords which indicate the highest priorities with the former being the highest priority. Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod priority will be default or zero if there is no default.",
|
||||
"priority": "The priority value. Various system components use this field to find the priority of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. The admission controller populates this field from PriorityClassName. The higher the value, the higher the priority.",
|
||||
"dnsConfig": "Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.",
|
||||
|
Loading…
Reference in New Issue
Block a user