kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 00:52:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Revert "List and set setters in folders recursively"

Browse Source
This commit is contained in:
phani
2020-07-22 13:51:42 -07:00
committed by GitHub
parent 8b9829f222
commit d9fe98a289
9 changed files with 60 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/config/internal/commands/cmdset.go
View File

@@ -6,7 +6,6 @@ package commands
import (
"fmt"
"os"
"strings"
"github.com/olekukonko/tablewriter"
"github.com/spf13/cobra"
@@ -14,10 +13,7 @@ import (
"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/kustomize/kyaml/pathutil"
"sigs.k8s.io/kustomize/kyaml/printutil"
"sigs.k8s.io/kustomize/kyaml/setters"
"sigs.k8s.io/kustomize/kyaml/setters2"
"sigs.k8s.io/kustomize/kyaml/setters2/settersutil"
)
@@ -136,27 +132,9 @@ func (r *SetRunner) preRunE(c *cobra.Command, args []string) error {
func (r *SetRunner) runE(c *cobra.Command, args []string) error {
if setterVersion == "v2" {
openAPIFileName, err := ext.GetOpenAPIFile([]string{"."})
if err != nil {
return err
}
openAPIPaths, err := pathutil.SubDirsWithFile(args[0], openAPIFileName)
if err != nil {
return err
}
if len(openAPIPaths) == 0 {
return errors.Errorf("unable to find %s in %s", openAPIFileName, args[0])
}
for _, openAPIPath := range openAPIPaths {
resourcePath := strings.TrimSuffix(openAPIPath, openAPIFileName)
fmt.Fprintf(c.OutOrStdout(), "\nfinding %s setter in package %s\n", r.Set.Name, resourcePath)
count, err := r.Set.Set(openAPIPath, resourcePath)
if setErr := handleSetError(c, err); setErr != nil {
return setErr
}
fmt.Fprintf(c.OutOrStdout(), "set %d fields in package %s\n", count, resourcePath)
}
return nil
count, err := r.Set.Set(r.OpenAPIFile, args[0])
fmt.Fprintf(c.OutOrStdout(), "set %d fields\n", count)
return handleError(c, err)
}
if len(args) > 2 || c.Flag("values").Changed {
return handleError(c, r.perform(c, args))
@@ -164,17 +142,6 @@ func (r *SetRunner) runE(c *cobra.Command, args []string) error {
return handleError(c, lookup(r.Lookup, c, args))
}
func handleSetError(c *cobra.Command, err error) error {
if err == nil {
return nil
}
if strings.Contains(err.Error(), setters2.SetterNotFoundWarn) {
printutil.WarnPrintf(c.OutOrStdout(), "%s\n", err.Error())
return nil
}
return handleError(c, err)
}
func lookup(l setters.LookupSetters, c *cobra.Command, args []string) error {
// lookup the setters
err := kio.Pipeline{