Skip to content

Commit

Permalink
feat: move code to version 2
Browse files Browse the repository at this point in the history 
Closes #4086
  • Loading branch information
@squakez
squakez committed Mar 13, 2023
1 parent 81e0d15 commit 3c5fd72
Show file tree
Hide file tree
Showing 605 changed files with 1,648 additions and 1,614 deletions.
8 changes: 4 additions & 4 deletions addons/addons_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/apache/camel-k/addons/master"
"github.com/apache/camel-k/addons/telemetry"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/master"
"github.com/apache/camel-k/v2/addons/telemetry"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/trait"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
26 changes: 13 additions & 13 deletions addons/keda/keda.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ import (
"strings"
"text/template"

kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/kamelet/repository"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/property"
"github.com/apache/camel-k/pkg/util/source"
"github.com/apache/camel-k/pkg/util/uri"
kedav1alpha1 "github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/kamelet/repository"
"github.com/apache/camel-k/v2/pkg/metadata"
"github.com/apache/camel-k/v2/pkg/platform"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/property"
"github.com/apache/camel-k/v2/pkg/util/source"
"github.com/apache/camel-k/v2/pkg/util/uri"
"github.com/pkg/errors"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1"
Expand Down
16 changes: 8 additions & 8 deletions addons/keda/keda_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"encoding/json"
"testing"

"github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/controller/kameletbinding"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
"github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/test"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
Expand Down
16 changes: 8 additions & 8 deletions addons/master/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"

v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/resources"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/uri"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
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/resources"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/uri"
)

// The Master trait allows to configure the integration to automatically leverage Kubernetes resources for doing
Expand Down
4 changes: 2 additions & 2 deletions addons/register_3scale.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/threescale"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/threescale"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_aws_secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/vault/aws"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/vault/aws"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_azure_key_vault.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/vault/azure"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/vault/azure"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_gcp_secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/vault/gcp"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/vault/gcp"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_hashicorp_vault.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/vault/hashicorp"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/vault/hashicorp"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_keda.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/keda"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/keda"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/master"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/master"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_opentracing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/tracing"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/tracing"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_resume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/resume"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/resume"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_strimzi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/strimzi"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/apache/camel-k/v2/addons/strimzi"
"github.com/apache/camel-k/v2/pkg/util/bindings"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions addons/register_telemetry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package addons

import (
"github.com/apache/camel-k/addons/telemetry"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/v2/addons/telemetry"
"github.com/apache/camel-k/v2/pkg/trait"
)

func init() {
Expand Down
14 changes: 7 additions & 7 deletions addons/resume/resume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ limitations under the License.
package resume

import (
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/log"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
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/trait"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/log"
"k8s.io/utils/pointer"
)

Expand Down
4 changes: 2 additions & 2 deletions addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
package strimzi

import (
"github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/pkg/apis"
"github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/v2/pkg/apis"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/clientset.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/fake/register.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/scheme/register.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions addons/strimzi/strimzi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ package strimzi
import (
"fmt"

"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset"
"github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/apache/camel-k/pkg/util/uri"
"github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset"
"github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/util/bindings"
"github.com/apache/camel-k/v2/pkg/util/uri"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
Expand Down
12 changes: 6 additions & 6 deletions addons/strimzi/strimzi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"encoding/json"
"testing"

"github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/fake"
"github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/apache/camel-k/pkg/util/test"
"github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/fake"
"github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/util/bindings"
"github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
6 changes: 3 additions & 3 deletions addons/telemetry/discovery/jaeger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"sort"
"strings"

"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
Loading

0 comments on commit 3c5fd72

Please sign in to comment.