github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Processed review suggestions

Browse Source
This commit is contained in:
Martin Kanters 2021-05-18 21:11:45 +02:00
parent 6d77ed7375
commit 8a4cdb847c
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/apis/core/types.go
View File

@ -1826,11 +1826,12 @@ type EnvVar struct {
Name string Name string
// Optional: no more than one of the following may be specified. // Optional: no more than one of the following may be specified.
// Optional: Defaults to ""; variable references $(VAR_NAME) are expanded // Optional: Defaults to ""; variable references $(VAR_NAME) are expanded
// using the previous defined environment variables in the container and // using the previously defined environment variables in the container and
// any service environment variables. If a variable cannot be resolved, // any service environment variables. If a variable cannot be resolved,
// the reference in the input string will be unchanged. Double $$ are // the reference in the input string will be unchanged. Double $$ are
// reduced to a single $, which allows for escaping the $(VAR_NAME) // reduced to a single $, which allows for escaping the $(VAR_NAME)
// syntax: i.e. $$(VAR_NAME). Escaped references will never be expanded, // 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. // regardless of whether the variable exists or not.
// +optional // +optional
Value string Value string
@ -2103,15 +2104,17 @@ type Container struct {
// Optional: The docker image's entrypoint is used if this is not provided; cannot be updated. // Optional: The docker image's entrypoint is used if this is not provided; cannot be updated.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// of whether the variable exists or not.
// +optional // +optional
Command []string Command []string
// Optional: The docker image's cmd is used if this is not provided; cannot be updated. // Optional: The docker image's cmd is used if this is not provided; cannot be updated.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// of whether the variable exists or not.
// +optional // +optional
Args []string Args []string
// Optional: Defaults to Docker's default. // Optional: Defaults to Docker's default.
@ -3080,15 +3083,17 @@ type EphemeralContainerCommon struct {
// Optional: The docker image's entrypoint is used if this is not provided; cannot be updated. // Optional: The docker image's entrypoint is used if this is not provided; cannot be updated.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// of whether the variable exists or not.
// +optional // +optional
Command []string Command []string
// Optional: The docker image's cmd is used if this is not provided; cannot be updated. // Optional: The docker image's cmd is used if this is not provided; cannot be updated.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// of whether the variable exists or not.
// +optional // +optional
Args []string Args []string
// Optional: Defaults to Docker's default. // Optional: Defaults to Docker's default.

29
staging/src/k8s.io/api/core/v1/types.go
View File

@ -1916,10 +1916,11 @@ type EnvVar struct {
// Optional: no more than one of the following may be specified. // Optional: no more than one of the following may be specified.
// Variable references $(VAR_NAME) are expanded // Variable references $(VAR_NAME) are expanded
// using the previous defined environment variables in the container and // using the previously defined environment variables in the container and
// any service environment variables. If a variable cannot be resolved, // any service environment variables. If a variable cannot be resolved,
// the reference in the input string will be unchanged. Double $$ are reduced // 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). // 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 // Escaped references will never be expanded, regardless of whether the variable
// exists or not. // exists or not.
// Defaults to "". // Defaults to "".
@ -2218,9 +2219,9 @@ type Container struct {
// The docker image's ENTRYPOINT is used if this is not provided. // The docker image's ENTRYPOINT is used if this is not provided.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// Escaped references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// Cannot be updated. // 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 // More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
// +optional // +optional
Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"` Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"`
@ -2228,9 +2229,9 @@ type Container struct {
// The docker image's CMD is used if this is not provided. // The docker image's CMD is used if this is not provided.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// Escaped references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// Cannot be updated. // 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 // More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
// +optional // +optional
Args []string `json:"args,omitempty" protobuf:"bytes,4,rep,name=args"` Args []string `json:"args,omitempty" protobuf:"bytes,4,rep,name=args"`
@ -3436,9 +3437,9 @@ type EphemeralContainerCommon struct {
// The docker image's ENTRYPOINT is used if this is not provided. // The docker image's ENTRYPOINT is used if this is not provided.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// Cannot be updated. // 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 // More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
// +optional // +optional
Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"` Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"`
@ -3446,9 +3447,9 @@ type EphemeralContainerCommon struct {
// The docker image's CMD is used if this is not provided. // The docker image's CMD is used if this is not provided.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // 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 // 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). Escaped // to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
// references will never be expanded, regardless of whether the variable exists or not. // produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
// Cannot be updated. // 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 // More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
// +optional // +optional
Args []string `json:"args,omitempty" protobuf:"bytes,4,rep,name=args"` Args []string `json:"args,omitempty" protobuf:"bytes,4,rep,name=args"`