Upgrade k8s package verison (#5358)
* upgrade k8s package version Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> * Script upgrade and code formatting. Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
12
vendor/sigs.k8s.io/kustomize/kyaml/yaml/compatibility.go
generated
vendored
12
vendor/sigs.k8s.io/kustomize/kyaml/yaml/compatibility.go
generated
vendored
@@ -7,9 +7,9 @@ import (
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"github.com/go-openapi/spec"
|
||||
y1_1 "gopkg.in/yaml.v2"
|
||||
y1_2 "gopkg.in/yaml.v3"
|
||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||
y1_2 "sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml"
|
||||
)
|
||||
|
||||
// typeToTag maps OpenAPI schema types to yaml 1.2 tags
|
||||
@@ -45,6 +45,14 @@ func FormatNonStringStyle(node *Node, schema spec.Schema) {
|
||||
default:
|
||||
return
|
||||
}
|
||||
|
||||
// if the node tag is null, make sure we don't add any non-null tags
|
||||
// https://github.com/GoogleContainerTools/kpt/issues/2321
|
||||
if node.Tag == NodeTagNull {
|
||||
// must NOT quote null values
|
||||
node.Style = 0
|
||||
return
|
||||
}
|
||||
if tag, found := typeToTag[t]; found {
|
||||
// make sure the right tag is set
|
||||
node.Tag = tag
|
||||
|
||||
Reference in New Issue
Block a user