admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-12-22 16:48:26 +08:00
parent 4a11a50544
commit fe6c5de00f
2857 changed files with 252134 additions and 115656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/sigs.k8s.io/controller-tools/pkg/schemapatcher/gen.go generated vendored
View File

@@ -115,7 +115,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) (result error) {
}
// generate schemata for the types we care about, and save them to be written later.
for _, groupKind := range crdgen.FindKubeKinds(parser, metav1Pkg) {
for groupKind := range crdgen.FindKubeKinds(parser, metav1Pkg) {
existingSet, wanted := partialCRDSets[groupKind]
if !wanted {
continue
@@ -170,11 +170,11 @@ func (g Generator) Generate(ctx *genall.GenerationContext) (result error) {
if allSame {
if err := existingSet.setGlobalSchema(); err != nil {
return fmt.Errorf("failed to set global firstSchema for %s: %v", existingSet.GroupKind, err)
return fmt.Errorf("failed to set global firstSchema for %s: %w", existingSet.GroupKind, err)
}
} else {
if err := existingSet.setVersionedSchemata(); err != nil {
return fmt.Errorf("failed to set versioned schemas for %s: %v", existingSet.GroupKind, err)
return fmt.Errorf("failed to set versioned schemas for %s: %w", existingSet.GroupKind, err)
}
}
}
@@ -278,7 +278,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {
}
schema, err := legacySchema(newSchema)
if err != nil {
return fmt.Errorf("failed to convert schema to legacy form: %v", err)
return fmt.Errorf("failed to convert schema to legacy form: %w", err)
}
schemaNodeTree, err := yamlop.ToYAML(schema)
if err != nil {
@@ -300,7 +300,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {
}
for i, verNode := range versions.Content {
if err := yamlop.DeleteNode(verNode, "schema"); err != nil {
return fmt.Errorf("spec.versions[%d]: %v", i, err)
return fmt.Errorf("spec.versions[%d]: %w", i, err)
}
}
@@ -363,7 +363,7 @@ func (e *partialCRD) setVersionedSchemata(newSchemata map[string]apiext.JSONSche
newSchema, found := newSchemata[name]
if !found {
if err := yamlop.DeleteNode(verNode, "schema"); err != nil {
return fmt.Errorf("spec.versions[%d]: %v", i, err)
return fmt.Errorf("spec.versions[%d]: %w", i, err)
}
} else {
// TODO(directxman12): if this gets to be more than 2 versions, use polymorphism to clean this up
@@ -371,18 +371,18 @@ func (e *partialCRD) setVersionedSchemata(newSchemata map[string]apiext.JSONSche
if e.CRDVersion == legacyAPIExtVersion {
verSchema, err = legacySchema(newSchema)
if err != nil {
return fmt.Errorf("failed to convert schema to legacy form: %v", err)
return fmt.Errorf("failed to convert schema to legacy form: %w", err)
}
}
schemaNodeTree, err := yamlop.ToYAML(verSchema)
if err != nil {
return fmt.Errorf("failed to convert schema to YAML: %v", err)
return fmt.Errorf("failed to convert schema to YAML: %w", err)
}
schemaNodeTree = schemaNodeTree.Content[0] // get rid of the document node
yamlop.SetStyle(schemaNodeTree, 0) // clear the style so it defaults to an auto-chosen one
if err := yamlop.SetNode(verNode, *schemaNodeTree, "schema", "openAPIV3Schema"); err != nil {
return fmt.Errorf("spec.versions[%d]: %v", i, err)
return fmt.Errorf("spec.versions[%d]: %w", i, err)
}
}
}

4
vendor/sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml/convert.go generated vendored
View File

@@ -33,12 +33,12 @@ func ToYAML(rawObj interface{}) (*yaml.Node, error) {
rawJSON, err := json.Marshal(rawObj)
if err != nil {
return nil, fmt.Errorf("failed to marshal object: %v", err)
return nil, fmt.Errorf("failed to marshal object: %w", err)
}
var out yaml.Node
if err := yaml.Unmarshal(rawJSON, &out); err != nil {
return nil, fmt.Errorf("unable to unmarshal marshalled object: %v", err)
return nil, fmt.Errorf("unable to unmarshal marshalled object: %w", err)
}
return &out, nil
}

2
vendor/sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml/nested.go generated vendored
View File

@@ -58,7 +58,7 @@ func asCloseAsPossible(root *yaml.Node, path ...string) (*yaml.Node, []string, e
nextNode, err := ValueInMapping(currNode, path[0])
if err != nil {
return nil, nil, fmt.Errorf("unable to get next node in path %v: %v", path, err)
return nil, nil, fmt.Errorf("unable to get next node in path %v: %w", path, err)
}
if nextNode == nil {