Skip to content

Commit b9bd732

Browse files
Merge pull request #110564 from j4m3s-s/add-ports-doc-fix
Fix description of Ports in PodSpec Kubernetes-commit: 00ea892a0f1ab24e255524469648258c87775983
2 parents 51e4c4a + b7c39ad commit b9bd732

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

core/v1/generated.proto

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/v1/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,12 +2333,12 @@ type Container struct {
23332333
// Cannot be updated.
23342334
// +optional
23352335
WorkingDir string `json:"workingDir,omitempty" protobuf:"bytes,5,opt,name=workingDir"`
2336-
// List of ports to expose from the container. Exposing a port here gives
2337-
// the system additional information about the network connections a
2338-
// container uses, but is primarily informational. Not specifying a port here
2336+
// List of ports to expose from the container. Not specifying a port here
23392337
// DOES NOT prevent that port from being exposed. Any port which is
23402338
// listening on the default "0.0.0.0" address inside a container will be
23412339
// accessible from the network.
2340+
// Modifying this array with strategic merge patch may corrupt the data.
2341+
// For more information See https://github.com/kubernetes/kubernetes/issues/108255.
23422342
// Cannot be updated.
23432343
// +optional
23442344
// +patchMergeKey=containerPort

core/v1/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ var map_Container = map[string]string{
332332
"command": "Entrypoint array. Not executed within a shell. The container image's ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container's environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. \"$$(VAR_NAME)\" will produce the string literal \"$(VAR_NAME)\". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell",
333333
"args": "Arguments to the entrypoint. The container image's CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container's environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. \"$$(VAR_NAME)\" will produce the string literal \"$(VAR_NAME)\". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell",
334334
"workingDir": "Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.",
335-
"ports": "List of ports to expose from the container. Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default \"0.0.0.0\" address inside a container will be accessible from the network. Cannot be updated.",
335+
"ports": "List of ports to expose from the container. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default \"0.0.0.0\" address inside a container will be accessible from the network. Modifying this array with strategic merge patch may corrupt the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255. Cannot be updated.",
336336
"envFrom": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.",
337337
"env": "List of environment variables to set in the container. Cannot be updated.",
338338
"resources": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/",

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.18
77
require (
88
github.com/gogo/protobuf v1.3.2
99
github.com/stretchr/testify v1.7.0
10-
k8s.io/apimachinery v0.0.0-20220708091814-4afd3f45f241
10+
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce
1111
)
1212

1313
require (
@@ -34,4 +34,4 @@ require (
3434
sigs.k8s.io/yaml v1.2.0 // indirect
3535
)
3636

37-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220708091814-4afd3f45f241
37+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8484
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8585
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8686
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
87-
k8s.io/apimachinery v0.0.0-20220708091814-4afd3f45f241 h1:pZ5YYcjgTSEqZmb8yhxvCvy8QBYK2iAiuhzst5hTr3Q=
88-
k8s.io/apimachinery v0.0.0-20220708091814-4afd3f45f241/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
87+
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce h1:tQ0EgeSrxtam8cATjAGxIMZtZnsajmhomx9dDa4sFDI=
88+
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
8989
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
9090
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
9191
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=

0 commit comments

Comments
 (0)