github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #47512 from rickypai/rpai/fix_hostalias_json_key 

Automatic merge from submit-queue (batch tested with PRs 42252, 42251, 42249, 47512, 47887)

fix HostAliases' json keys to be hostAlias instead of hostMapping to reflect actual feature name

**What this PR does / why we need it**: a rename was introduce during the middle of #44641 to change from `hostMappings` to `hostAliases`. the Go structs were updated, but I neglected to update the json keys. They should be in sync.

**Special notes for your reviewer**:  I messed up. This is an API change. I hope this is still ok to be in the 1.7 release.

**Release note**:
```release-note
HostAliases is now parsed with `hostAliases` json keys to be in line with the feature's name.
```
pull/6/head
Kubernetes Submit Queue 2017-06-21 22:13:33 -07:00 committed by GitHub
parent d0a2beb1e7 797dc10a0c
commit 4d1379c473
24 changed files with 1462 additions and 1462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/openapi-spec/swagger.json
View File

@ -49509,19 +49509,19 @@
"description": "Set DNS policy for containers within the pod. One of 'ClusterFirstWithHostNet', 'ClusterFirst' or 'Default'. Defaults to \"ClusterFirst\". To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to 'ClusterFirstWithHostNet'.",
"type": "string"
},
"hostIPC": {
"description": "Use the host's ipc namespace. Optional: Default to false.",
"type": "boolean"
},
"hostMappings": {
"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.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.HostAlias"
},
"x-kubernetes-patch-merge-key": "IP",
"x-kubernetes-patch-merge-key": "ip",
"x-kubernetes-patch-strategy": "merge"
},
"hostIPC": {
"description": "Use the host's ipc namespace. Optional: Default to false.",
"type": "boolean"
},
"hostNetwork": {
"description": "Host networking requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false.",
"type": "boolean"

2
api/swagger-spec/apps_v1beta1.json
View File

@ -3822,7 +3822,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
api/swagger-spec/batch_v1.json
View File

@ -1569,7 +1569,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
api/swagger-spec/batch_v2alpha1.json
View File

@ -2650,7 +2650,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
api/swagger-spec/extensions_v1beta1.json
View File

@ -7294,7 +7294,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
api/swagger-spec/v1.json
View File

@ -19696,7 +19696,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
docs/api-reference/apps/v1beta1/definitions.html
View File

@ -3791,7 +3791,7 @@ The StatefulSet guarantees that a given network identity will always map to the
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

2
docs/api-reference/batch/v1/definitions.html
View File

@ -3216,7 +3216,7 @@ When an object is created, the system will populate this list with the current s
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

2
docs/api-reference/batch/v2alpha1/definitions.html
View File

@ -3223,7 +3223,7 @@ When an object is created, the system will populate this list with the current s
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

2
docs/api-reference/extensions/v1beta1/definitions.html
View File

@ -4535,7 +4535,7 @@ When an object is created, the system will populate this list with the current s
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

2
docs/api-reference/v1/definitions.html
View File

@ -5399,7 +5399,7 @@ The resulting set of endpoints can be viewed as:<br>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

12
federation/apis/openapi-spec/swagger.json
View File

@ -11900,19 +11900,19 @@
"description": "Set DNS policy for containers within the pod. One of 'ClusterFirstWithHostNet', 'ClusterFirst' or 'Default'. Defaults to \"ClusterFirst\". To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to 'ClusterFirstWithHostNet'.",
"type": "string"
},
"hostIPC": {
"description": "Use the host's ipc namespace. Optional: Default to false.",
"type": "boolean"
},
"hostMappings": {
"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.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.HostAlias"
},
"x-kubernetes-patch-merge-key": "IP",
"x-kubernetes-patch-merge-key": "ip",
"x-kubernetes-patch-strategy": "merge"
},
"hostIPC": {
"description": "Use the host's ipc namespace. Optional: Default to false.",
"type": "boolean"
},
"hostNetwork": {
"description": "Host networking requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false.",
"type": "boolean"

2
federation/apis/swagger-spec/extensions_v1beta1.json
View File

@ -5038,7 +5038,7 @@
},
"description": "If specified, the pod's tolerations."
},
"hostMappings": {
"hostAliases": {
"type": "array",
"items": {
"$ref": "v1.HostAlias"

2
federation/docs/api-reference/extensions/v1beta1/definitions.html
View File

@ -4154,7 +4154,7 @@ When an object is created, the system will populate this list with the current s
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostMappings</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">hostAliases</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">HostAliases is an optional list of hosts and IPs that will be injected into the pod&#8217;s hosts file if specified. This is only valid for non-hostNetwork pods.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_hostalias">v1.HostAlias</a> array</p></td>

1424
pkg/api/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

4
pkg/api/v1/generated.proto
View File

@ -2788,9 +2788,9 @@ message PodSpec {
// 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
repeated HostAlias hostMappings = 23;
repeated HostAlias hostAliases = 23;
}
// PodStatus represents information about the status of a pod. Status may trail the actual

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

@ -36415,7 +36415,7 @@ func (x *PodSpec) CodecEncodeSelf(e *codec1978.Encoder) {
} else {
if yyq2[22] {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("hostMappings"))
r.EncodeString(codecSelferC_UTF81234, string("hostAliases"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.HostAliases == nil {
r.EncodeNil()
@ -36754,7 +36754,7 @@ func (x *PodSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
h.decSliceToleration((*[]Toleration)(yyv42), d)
}
}
case "hostMappings":
case "hostAliases":
if r.TryDecodeAsNil() {
x.HostAliases = nil
} else {

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
// file if specified. This is only valid for non-hostNetwork pods.
// +optional
// +patchMergeKey=IP
// +patchMergeKey=ip
// +patchStrategy=merge
HostAliases []HostAlias `json:"hostMappings,omitempty" patchStrategy:"merge" patchMergeKey:"IP" protobuf:"bytes,23,rep,name=hostMappings"`
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

2
pkg/api/v1/types_swagger_doc_generated.go
View File

@ -1375,7 +1375,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.",
"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.",
}
func (PodSpec) SwaggerDoc() map[string]string {

1424
staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

4
staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
View File

@ -2788,9 +2788,9 @@ message PodSpec {
// 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
repeated HostAlias hostMappings = 23;
repeated HostAlias hostAliases = 23;
}
// PodStatus represents information about the status of a pod. Status may trail the actual

4
staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go
View File

@ -36415,7 +36415,7 @@ func (x *PodSpec) CodecEncodeSelf(e *codec1978.Encoder) {
} else {
if yyq2[22] {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("hostMappings"))
r.EncodeString(codecSelferC_UTF81234, string("hostAliases"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.HostAliases == nil {
r.EncodeNil()
@ -36754,7 +36754,7 @@ func (x *PodSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
h.decSliceToleration((*[]Toleration)(yyv42), d)
}
}
case "hostMappings":
case "hostAliases":
if r.TryDecodeAsNil() {
x.HostAliases = nil
} else {

4
staging/src/k8s.io/client-go/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
// file if specified. This is only valid for non-hostNetwork pods.
// +optional
// +patchMergeKey=IP
// +patchMergeKey=ip
// +patchStrategy=merge
HostAliases []HostAlias `json:"hostMappings,omitempty" patchStrategy:"merge" patchMergeKey:"IP" protobuf:"bytes,23,rep,name=hostMappings"`
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

2
staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go
View File

@ -1375,7 +1375,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.",
"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.",
}
func (PodSpec) SwaggerDoc() map[string]string {