Skip to content

Commit 1e20a1a

Browse files
liamfallonliamfallon
authored
Refactor Porch to remove all cloned kpt code (#411)
* Remove cloned krm functions and use kptdev/krm-functions-catalog krm functions Signed-off-by: liamfallon <liam.fallon@est.tech> * refactor 1 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 2 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 3 Signed-off-by: liamfallon <liam.fallon@est.tech> * Merged Porch and Kpt codebases Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Update go.mod to point at new kpt version Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated due to kpt changes Signed-off-by: liamfallon <liam.fallon@est.tech> * Rebased against latest Porch Signed-off-by: liamfallon <liam.fallon@est.tech> * Remove cloned krm functions and use kptdev/krm-functions-catalog krm functions Signed-off-by: liamfallon <liam.fallon@est.tech> * refactor 1 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 2 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 3 Signed-off-by: liamfallon <liam.fallon@est.tech> * Merged Porch and Kpt codebases Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Update go.mod to point at new kpt version Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated due to kpt changes Signed-off-by: liamfallon <liam.fallon@est.tech> * Rebased against latest Porch Signed-off-by: liamfallon <liam.fallon@est.tech> * Remove cloned krm functions and use kptdev/krm-functions-catalog krm functions Signed-off-by: liamfallon <liam.fallon@est.tech> * refactor 1 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 2 Signed-off-by: liamfallon <liam.fallon@est.tech> * Refactor 3 Signed-off-by: liamfallon <liam.fallon@est.tech> * Merged Porch and Kpt codebases Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated tests Signed-off-by: liamfallon <liam.fallon@est.tech> * Update go.mod to point at new kpt version Signed-off-by: liamfallon <liam.fallon@est.tech> * Updated due to kpt changes Signed-off-by: liamfallon <liam.fallon@est.tech> * Rebased against latest Porch Signed-off-by: liamfallon <liam.fallon@est.tech> * Use kpt with Porhc code improvements Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix typo in cliutils directory name Signed-off-by: liamfallon <liam.fallon@est.tech> * Tidy up after rebase Signed-off-by: liamfallon <liam.fallon@est.tech> --------- Signed-off-by: liamfallon <liam.fallon@est.tech>
1 parent 4f1b5f2 commit 1e20a1a

File tree

284 files changed

+196
-33968
lines changed

Some content is hidden

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

284 files changed

+196
-33968
lines changed

‎cmd/porchctl/main.go‎

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

2222
"github.com/kptdev/kpt/pkg/lib/errors"
2323
"github.com/kptdev/kpt/pkg/lib/errors/resolver"
24+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
2425
"github.com/nephio-project/porch/cmd/porchctl/run"
25-
"github.com/nephio-project/porch/internal/kpt/util/cmdutil"
2626
"github.com/spf13/cobra"
2727
_ "k8s.io/client-go/plugin/pkg/client/auth"
2828
"k8s.io/component-base/cli"

‎cmd/porchctl/run/run.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"strconv"
2626
"strings"
2727

28-
"github.com/nephio-project/porch/internal/kpt/util/cmdutil"
28+
"github.com/kptdev/kpt/pkg/lib/util/cmdutil"
29+
"github.com/kptdev/kpt/pkg/printer"
2930
"github.com/nephio-project/porch/pkg/cli/commands"
30-
"github.com/nephio-project/porch/pkg/kpt/printer"
3131
"github.com/spf13/cobra"
3232
)
3333

‎controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
pkgerrors "github.com/pkg/errors"
2828

2929
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
30+
"github.com/kptdev/kpt/pkg/kptfile/kptfileutil"
3031
"github.com/kptdev/krm-functions-sdk/go/fn"
31-
"github.com/nephio-project/porch/pkg/kpt/kptfileutil"
3232
"github.com/nephio-project/porch/pkg/repository"
3333

3434
"k8s.io/apimachinery/pkg/api/meta"

‎func/internal/executableevaluator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"path/filepath"
2424

2525
kptfilev1 "github.com/kptdev/kpt/pkg/api/kptfile/v1"
26+
"github.com/kptdev/kpt/pkg/fn"
2627
pb "github.com/nephio-project/porch/func/evaluator"
27-
"github.com/nephio-project/porch/pkg/kpt/fn"
2828
"google.golang.org/grpc/codes"
2929
"google.golang.org/grpc/status"
3030
"gopkg.in/yaml.v2"

‎func/internal/multievaluator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"errors"
2020

21+
"github.com/kptdev/kpt/pkg/fn"
2122
pb "github.com/nephio-project/porch/func/evaluator"
22-
"github.com/nephio-project/porch/pkg/kpt/fn"
2323
"google.golang.org/grpc/codes"
2424
"google.golang.org/grpc/status"
2525
)

‎go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ replace k8s.io/apiserver v0.34.1 => ./third_party/k8s.io/apiserver-v0.34.1
66

