Skip to content

K
k3s
Commit f2b9b673 authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Merge pull request #7409 from pmorie/downward-api

Fix omitempty attributes on downward api
parents 094e5545 2ecb883f
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
pkg/api/types.go
View file @ f2b9b673
...@@ -518,7 +518,7 @@ type EnvVar struct { ...@@ -518,7 +518,7 @@ type EnvVar struct {
// EnvVarSource represents a source for the value of an EnvVar. // EnvVarSource represents a source for the value of an EnvVar.
type EnvVarSource struct { type EnvVarSource struct {
// Required: Selects a field of the pod; only name and namespace are supported. // Required: Selects a field of the pod; only name and namespace are supported.
FieldPath *ObjectFieldSelector `json:"fieldPath,omitempty"` FieldPath *ObjectFieldSelector `json:"fieldPath"`
} }
// ObjectFieldSelector selects an APIVersioned field of an object. // ObjectFieldSelector selects an APIVersioned field of an object.
...@@ -526,9 +526,9 @@ type ObjectFieldSelector struct { ...@@ -526,9 +526,9 @@ type ObjectFieldSelector struct {
// Required: Version of the schema the FieldPath is written in terms of. // Required: Version of the schema the FieldPath is written in terms of.
// If no value is specified, it will be defaulted to the APIVersion of the // If no value is specified, it will be defaulted to the APIVersion of the
// enclosing object. // enclosing object.
APIVersion string `json:"apiVersion,omitempty"` APIVersion string `json:"apiVersion"`
// Required: Path of the field to select in the specified API version // Required: Path of the field to select in the specified API version
FieldPath string `json:"fieldPath,omitempty"` FieldPath string `json:"fieldPath"`
} }
// HTTPGetAction describes an action based on HTTP Get requests. // HTTPGetAction describes an action based on HTTP Get requests.
......
pkg/api/v1beta1/types.go
View file @ f2b9b673
...@@ -407,7 +407,7 @@ type EnvVar struct { ...@@ -407,7 +407,7 @@ type EnvVar struct {
// EnvVarSource represents a source for the value of an EnvVar. // EnvVarSource represents a source for the value of an EnvVar.
type EnvVarSource struct { type EnvVarSource struct {
// Required: Selects a field of the pod; only name and namespace are supported. // Required: Selects a field of the pod; only name and namespace are supported.
FieldPath *ObjectFieldSelector `json:"fieldPath,omitempty" description:"selects a field of the pod; only name and namespace are supported"` FieldPath *ObjectFieldSelector `json:"fieldPath" description:"selects a field of the pod; only name and namespace are supported"`
} }
// ObjectFieldSelector selects an APIVersioned field of an object. // ObjectFieldSelector selects an APIVersioned field of an object.
...@@ -415,7 +415,7 @@ type ObjectFieldSelector struct { ...@@ -415,7 +415,7 @@ type ObjectFieldSelector struct {
// Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta1" // Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta1"
APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta1"` APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta1"`
// Required: Path of the field to select in the specified API version // Required: Path of the field to select in the specified API version
FieldPath string `json:"fieldPath,omitempty" description:"path of the field to select in the specified API version"` FieldPath string `json:"fieldPath" description:"path of the field to select in the specified API version"`
} }
// HTTPGetAction describes an action based on HTTP Get requests. // HTTPGetAction describes an action based on HTTP Get requests.
......
pkg/api/v1beta2/types.go
View file @ f2b9b673
...@@ -391,7 +391,7 @@ type EnvVar struct { ...@@ -391,7 +391,7 @@ type EnvVar struct {
// EnvVarSource represents a source for the value of an EnvVar. // EnvVarSource represents a source for the value of an EnvVar.
type EnvVarSource struct { type EnvVarSource struct {
// Required: Selects a field of the pod; only name and namespace are supported. // Required: Selects a field of the pod; only name and namespace are supported.
FieldPath *ObjectFieldSelector `json:"fieldPath,omitempty" description:"selects a field of the pod; only name and namespace are supported"` FieldPath *ObjectFieldSelector `json:"fieldPath" description:"selects a field of the pod; only name and namespace are supported"`
} }
// ObjectFieldSelector selects an APIVersioned field of an object. // ObjectFieldSelector selects an APIVersioned field of an object.
...@@ -399,7 +399,7 @@ type ObjectFieldSelector struct { ...@@ -399,7 +399,7 @@ type ObjectFieldSelector struct {
// Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta2" // Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta2"
APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta2"` APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta2"`
// Required: Path of the field to select in the specified API version // Required: Path of the field to select in the specified API version
FieldPath string `json:"fieldPath,omitempty" description:"path of the field to select in the specified API version"` FieldPath string `json:"fieldPath" description:"path of the field to select in the specified API version"`
} }
// HTTPGetAction describes an action based on HTTP Get requests. // HTTPGetAction describes an action based on HTTP Get requests.
......
pkg/api/v1beta3/types.go
View file @ f2b9b673
...@@ -529,7 +529,7 @@ type EnvVar struct { ...@@ -529,7 +529,7 @@ type EnvVar struct {
// EnvVarSource represents a source for the value of an EnvVar. // EnvVarSource represents a source for the value of an EnvVar.
type EnvVarSource struct { type EnvVarSource struct {
// Required: Selects a field of the pod; only name and namespace are supported. // Required: Selects a field of the pod; only name and namespace are supported.
FieldPath *ObjectFieldSelector `json:"fieldPath,omitempty" description:"selects a field of the pod; only name and namespace are supported"` FieldPath *ObjectFieldSelector `json:"fieldPath" description:"selects a field of the pod; only name and namespace are supported"`
} }
// ObjectFieldSelector selects an APIVersioned field of an object. // ObjectFieldSelector selects an APIVersioned field of an object.
...@@ -537,7 +537,7 @@ type ObjectFieldSelector struct { ...@@ -537,7 +537,7 @@ type ObjectFieldSelector struct {
// Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta3" // Optional: Version of the schema the FieldPath is written in terms of, defaults to "v1beta3"
APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta3"` APIVersion string `json:"apiVersion,omitempty" description:"version of the schema that fieldPath is written in terms of; defaults to v1beta3"`
// Required: Path of the field to select in the specified API version // Required: Path of the field to select in the specified API version
FieldPath string `json:"fieldPath,omitempty" description:"path of the field to select in the specified API version"` FieldPath string `json:"fieldPath" description:"path of the field to select in the specified API version"`
} }
// HTTPGetAction describes an action based on HTTP Get requests. // HTTPGetAction describes an action based on HTTP Get requests.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment