From f9b69ce10847a31626c364d3d86bf361b16456b2 Mon Sep 17 00:00:00 2001 From: Morlay Date: Fri, 28 Jun 2024 23:16:51 +0800 Subject: [PATCH] Remove json:",omitempty" where json:",inline" specified. Signed-off-by: Morlay --- staging/src/k8s.io/api/extensions/v1beta1/types.go | 2 +- staging/src/k8s.io/api/networking/v1/types.go | 2 +- staging/src/k8s.io/api/networking/v1beta1/types.go | 2 +- .../applyconfigurations/extensions/v1beta1/ingressrule.go | 2 +- .../client-go/applyconfigurations/networking/v1/ingressrule.go | 2 +- .../applyconfigurations/networking/v1beta1/ingressrule.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/api/extensions/v1beta1/types.go b/staging/src/k8s.io/api/extensions/v1beta1/types.go index cc2deadac0a..09f58692f48 100644 --- a/staging/src/k8s.io/api/extensions/v1beta1/types.go +++ b/staging/src/k8s.io/api/extensions/v1beta1/types.go @@ -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 diff --git a/staging/src/k8s.io/api/networking/v1/types.go b/staging/src/k8s.io/api/networking/v1/types.go index 4ae0be1a366..ea00fe4748b 100644 --- a/staging/src/k8s.io/api/networking/v1/types.go +++ b/staging/src/k8s.io/api/networking/v1/types.go @@ -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 diff --git a/staging/src/k8s.io/api/networking/v1beta1/types.go b/staging/src/k8s.io/api/networking/v1beta1/types.go index 34dfe76aa3e..8e3888a3239 100644 --- a/staging/src/k8s.io/api/networking/v1beta1/types.go +++ b/staging/src/k8s.io/api/networking/v1beta1/types.go @@ -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 diff --git a/staging/src/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressrule.go b/staging/src/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressrule.go index dc0f93aaaf1..dc676f7b60c 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressrule.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressrule.go @@ -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 diff --git a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1/ingressrule.go b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1/ingressrule.go index a8c83f8e90a..4ef871f0775 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1/ingressrule.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1/ingressrule.go @@ -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 diff --git a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressrule.go b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressrule.go index dc0f93aaaf1..dc676f7b60c 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressrule.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressrule.go @@ -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