Commit 28ba81b
committed
Merge branch 'main' into fix/issue-1067-shared-helpers
Pick up the repository move from nephio-project to kptdev that landed
in #981, which rewrote the module path across the codebase. Conflicts
were limited to the import blocks of the rpkg lifecycle command files
this branch refactors. The resolution keeps the branch's runner
embedding and rpkgutil alias while taking main's kptdev import paths.
The util/common_test.go file is a new file added by this branch, so
main did not touch it, but its imports still needed to be rewritten
from the old module path to the canonical kptdev path.
Signed-off-by: thc1006 <84045975+thc1006@users.noreply.github.com>687 files changed
Lines changed: 2366 additions & 2266 deletions
File tree
- .github
- actions/setup-go-kpt
- workflows
- .vscode
- api
- generated
- clientset/versioned
- fake
- scheme
- typed/porch/v1alpha1
- fake
- informers/externalversions
- internalinterfaces
- porch
- v1alpha1
- listers/porch/v1alpha1
- openapi
- porchconfig/v1alpha1
- porch
- fuzzer
- install
- v1alpha1
- v1alpha2
- sql
- build
- cmd
- porchctl
- run
- porch
- controllers
- config
- crd/bases
- rbac
- functionconfigs/reconciler
- packagerevisions
- config/rbac
- integration
- pkg/controllers/packagerevision
- packagevariantsets
- api
- v1alpha1
- v1alpha2
- config
- rbac
- samples
- pkg/controllers/packagevariantset
- packagevariants
- api/v1alpha1
- config
- rbac
- samples
- pkg/controllers/packagevariant
- repositories
- config
- rbac
- samples
- integration
- pkg/controllers/repository
- deployments
- function-pods
- local
- porch
- tracing
- docs
- content/en
- docs
- 12_contributing
- code-contribution
- docs-contribution
- 1_overview
- 3_getting_started
- 6_configuration_and_deployments
- configurations/components/porch-server-config
- deployments
- 7_cli_api
- 9_troubleshooting_and_faq
- examples
- apps/hello-server
- k8s
- config
- tutorials/starting-with-porch
- func
- client
- config/sample
- evaluator
- healthchecker
- internal
- server
- wrapper-server
- testdata
- replaced
- internal
- api/porchinternal/v1alpha1
- cliutils
- otel
- make
- pkg
- apiserver
- cache
- contentcache
- crcache
- meta
- fake
- dbcache
- fake
- repomap
- testutil
- types
- cli/commands
- repo
- docs
- get
- reg
- sync
- unreg
- rpkg
- approve
- clone
- copy
- del
- docs
- get
- init
- proposedelete
- propose
- pull
- push
- reject
- upgrade
- util
- util
- cmd/server
- controllerrestmapper
- engine
- errors
- externalrepo
- fake
- git
- testdata
- oci
- types
- objects
- registry/porch
- wi
- repository
- task
- testdata
- clone
- bucket
- configmap
- simple-render
- simple-bucket
- tokenexchange
- gcptokensource
- ksaimpersonationtokensource
- ksatokensource
- membership
- util
- context
- release/tag
- scripts
- test
- disaster
- api
- environment
- gitea
- kind
- packagevariantsets
- packagevariants
- pods
- porchrepositories
- postgres
- shell
- deployment
- load-repositories
- util
- e2e
- api
- cli
- testdata
- repo-register
- rpkg-clone
- rpkg-copy
- rpkg-get
- rpkg-init-deploy
- rpkg-init
- rpkg-lifecycle
- rpkg-nested-package
- rpkg-push-on-render-failure
- rpkg-push
- rpkg-unready
- rpkg-upgrade
- crd
- fn_runner
- performance
- suiteutils
- git
- pkg
- mockery/mocks/porch/pkg
- cache
- crcache/meta
- types
- engine
- repository
- ociserver
- pkg/oci
- performance
- pkgs/gitea-dev
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
151 | | - | |
| 151 | + | |
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
100 | | - | |
| 99 | + | |
| 100 | + | |
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
114 | | - | |
| 113 | + | |
| 114 | + | |
115 | 115 | | |
0 commit comments