Merge pull request #124859 from morlay/master

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
6 changed files with 6 additions and 6 deletions

View File

@@ -775,7 +775,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue.
// +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

View File

@@ -419,7 +419,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue.
// +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

View File

@@ -218,7 +218,7 @@ type IngressRule struct {
// default backend, is left to the controller fulfilling the Ingress. Http is
// currently the only supported IngressRuleValue.
// +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

View File

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

View File

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

View File

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