Merge pull request #124859 from morlay/master

Remove json:",omitempty" where json:",inline" specified.

Kubernetes-commit: 73198f893c74531005fe7284eee5a9dc0db34ff7
This commit is contained in:
Kubernetes Publisher 2024-07-18 09:33:33 -07:00
commit 5742b23135
5 changed files with 6 additions and 6 deletions

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

2
go.mod
View File

@ -25,7 +25,7 @@ require (
golang.org/x/time v0.3.0
google.golang.org/protobuf v1.34.2
gopkg.in/evanphx/json-patch.v4 v4.12.0
k8s.io/api v0.0.0-20240717223447-7ff5716b9e45
k8s.io/api v0.0.0-20240718182902-fda4e0af0997
k8s.io/apimachinery v0.0.0-20240715201109-ab0686929a37
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340

4
go.sum
View File

@ -156,8 +156,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20240717223447-7ff5716b9e45 h1:6oTMnxxpb0Jyz0gOc0l/lwOSPccdc+HmolMfST1qU60=
k8s.io/api v0.0.0-20240717223447-7ff5716b9e45/go.mod h1:2UcZQyUkPm7CMfP50V/oCVagw0chxcTd2M0sBNxxM9E=
k8s.io/api v0.0.0-20240718182902-fda4e0af0997 h1:wJ/hU3JqwOrxsjDZ5jkPujjWmmNOqu/poGKNqHD10AI=
k8s.io/api v0.0.0-20240718182902-fda4e0af0997/go.mod h1:2UcZQyUkPm7CMfP50V/oCVagw0chxcTd2M0sBNxxM9E=
k8s.io/apimachinery v0.0.0-20240715201109-ab0686929a37 h1:vG4p9Dp1oF1azqq+OvpzZjVtlKqo91bRDoZ2MfgoUaw=
k8s.io/apimachinery v0.0.0-20240715201109-ab0686929a37/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=