github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124859 from morlay/master

Browse Source 
Remove json:",omitempty" where json:",inline" specified.
This commit is contained in:
Kubernetes Prow Robot 2024-07-18 09:33:33 -07:00 committed by GitHub
commit 73198f893c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/api/extensions/v1beta1/types.go
View File

@ -775,7 +775,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is // default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue. // currently the only supported IngressRuleValue.
// +optional // +optional
IngressRuleValue `json:",inline,omitempty" protobuf:"bytes,2,opt,name=ingressRuleValue"` IngressRuleValue `json:",inline" protobuf:"bytes,2,opt,name=ingressRuleValue"`
} }
// IngressRuleValue represents a rule to apply against incoming requests. If the // IngressRuleValue represents a rule to apply against incoming requests. If the

2
staging/src/k8s.io/api/networking/v1/types.go
View File

@ -419,7 +419,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is // default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue. // currently the only supported IngressRuleValue.
// +optional // +optional
IngressRuleValue `json:",inline,omitempty" protobuf:"bytes,2,opt,name=ingressRuleValue"` IngressRuleValue `json:",inline" protobuf:"bytes,2,opt,name=ingressRuleValue"`
} }
// IngressRuleValue represents a rule to apply against incoming requests. If the // IngressRuleValue represents a rule to apply against incoming requests. If the

2
staging/src/k8s.io/api/networking/v1beta1/types.go
View File

@ -218,7 +218,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is // default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue. // currently the only supported IngressRuleValue.
// +optional // +optional
IngressRuleValue `json:",inline,omitempty" protobuf:"bytes,2,opt,name=ingressRuleValue"` IngressRuleValue `json:",inline" protobuf:"bytes,2,opt,name=ingressRuleValue"`
} }
// IngressRuleValue represents a rule to apply against incoming requests. If the // IngressRuleValue represents a rule to apply against incoming requests. If the

2
staging/src/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressrule.go
View File

@ -22,7 +22,7 @@ package v1beta1
// with apply. // with apply.
type IngressRuleApplyConfiguration struct { type IngressRuleApplyConfiguration struct {
Host *string `json:"host,omitempty"` Host *string `json:"host,omitempty"`
IngressRuleValueApplyConfiguration `json:",omitempty,inline"` IngressRuleValueApplyConfiguration `json:",inline"`
} }
// IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with // IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with

2
staging/src/k8s.io/client-go/applyconfigurations/networking/v1/ingressrule.go
View File

@ -22,7 +22,7 @@ package v1
// with apply. // with apply.
type IngressRuleApplyConfiguration struct { type IngressRuleApplyConfiguration struct {
Host *string `json:"host,omitempty"` Host *string `json:"host,omitempty"`
IngressRuleValueApplyConfiguration `json:",omitempty,inline"` IngressRuleValueApplyConfiguration `json:",inline"`
} }
// IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with // IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with

2
staging/src/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressrule.go
View File

@ -22,7 +22,7 @@ package v1beta1
// with apply. // with apply.
type IngressRuleApplyConfiguration struct { type IngressRuleApplyConfiguration struct {
Host *string `json:"host,omitempty"` Host *string `json:"host,omitempty"`
IngressRuleValueApplyConfiguration `json:",omitempty,inline"` IngressRuleValueApplyConfiguration `json:",inline"`
} }
// IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with // IngressRuleApplyConfiguration constructs a declarative configuration of the IngressRule type for use with