Skip to content

Commit 5cc0c38

Browse files
liamfallonliamfallon
authored
Complete transfer of kpt updates from Porch to kpt (#4355)
* Refactor 1 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refacor 2 Signed-off-by: liamfallon <liam.fallon@est.tech> * refactor 3 Signed-off-by: liamfallon <liam.fallon@est.tech> * Porch and kpt versions completely merged Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix breaking tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Remove unsupported kpt-live-plan target from Makefile Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix lint errors Signed-off-by: liamfallon <liam.fallon@est.tech> * Remove porch dependency from kpt Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactored builtins Signed-off-by: liamfallon <liam.fallon@est.tech> * Moved pkg/lib/kptops/internal to internal/kptops Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix test failure Signed-off-by: liamfallon <liam.fallon@est.tech> * Changed string literal to constant Signed-off-by: liamfallon <liam.fallon@est.tech> --------- Signed-off-by: liamfallon <liam.fallon@est.tech>
1 parent f1d2a47 commit 5cc0c38

File tree

187 files changed

+5257
-1228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+5257
-1228
lines changed

‎Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ test-fn-eval: build
117117
test-live-apply: build
118118
PATH="$(GOBIN):$(PATH)" go test -v -timeout=20m --tags=kind -p 2 --run=TestLiveApply/testdata/live-apply/$(T) ./e2e/
119119

120-
# target to run e2e tests for "kpt live plan" command
121-
test-live-plan: build
122-
PATH="$(GOBIN):$(PATH)" go test -v -timeout=20m --tags=kind -p 2 --run=TestLivePlan/testdata/live-plan/$(T) ./e2e/
123-
124120
vet:
125121
go vet ./...
126122

‎commands/alpha/alphacmd.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/kptdev/kpt/commands/alpha/wasm"
2323

2424
"github.com/kptdev/kpt/internal/docs/generated/alphadocs"
25-
"github.com/kptdev/kpt/internal/util/porch"
2625
"github.com/spf13/cobra"
2726
)
2827

@@ -41,7 +40,6 @@ func GetCommand(ctx context.Context, _, version string) *cobra.Command {
4140
}
4241
return cmd.Usage()
4342
},
44-
Hidden: porch.HidePorchCommands,
4543
}
4644

