This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 85e2dac28de0902df2c0257e9ff526b92d2b9ae4 Author: pkalsi97 <[email protected]> AuthorDate: Mon Nov 3 19:56:18 2025 +0530 refactor: move knative types out of API package (#6300) Removed knative types from pkg/apis since they are internal. Relocated to pkg/internal/knative. Prevents util <-> trait circular dependency. --- pkg/{apis/camel/v1 => internal}/knative/types.go | 0 pkg/{apis/camel/v1 => internal}/knative/types_support.go | 0 pkg/{apis/camel/v1 => internal}/knative/types_support_test.go | 0 pkg/trait/knative.go | 2 +- pkg/trait/knative_test.go | 2 +- pkg/util/bindings/knative_ref.go | 2 +- pkg/util/bindings/knative_uri.go | 2 +- pkg/util/knative/apis.go | 2 +- pkg/util/knative/apis_test.go | 2 +- pkg/util/knative/uri.go | 2 +- pkg/util/knative/uri_test.go | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/apis/camel/v1/knative/types.go b/pkg/internal/knative/types.go similarity index 100% rename from pkg/apis/camel/v1/knative/types.go rename to pkg/internal/knative/types.go diff --git a/pkg/apis/camel/v1/knative/types_support.go b/pkg/internal/knative/types_support.go similarity index 100% rename from pkg/apis/camel/v1/knative/types_support.go rename to pkg/internal/knative/types_support.go diff --git a/pkg/apis/camel/v1/knative/types_support_test.go b/pkg/internal/knative/types_support_test.go similarity index 100% rename from pkg/apis/camel/v1/knative/types_support_test.go rename to pkg/internal/knative/types_support_test.go diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go index 66a9a0ec9..acc952e88 100644 --- a/pkg/trait/knative.go +++ b/pkg/trait/knative.go @@ -38,7 +38,7 @@ import ( serving "knative.dev/serving/pkg/apis/serving/v1" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" - knativeapi "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativeapi "github.com/apache/camel-k/v2/pkg/internal/knative" traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait" "github.com/apache/camel-k/v2/pkg/metadata" "github.com/apache/camel-k/v2/pkg/util" diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go index 2e64168a3..e1c9c3e89 100644 --- a/pkg/trait/knative_test.go +++ b/pkg/trait/knative_test.go @@ -38,7 +38,7 @@ import ( serving "knative.dev/serving/pkg/apis/serving/v1" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" - knativeapi "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativeapi "github.com/apache/camel-k/v2/pkg/internal/knative" traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait" "github.com/apache/camel-k/v2/pkg/client" "github.com/apache/camel-k/v2/pkg/internal" diff --git a/pkg/util/bindings/knative_ref.go b/pkg/util/bindings/knative_ref.go index 2b45ee4cf..905d42810 100644 --- a/pkg/util/bindings/knative_ref.go +++ b/pkg/util/bindings/knative_ref.go @@ -22,7 +22,7 @@ import ( "net/url" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" - knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativeapis "github.com/apache/camel-k/v2/pkg/internal/knative" "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait" "github.com/apache/camel-k/v2/pkg/util/property" corev1 "k8s.io/api/core/v1" diff --git a/pkg/util/bindings/knative_uri.go b/pkg/util/bindings/knative_uri.go index 36a3afff3..ccc272811 100644 --- a/pkg/util/bindings/knative_uri.go +++ b/pkg/util/bindings/knative_uri.go @@ -22,7 +22,7 @@ import ( "strings" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" - knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativeapis "github.com/apache/camel-k/v2/pkg/internal/knative" traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait" "k8s.io/utils/ptr" diff --git a/pkg/util/knative/apis.go b/pkg/util/knative/apis.go index caefa50aa..bac88fb09 100644 --- a/pkg/util/knative/apis.go +++ b/pkg/util/knative/apis.go @@ -18,7 +18,7 @@ limitations under the License. package knative import ( - knativev1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativev1 "github.com/apache/camel-k/v2/pkg/internal/knative" "github.com/apache/camel-k/v2/pkg/util" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/util/knative/apis_test.go b/pkg/util/knative/apis_test.go index 4cea26e72..025ba136f 100644 --- a/pkg/util/knative/apis_test.go +++ b/pkg/util/knative/apis_test.go @@ -20,7 +20,7 @@ package knative import ( "testing" - "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + "github.com/apache/camel-k/v2/pkg/internal/knative" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" diff --git a/pkg/util/knative/uri.go b/pkg/util/knative/uri.go index f128d5e54..0865b0d1f 100644 --- a/pkg/util/knative/uri.go +++ b/pkg/util/knative/uri.go @@ -21,7 +21,7 @@ import ( "fmt" "regexp" - knativev1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + knativev1 "github.com/apache/camel-k/v2/pkg/internal/knative" uriutils "github.com/apache/camel-k/v2/pkg/util/uri" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/util/knative/uri_test.go b/pkg/util/knative/uri_test.go index 1b8a9f779..9c77a8d23 100644 --- a/pkg/util/knative/uri_test.go +++ b/pkg/util/knative/uri_test.go @@ -20,7 +20,7 @@ package knative import ( "testing" - "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative" + "github.com/apache/camel-k/v2/pkg/internal/knative" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1"