77
require (
88
cloud.google.com/go/iam v1.5.3
9-
github.com/bytecodealliance/wasmtime-go v1.0.0
10-
github.com/cpuguy83/go-md2man/v2 v2.0.7
119
github.com/fergusstrange/embedded-postgres v1.32.0
1210
github.com/fsnotify/fsnotify v1.9.0
1311
github.com/go-git/go-billy/v5 v5.6.2
@@ -16,19 +14,14 @@ require (
1614
github.com/google/cel-go v0.26.1
1715
github.com/google/go-cmp v0.7.0
1816
github.com/google/go-containerregistry v0.20.6
19-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2017
github.com/google/uuid v1.6.0
2118
github.com/jackc/pgx/v5 v5.7.6
22-
github.com/kptdev/kpt v1.0.0-beta.59.2
19+
github.com/kptdev/kpt v1.0.0-beta.60.1
2320
github.com/kptdev/krm-functions-catalog/functions/go/apply-replacements v0.1.3
24-
github.com/kptdev/krm-functions-catalog/functions/go/apply-setters v0.2.2
2521
github.com/kptdev/krm-functions-catalog/functions/go/set-namespace v0.4.3
2622
github.com/kptdev/krm-functions-catalog/functions/go/starlark v0.5.3
2723
github.com/kptdev/krm-functions-sdk/go/fn v1.0.0
28-
github.com/otiai10/copy v1.14.1
29-
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
3024
github.com/pkg/errors v0.9.1
31-
github.com/prep/wasmexec v0.0.0-20220807105708-6554945c1dec
3225
github.com/prometheus/client_golang v1.23.2
3326
github.com/spf13/cobra v1.10.1
3427
github.com/spf13/pflag v1.0.10
@@ -40,16 +33,13 @@ require (
4033
go.opentelemetry.io/otel/sdk v1.38.0
4134
go.opentelemetry.io/otel/trace v1.38.0
4235
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
43-
golang.org/x/mod v0.29.0
4436
golang.org/x/oauth2 v0.32.0
45-
golang.org/x/tools v0.38.0
4637
google.golang.org/api v0.254.0
4738
google.golang.org/genproto v0.0.0-20251103181224-f26f9409b101
4839
google.golang.org/grpc v1.76.0
4940
google.golang.org/protobuf v1.36.10
5041
gopkg.in/yaml.v2 v2.4.0
5142
gopkg.in/yaml.v3 v3.0.1
52-
gotest.tools v2.2.0+incompatible
5343
k8s.io/api v0.34.1
5444
k8s.io/apimachinery v0.34.1
5545
k8s.io/apiserver v0.34.1
@@ -70,8 +60,15 @@ require (
7060
require github.com/go-errors/errors v1.5.1 // indirect
7161

7262
require (
63+
github.com/bytecodealliance/wasmtime-go v1.0.0 // indirect
64+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
65+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
66+
github.com/kptdev/krm-functions-catalog/functions/go/apply-setters v0.2.2 // indirect
67+
github.com/otiai10/copy v1.14.1 // indirect
68+
github.com/prep/wasmexec v0.0.0-20220807105708-6554945c1dec // indirect
7369
github.com/qri-io/starlib v0.5.0 // indirect
7470
go.starlark.net v0.0.0-20251029211736-7849196f18cf // indirect
71+
golang.org/x/mod v0.29.0 // indirect
7572
sigs.k8s.io/kustomize/api v0.20.1 // indirect
7673
)
7774

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3J
256256
github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
257257
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
258258
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
259-
github.com/kptdev/kpt v1.0.0-beta.59.2 h1:mrLxI6Qw7MUbWLx5NCIg9e6sOwt1YVM4JDhUImNZtJA=
260-
github.com/kptdev/kpt v1.0.0-beta.59.2/go.mod h1:jyXC9tCyw1ret0guI03X9Iyqjwyc94aG1642jz0kmq4=
259+
github.com/kptdev/kpt v1.0.0-beta.60.1 h1:gfgT8LNPadhFJNZ09BqcM9UoK+yMr9dxkyF1eJQmyYA=
260+
github.com/kptdev/kpt v1.0.0-beta.60.1/go.mod h1:LYxsFv6vMx/Q8aCxm/fw2gMJLahpMqOBtFbxhvzeHe4=
261261
github.com/kptdev/krm-functions-catalog/functions/go/apply-replacements v0.1.3 h1:MmvPxH9kL/nTwJSaLhAJvpq4VJuu0zzn0SbuExr0RS4=
262262
github.com/kptdev/krm-functions-catalog/functions/go/apply-replacements v0.1.3/go.mod h1:SF6Ijzk6F+TkQjUW+UjHIujujL03f9sjP+UiVXfhrXA=
263263
github.com/kptdev/krm-functions-catalog/functions/go/apply-setters v0.2.2 h1:PZ4TcVzgad1OFuH4gHg4j2LKC2KXTuzfsQWil2knSlk=

internal/kpt/util/porch/approval.go renamed to internal/cliutils/approval.go

File renamed without changes.

internal/kpt/util/porch/client.go renamed to internal/cliutils/client.go

File renamed without changes.

internal/kpt/util/porch/const.go renamed to internal/cliutils/const.go

File renamed without changes.

0 commit comments

Comments
 (0)