4745
alpha.AddCommand(

‎commands/fn/doc/cmdfndoc.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ import (
2323
"os/exec"
2424

2525
"github.com/kptdev/kpt/internal/docs/generated/fndocs"
26-
"github.com/kptdev/kpt/internal/util/cmdutil"
27-
"github.com/kptdev/kpt/pkg/lib/fnruntime"
26+
"github.com/kptdev/kpt/internal/fnruntime"
27+
"github.com/kptdev/kpt/pkg/lib/runneroptions"
28+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
2829
"github.com/kptdev/kpt/pkg/printer"
2930
"github.com/spf13/cobra"
3031
)
@@ -43,9 +44,6 @@ func NewRunner(ctx context.Context, parent string) *Runner {
4344
}
4445
r.Command = c
4546
c.Flags().StringVarP(&r.Image, "image", "i", "", "kpt function image name")
46-
_ = r.Command.RegisterFlagCompletionFunc("image", func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
47-
return cmdutil.SuggestFunctions(cmd), cobra.ShellCompDirectiveDefault
48-
})
4947
cmdutil.FixDocs("kpt", parent, c)
5048
return r
5149
}
@@ -64,17 +62,17 @@ func (r *Runner) runE(c *cobra.Command, _ []string) error {
6462
if r.Image == "" {
6563
return errors.New("image must be specified")
6664
}
67-
resolveFunc := fnruntime.ResolveToImageForCLIFunc(fnruntime.GHCRImagePrefix)
65+
resolveFunc := (&runneroptions.RunnerOptions{}).ResolveToImageForCLIFunc(runneroptions.GHCRImagePrefix)
6866
image, err := resolveFunc(c.Context(), r.Image)
6967
if err != nil {
7068
return err
7169
}
7270
var out, errout bytes.Buffer
7371
dockerRunArgs := []string{
7472
"run",
75-
"--rm", // delete the container afterward
76-
"-i", // interactive mode to accept stdin
77-
"--stdin", // keep stdin open
73+
"--rm", // delete the container afterward
74+
"-i", // interactive mode to accept stdin
75+
"--stdin", // keep stdin open
7876
image,
7977
"--help",
8078
}
@@ -92,15 +90,15 @@ func (r *Runner) runE(c *cobra.Command, _ []string) error {
9290
cmd := exec.Command(runtime.GetBin(), dockerRunArgs...)
9391
cmd.Stdout = &out
9492
cmd.Stderr = &errout
95-
93+
9694
// Provide an empty ResourceList as stdin for functions that expect input
9795
// This prevents "expected exactly one object, got 0" errors
9896
emptyResourceList := `apiVersion: config.kubernetes.io/v1
9997
kind: ResourceList
10098
items: []
10199
`
102100
cmd.Stdin = bytes.NewBufferString(emptyResourceList)
103-
101+
104102
err = cmd.Run()
105103
pr := printer.FromContextOrDie(r.Ctx)
106104
if err != nil {

‎commands/fn/doc/cmdfndoc_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222

2323
"github.com/kptdev/kpt/commands/fn/doc"
24-
"github.com/kptdev/kpt/pkg/lib/fnruntime"
24+
"github.com/kptdev/kpt/internal/fnruntime"
2525
"github.com/kptdev/kpt/pkg/printer/fake"
2626
"sigs.k8s.io/kustomize/kyaml/testutil"
2727
)

‎commands/fn/render/cmdrender.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
docs "github.com/kptdev/kpt/internal/docs/generated/fndocs"
2626
"github.com/kptdev/kpt/internal/util/argutil"
27-
"github.com/kptdev/kpt/internal/util/cmdutil"
2827
"github.com/kptdev/kpt/internal/util/pathutil"
2928
"github.com/kptdev/kpt/internal/util/render"
30-
"github.com/kptdev/kpt/pkg/lib/fnruntime"
29+
"github.com/kptdev/kpt/pkg/lib/runneroptions"
30+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
3131
"github.com/kptdev/kpt/pkg/printer"
3232
"github.com/spf13/cobra"
3333
"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -80,11 +80,11 @@ type Runner struct {
8080
Command *cobra.Command
8181
ctx context.Context
8282

83-
RunnerOptions fnruntime.RunnerOptions
83+
RunnerOptions runneroptions.RunnerOptions
8484
}
8585

8686
func (r *Runner) InitDefaults() {
87-
r.RunnerOptions.InitDefaults(fnruntime.GHCRImagePrefix)
87+
r.RunnerOptions.InitDefaults(runneroptions.GHCRImagePrefix)
8888
}
8989

9090
func (r *Runner) preRunE(_ *cobra.Command, args []string) error {

‎commands/live/apply/cmdapply.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/kptdev/kpt/internal/docs/generated/livedocs"
2525
"github.com/kptdev/kpt/internal/util/argutil"
2626
"github.com/kptdev/kpt/internal/util/strings"
27-
"github.com/kptdev/kpt/pkg/lib/cmdutil"
27+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
2828
"github.com/kptdev/kpt/pkg/live"
2929
"github.com/kptdev/kpt/pkg/status"
3030
"github.com/spf13/cobra"

‎commands/live/init/cmdliveinit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727

2828
"github.com/kptdev/kpt/internal/docs/generated/livedocs"
2929
"github.com/kptdev/kpt/internal/pkg"
30+
"github.com/kptdev/kpt/internal/types"
3031
"github.com/kptdev/kpt/internal/util/attribution"
3132
"github.com/kptdev/kpt/internal/util/pathutil"
3233
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
3334
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
3435
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
3536
"github.com/kptdev/kpt/pkg/lib/errors"
36-
"github.com/kptdev/kpt/pkg/lib/types"
3737
"github.com/kptdev/kpt/pkg/printer"
3838
"github.com/spf13/cobra"
3939
"k8s.io/cli-runtime/pkg/genericclioptions"

‎commands/live/migrate/migratecmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626
initialization "github.com/kptdev/kpt/commands/live/init"
2727
"github.com/kptdev/kpt/internal/docs/generated/livedocs"
2828
"github.com/kptdev/kpt/internal/pkg"
29+
"github.com/kptdev/kpt/internal/types"
2930
"github.com/kptdev/kpt/internal/util/argutil"
3031
"github.com/kptdev/kpt/internal/util/pathutil"
3132
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
3233
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
3334
"github.com/kptdev/kpt/pkg/lib/errors"
34-
"github.com/kptdev/kpt/pkg/lib/types"
3535
"github.com/kptdev/kpt/pkg/live"
3636
"github.com/spf13/cobra"
3737
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

‎commands/pkg/diff/cmddiff.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
2222
"github.com/kptdev/kpt/internal/pkg"
2323
"github.com/kptdev/kpt/internal/util/argutil"
24-
"github.com/kptdev/kpt/internal/util/cmdutil"
2524
"github.com/kptdev/kpt/internal/util/diff"
2625
"github.com/kptdev/kpt/internal/util/pathutil"
26+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
2727
"github.com/kptdev/kpt/pkg/printer"
2828
"github.com/spf13/cobra"
2929
"sigs.k8s.io/kustomize/kyaml/filesys"

‎commands/pkg/get/cmdget.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121

2222
docs "github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
2323
"github.com/kptdev/kpt/internal/pkg"
24+
"github.com/kptdev/kpt/internal/types"
2425
"github.com/kptdev/kpt/internal/util/argutil"
25-
"github.com/kptdev/kpt/internal/util/cmdutil"
2626
"github.com/kptdev/kpt/internal/util/get"
27-
"github.com/kptdev/kpt/internal/util/parse"
2827
"github.com/kptdev/kpt/internal/util/pathutil"
2928
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
3029
"github.com/kptdev/kpt/pkg/lib/errors"
31-
"github.com/kptdev/kpt/pkg/lib/types"
30+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
31+
"github.com/kptdev/kpt/pkg/lib/util/parse"
3232
"github.com/spf13/cobra"
3333
"sigs.k8s.io/kustomize/kyaml/filesys"
3434
)

0 commit comments

Comments
 (0)