You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/12/19 09:50:01 UTC
[camel-k] 02/10: Fix #921: applying golangci-lint --fix
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a83e34b792c5fa14655b7002a3809187e7bfc44a
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Wed Dec 18 17:34:05 2019 +0100
Fix #921: applying golangci-lint --fix
---
.golangci.yml | 3 +++
cmd/util/doc-gen/generators/traitdocgen.go | 2 +-
cmd/util/json-schema-gen/jsonschemagen.go | 2 +-
pkg/apis/addtoscheme_camel_v1.go | 2 +-
pkg/builder/builder.go | 2 +-
pkg/builder/builder_steps.go | 2 +-
pkg/builder/builder_steps_test.go | 2 +-
pkg/builder/builder_test.go | 2 +-
pkg/builder/builder_types.go | 2 +-
pkg/builder/builder_utils.go | 2 +-
pkg/builder/runtime/main.go | 2 +-
pkg/builder/runtime/main_test.go | 2 +-
pkg/builder/runtime/quarkus.go | 2 +-
pkg/cmd/builder/builder.go | 2 +-
pkg/cmd/completion_bash.go | 2 +-
pkg/cmd/delete.go | 2 +-
pkg/cmd/describe.go | 2 +-
pkg/cmd/describe_integration.go | 2 +-
pkg/cmd/describe_kit.go | 2 +-
pkg/cmd/describe_platform.go | 2 +-
pkg/cmd/get.go | 2 +-
pkg/cmd/install.go | 2 +-
pkg/cmd/install_test.go | 2 +-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/kit_delete.go | 2 +-
pkg/cmd/kit_get.go | 2 +-
pkg/cmd/log.go | 2 +-
pkg/cmd/rebuild.go | 2 +-
pkg/cmd/reset.go | 2 +-
pkg/cmd/run.go | 2 +-
pkg/cmd/util.go | 2 +-
pkg/controller/build/action.go | 2 +-
pkg/controller/build/build_controller.go | 2 +-
pkg/controller/build/error.go | 2 +-
pkg/controller/build/initialize_pod.go | 2 +-
pkg/controller/build/initialize_routine.go | 2 +-
pkg/controller/build/monitor_pod.go | 2 +-
pkg/controller/build/monitor_routine.go | 2 +-
pkg/controller/build/recovery.go | 2 +-
pkg/controller/build/schedule_pod.go | 2 +-
pkg/controller/build/schedule_routine.go | 2 +-
pkg/controller/integration/action.go | 2 +-
pkg/controller/integration/build_kit.go | 2 +-
pkg/controller/integration/deploy.go | 2 +-
pkg/controller/integration/error.go | 2 +-
pkg/controller/integration/initialize.go | 2 +-
pkg/controller/integration/integration_controller.go | 2 +-
pkg/controller/integration/monitor.go | 2 +-
pkg/controller/integration/platform_setup.go | 2 +-
pkg/controller/integration/util.go | 2 +-
pkg/controller/integration/util_test.go | 2 +-
pkg/controller/integrationkit/action.go | 2 +-
pkg/controller/integrationkit/build.go | 2 +-
pkg/controller/integrationkit/error.go | 2 +-
pkg/controller/integrationkit/initialize.go | 2 +-
pkg/controller/integrationkit/integrationkit_controller.go | 2 +-
pkg/controller/integrationkit/monitor.go | 2 +-
pkg/controller/integrationplatform/action.go | 2 +-
pkg/controller/integrationplatform/create.go | 2 +-
pkg/controller/integrationplatform/create_test.go | 2 +-
pkg/controller/integrationplatform/initialize.go | 2 +-
pkg/controller/integrationplatform/initialize_test.go | 2 +-
.../integrationplatform/integrationplatform_controller.go | 2 +-
pkg/controller/integrationplatform/kaniko_cache.go | 2 +-
pkg/controller/integrationplatform/monitor.go | 2 +-
pkg/controller/integrationplatform/warm.go | 2 +-
pkg/controller/integrationplatform/warm_test.go | 2 +-
pkg/install/common.go | 2 +-
pkg/install/operator.go | 2 +-
pkg/metadata/http.go | 2 +-
pkg/metadata/metadata.go | 2 +-
pkg/metadata/metadata_dependencies_test.go | 2 +-
pkg/metadata/metadata_http_test.go | 2 +-
pkg/metadata/metadata_uri_test.go | 2 +-
pkg/platform/defaults.go | 2 +-
pkg/platform/platform.go | 2 +-
pkg/trait/affinity.go | 2 +-
pkg/trait/affinity_test.go | 2 +-
pkg/trait/builder.go | 2 +-
pkg/trait/builder_test.go | 2 +-
pkg/trait/camel.go | 2 +-
pkg/trait/camel_test.go | 2 +-
pkg/trait/classpath.go | 2 +-
pkg/trait/classpath_test.go | 2 +-
pkg/trait/container.go | 2 +-
pkg/trait/container_test.go | 2 +-
pkg/trait/debug.go | 2 +-
pkg/trait/debug_test.go | 2 +-
pkg/trait/dependencies.go | 2 +-
pkg/trait/dependencies_test.go | 2 +-
pkg/trait/deployer.go | 2 +-
pkg/trait/deployment.go | 2 +-
pkg/trait/deployment_test.go | 2 +-
pkg/trait/environment.go | 2 +-
pkg/trait/environment_test.go | 2 +-
pkg/trait/gc.go | 2 +-
pkg/trait/gc_test.go | 2 +-
pkg/trait/ingress.go | 2 +-
pkg/trait/ingress_test.go | 2 +-
pkg/trait/istio.go | 2 +-
pkg/trait/istio_test.go | 2 +-
pkg/trait/jolokia.go | 2 +-
pkg/trait/jolokia_test.go | 2 +-
pkg/trait/knative.go | 2 +-
pkg/trait/knative_service.go | 2 +-
pkg/trait/knative_service_test.go | 2 +-
pkg/trait/knative_test.go | 2 +-
pkg/trait/owner.go | 2 +-
pkg/trait/owner_test.go | 2 +-
pkg/trait/platform.go | 2 +-
pkg/trait/platform_test.go | 2 +-
pkg/trait/probes.go | 2 +-
pkg/trait/probes_test.go | 2 +-
pkg/trait/prometheus.go | 2 +-
pkg/trait/prometheus_test.go | 2 +-
pkg/trait/pull_secret.go | 2 +-
pkg/trait/pull_secret_test.go | 2 +-
pkg/trait/rest-dsl.go | 2 +-
pkg/trait/rest-dsl_test.go | 2 +-
pkg/trait/route.go | 2 +-
pkg/trait/route_test.go | 2 +-
pkg/trait/service.go | 2 +-
pkg/trait/service_test.go | 2 +-
pkg/trait/trait.go | 2 +-
pkg/trait/trait_catalog.go | 2 +-
pkg/trait/trait_test.go | 2 +-
pkg/trait/trait_types.go | 2 +-
pkg/trait/util.go | 2 +-
pkg/trait/util_test.go | 2 +-
pkg/util/camel/camel_runtime.go | 2 +-
pkg/util/camel/camel_runtime_catalog.go | 2 +-
pkg/util/camel/camel_types.go | 2 +-
pkg/util/camel/camel_util.go | 2 +-
pkg/util/camel/camel_util_test.go | 2 +-
pkg/util/camel/catalog.go | 2 +-
pkg/util/digest/digest.go | 2 +-
pkg/util/kubernetes/collection.go | 2 +-
pkg/util/kubernetes/customclient/customclient.go | 2 +-
pkg/util/kubernetes/log/util.go | 2 +-
pkg/util/kubernetes/resolver.go | 2 +-
pkg/util/kubernetes/util.go | 2 +-
pkg/util/log/log.go | 6 ++----
pkg/util/source/inspector.go | 2 +-
pkg/util/source/inspector_groovy.go | 2 +-
pkg/util/source/inspector_java_script.go | 2 +-
pkg/util/source/inspector_java_source.go | 2 +-
pkg/util/source/inspector_kotlin.go | 2 +-
pkg/util/source/inspector_xml.go | 2 +-
pkg/util/source/inspector_yaml.go | 2 +-
pkg/util/watch/watch.go | 2 +-
script/Makefile | 4 ++++
151 files changed, 157 insertions(+), 152 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index e5612d5..a3987eb 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -33,6 +33,7 @@ issues:
exclude-rules:
- path: pkg/client/clientset
linters:
+ - stylecheck
- golint
- deadcode
- lll
@@ -41,6 +42,7 @@ issues:
- unused
- path: pkg/client/informers
linters:
+ - stylecheck
- golint
- deadcode
- lll
@@ -49,6 +51,7 @@ issues:
- unused
- path: pkg/client/listers
linters:
+ - stylecheck
- golint
- deadcode
- lll
diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go
index 498f00b..da60de0 100644
--- a/cmd/util/doc-gen/generators/traitdocgen.go
+++ b/cmd/util/doc-gen/generators/traitdocgen.go
@@ -29,7 +29,7 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
diff --git a/cmd/util/json-schema-gen/jsonschemagen.go b/cmd/util/json-schema-gen/jsonschemagen.go
index e8713d6..5732060 100644
--- a/cmd/util/json-schema-gen/jsonschemagen.go
+++ b/cmd/util/json-schema-gen/jsonschemagen.go
@@ -26,7 +26,7 @@ import (
"reflect"
"github.com/alecthomas/jsonschema"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/spf13/cobra"
)
diff --git a/pkg/apis/addtoscheme_camel_v1.go b/pkg/apis/addtoscheme_camel_v1.go
index 3e0afbb..212a101 100644
--- a/pkg/apis/addtoscheme_camel_v1.go
+++ b/pkg/apis/addtoscheme_camel_v1.go
@@ -18,7 +18,7 @@ limitations under the License.
package apis
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
func init() {
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index debb0d4..3aa6aa9 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -24,7 +24,7 @@ import (
"sort"
"time"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/cancellable"
"github.com/apache/camel-k/pkg/util/log"
diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index d79adad..0edccf8 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -29,7 +29,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/controller"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/maven"
diff --git a/pkg/builder/builder_steps_test.go b/pkg/builder/builder_steps_test.go
index 0d6d8b8..39c7ef2 100644
--- a/pkg/builder/builder_steps_test.go
+++ b/pkg/builder/builder_steps_test.go
@@ -25,7 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/cancellable"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/builder/builder_test.go b/pkg/builder/builder_test.go
index 8d85196..be28d2c 100644
--- a/pkg/builder/builder_test.go
+++ b/pkg/builder/builder_test.go
@@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/test"
)
diff --git a/pkg/builder/builder_types.go b/pkg/builder/builder_types.go
index 4b58e93..d9bb40a 100644
--- a/pkg/builder/builder_types.go
+++ b/pkg/builder/builder_types.go
@@ -21,7 +21,7 @@ import (
"fmt"
"math"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/cancellable"
diff --git a/pkg/builder/builder_utils.go b/pkg/builder/builder_utils.go
index 7583709..481a6e0 100644
--- a/pkg/builder/builder_utils.go
+++ b/pkg/builder/builder_utils.go
@@ -18,7 +18,7 @@ limitations under the License.
package builder
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// StepIDsFor --
diff --git a/pkg/builder/runtime/main.go b/pkg/builder/runtime/main.go
index 104e46c..6c9321b 100644
--- a/pkg/builder/runtime/main.go
+++ b/pkg/builder/runtime/main.go
@@ -26,7 +26,7 @@ import (
yaml2 "gopkg.in/yaml.v2"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/defaults"
diff --git a/pkg/builder/runtime/main_test.go b/pkg/builder/runtime/main_test.go
index 5a5ca6e..d0f6a2e 100644
--- a/pkg/builder/runtime/main_test.go
+++ b/pkg/builder/runtime/main_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/maven"
diff --git a/pkg/builder/runtime/quarkus.go b/pkg/builder/runtime/quarkus.go
index f521836..216f2c7 100644
--- a/pkg/builder/runtime/quarkus.go
+++ b/pkg/builder/runtime/quarkus.go
@@ -27,7 +27,7 @@ import (
"github.com/pkg/errors"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/defaults"
diff --git a/pkg/cmd/builder/builder.go b/pkg/cmd/builder/builder.go
index 74e69ca..9561ef8 100644
--- a/pkg/cmd/builder/builder.go
+++ b/pkg/cmd/builder/builder.go
@@ -33,7 +33,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/cancellable"
diff --git a/pkg/cmd/completion_bash.go b/pkg/cmd/completion_bash.go
index d1100f4..57938ca 100644
--- a/pkg/cmd/completion_bash.go
+++ b/pkg/cmd/completion_bash.go
@@ -22,7 +22,7 @@ import (
"fmt"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/platform"
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 0a4d844..716b9a9 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -22,7 +22,7 @@ import (
"fmt"
"strconv"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/spf13/cobra"
k8errors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/cmd/describe.go b/pkg/cmd/describe.go
index 1345f7a..70cb23d 100644
--- a/pkg/cmd/describe.go
+++ b/pkg/cmd/describe.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/indentedwriter"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go
index 0b581b7..8b9b31a 100644
--- a/pkg/cmd/describe_integration.go
+++ b/pkg/cmd/describe_integration.go
@@ -22,7 +22,7 @@ import (
"io"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/indentedwriter"
"github.com/spf13/cobra"
diff --git a/pkg/cmd/describe_kit.go b/pkg/cmd/describe_kit.go
index 2a4b02f..e095851 100644
--- a/pkg/cmd/describe_kit.go
+++ b/pkg/cmd/describe_kit.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/indentedwriter"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/spf13/cobra"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index 902bda9..d7d5b88 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/indentedwriter"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/spf13/cobra"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go
index 330b31f..0bdf1f4 100644
--- a/pkg/cmd/get.go
+++ b/pkg/cmd/get.go
@@ -27,7 +27,7 @@ import (
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
type getCmdOptions struct {
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 301e510..0048a5b 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -30,7 +30,7 @@ import (
"github.com/apache/camel-k/deploy"
"github.com/apache/camel-k/pkg/apis"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/install"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/cmd/install_test.go b/pkg/cmd/install_test.go
index 34a8322..59dc8d6 100644
--- a/pkg/cmd/install_test.go
+++ b/pkg/cmd/install_test.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/test"
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/kit_create.go b/pkg/cmd/kit_create.go
index ac370ae..cb35495 100644
--- a/pkg/cmd/kit_create.go
+++ b/pkg/cmd/kit_create.go
@@ -22,7 +22,7 @@ import (
"fmt"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/cmd/kit_delete.go b/pkg/cmd/kit_delete.go
index cbec001..53dec61 100644
--- a/pkg/cmd/kit_delete.go
+++ b/pkg/cmd/kit_delete.go
@@ -23,7 +23,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/spf13/cobra"
k8errors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/cmd/kit_get.go b/pkg/cmd/kit_get.go
index 55d9214..5cba832 100644
--- a/pkg/cmd/kit_get.go
+++ b/pkg/cmd/kit_get.go
@@ -25,7 +25,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
func newKitGetCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitGetCommandOptions) {
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index f1d5697..ce78985 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -20,7 +20,7 @@ package cmd
import (
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
k8slog "github.com/apache/camel-k/pkg/util/kubernetes/log"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index 763506a..57dcef2 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -25,7 +25,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
)
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index 80faeb7..4f6a381 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -25,7 +25,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 65e44de..83572a8 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -31,7 +31,7 @@ import (
"strings"
"syscall"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/gzip"
"github.com/apache/camel-k/pkg/trait"
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index 3fc96ed..7bb4bd0 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -27,7 +27,7 @@ import (
"github.com/mitchellh/mapstructure"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
diff --git a/pkg/controller/build/action.go b/pkg/controller/build/action.go
index 3d1de7a..cd08667 100644
--- a/pkg/controller/build/action.go
+++ b/pkg/controller/build/action.go
@@ -20,7 +20,7 @@ package build
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
)
diff --git a/pkg/controller/build/build_controller.go b/pkg/controller/build/build_controller.go
index 01cb77f..b69b4a6 100644
--- a/pkg/controller/build/build_controller.go
+++ b/pkg/controller/build/build_controller.go
@@ -35,7 +35,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/platform"
diff --git a/pkg/controller/build/error.go b/pkg/controller/build/error.go
index c291864..cec7f5d 100644
--- a/pkg/controller/build/error.go
+++ b/pkg/controller/build/error.go
@@ -20,7 +20,7 @@ package build
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewErrorAction creates a new error action for scheduled routine
diff --git a/pkg/controller/build/initialize_pod.go b/pkg/controller/build/initialize_pod.go
index 6d7df04..3eb84ef 100644
--- a/pkg/controller/build/initialize_pod.go
+++ b/pkg/controller/build/initialize_pod.go
@@ -28,7 +28,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/install"
)
diff --git a/pkg/controller/build/initialize_routine.go b/pkg/controller/build/initialize_routine.go
index 26716fe..5b668b5 100644
--- a/pkg/controller/build/initialize_routine.go
+++ b/pkg/controller/build/initialize_routine.go
@@ -20,7 +20,7 @@ package build
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewInitializeRoutineAction creates a new initialize action
diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go
index 75b1107..8d7a11b 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -23,7 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewMonitorPodAction creates a new monitor action for scheduled pod
diff --git a/pkg/controller/build/monitor_routine.go b/pkg/controller/build/monitor_routine.go
index 7bf0525..7bdf769 100644
--- a/pkg/controller/build/monitor_routine.go
+++ b/pkg/controller/build/monitor_routine.go
@@ -21,7 +21,7 @@ import (
"context"
"sync"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewMonitorRoutineAction creates a new monitor action for scheduled routine
diff --git a/pkg/controller/build/recovery.go b/pkg/controller/build/recovery.go
index 1f19925..0c6cc9c 100644
--- a/pkg/controller/build/recovery.go
+++ b/pkg/controller/build/recovery.go
@@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewErrorRecoveryAction creates a new error recovering handling action for the build
diff --git a/pkg/controller/build/schedule_pod.go b/pkg/controller/build/schedule_pod.go
index afcb252..ba682b7 100644
--- a/pkg/controller/build/schedule_pod.go
+++ b/pkg/controller/build/schedule_pod.go
@@ -29,7 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/defaults"
)
diff --git a/pkg/controller/build/schedule_routine.go b/pkg/controller/build/schedule_routine.go
index b0db0ed..62e2db8 100644
--- a/pkg/controller/build/schedule_routine.go
+++ b/pkg/controller/build/schedule_routine.go
@@ -27,7 +27,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/util/patch"
)
diff --git a/pkg/controller/integration/action.go b/pkg/controller/integration/action.go
index 4038d42..3b5c5a2 100644
--- a/pkg/controller/integration/action.go
+++ b/pkg/controller/integration/action.go
@@ -20,7 +20,7 @@ package integration
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
)
diff --git a/pkg/controller/integration/build_kit.go b/pkg/controller/integration/build_kit.go
index 91260a0..e8f7078 100644
--- a/pkg/controller/integration/build_kit.go
+++ b/pkg/controller/integration/build_kit.go
@@ -21,7 +21,7 @@ import (
"context"
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util"
"github.com/rs/xid"
diff --git a/pkg/controller/integration/deploy.go b/pkg/controller/integration/deploy.go
index fb22fa4..b398126 100644
--- a/pkg/controller/integration/deploy.go
+++ b/pkg/controller/integration/deploy.go
@@ -20,7 +20,7 @@ package integration
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/pkg/errors"
diff --git a/pkg/controller/integration/error.go b/pkg/controller/integration/error.go
index 277c755..0e18538 100644
--- a/pkg/controller/integration/error.go
+++ b/pkg/controller/integration/error.go
@@ -20,7 +20,7 @@ package integration
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/digest"
)
diff --git a/pkg/controller/integration/initialize.go b/pkg/controller/integration/initialize.go
index 1d6c1a5..f47fa39 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -20,7 +20,7 @@ package integration
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/trait"
diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
index 432f274..63cff5e 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -34,7 +34,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/digest"
"github.com/apache/camel-k/pkg/util/log"
diff --git a/pkg/controller/integration/monitor.go b/pkg/controller/integration/monitor.go
index b11e272..344c694 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -23,7 +23,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/digest"
diff --git a/pkg/controller/integration/platform_setup.go b/pkg/controller/integration/platform_setup.go
index 3142eb0..aed9212 100644
--- a/pkg/controller/integration/platform_setup.go
+++ b/pkg/controller/integration/platform_setup.go
@@ -20,7 +20,7 @@ package integration
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
)
diff --git a/pkg/controller/integration/util.go b/pkg/controller/integration/util.go
index 633565e..bcdbd48 100644
--- a/pkg/controller/integration/util.go
+++ b/pkg/controller/integration/util.go
@@ -27,7 +27,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/controller"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/controller/integration/util_test.go b/pkg/controller/integration/util_test.go
index 13b6762..d7efedc 100644
--- a/pkg/controller/integration/util_test.go
+++ b/pkg/controller/integration/util_test.go
@@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/test"
"github.com/stretchr/testify/assert"
diff --git a/pkg/controller/integrationkit/action.go b/pkg/controller/integrationkit/action.go
index 354b80e..843d303 100644
--- a/pkg/controller/integrationkit/action.go
+++ b/pkg/controller/integrationkit/action.go
@@ -20,7 +20,7 @@ package integrationkit
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
)
diff --git a/pkg/controller/integrationkit/build.go b/pkg/controller/integrationkit/build.go
index ed00d8e..0b3fe26 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -28,7 +28,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/controller/integrationkit/error.go b/pkg/controller/integrationkit/error.go
index 3c0a364..ec22114 100644
--- a/pkg/controller/integrationkit/error.go
+++ b/pkg/controller/integrationkit/error.go
@@ -20,7 +20,7 @@ package integrationkit
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/digest"
)
diff --git a/pkg/controller/integrationkit/initialize.go b/pkg/controller/integrationkit/initialize.go
index 6293b43..0ecde6b 100644
--- a/pkg/controller/integrationkit/initialize.go
+++ b/pkg/controller/integrationkit/initialize.go
@@ -20,7 +20,7 @@ package integrationkit
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/defaults"
)
diff --git a/pkg/controller/integrationkit/integrationkit_controller.go b/pkg/controller/integrationkit/integrationkit_controller.go
index 7ab3bec..d9144aa 100644
--- a/pkg/controller/integrationkit/integrationkit_controller.go
+++ b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -38,7 +38,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
)
diff --git a/pkg/controller/integrationkit/monitor.go b/pkg/controller/integrationkit/monitor.go
index 79fe25a..84177b1 100644
--- a/pkg/controller/integrationkit/monitor.go
+++ b/pkg/controller/integrationkit/monitor.go
@@ -20,7 +20,7 @@ package integrationkit
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/digest"
)
diff --git a/pkg/controller/integrationplatform/action.go b/pkg/controller/integrationplatform/action.go
index 667d1c7..3fe2f6d 100644
--- a/pkg/controller/integrationplatform/action.go
+++ b/pkg/controller/integrationplatform/action.go
@@ -20,7 +20,7 @@ package integrationplatform
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
)
diff --git a/pkg/controller/integrationplatform/create.go b/pkg/controller/integrationplatform/create.go
index 16e9423..42349bf 100644
--- a/pkg/controller/integrationplatform/create.go
+++ b/pkg/controller/integrationplatform/create.go
@@ -24,7 +24,7 @@ import (
"github.com/apache/camel-k/deploy"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/install"
)
diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go
index b0b3474..6c9d507 100644
--- a/pkg/controller/integrationplatform/create_test.go
+++ b/pkg/controller/integrationplatform/create_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"github.com/apache/camel-k/deploy"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index 4baab4a..ccedcb5 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
platformutil "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/defaults"
diff --git a/pkg/controller/integrationplatform/initialize_test.go b/pkg/controller/integrationplatform/initialize_test.go
index e46a1ee..2e67379 100644
--- a/pkg/controller/integrationplatform/initialize_test.go
+++ b/pkg/controller/integrationplatform/initialize_test.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/camel-k/pkg/platform"
"github.com/rs/xid"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/controller/integrationplatform/integrationplatform_controller.go b/pkg/controller/integrationplatform/integrationplatform_controller.go
index cc9ec9a..5b77310 100644
--- a/pkg/controller/integrationplatform/integrationplatform_controller.go
+++ b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -33,7 +33,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
)
diff --git a/pkg/controller/integrationplatform/kaniko_cache.go b/pkg/controller/integrationplatform/kaniko_cache.go
index f8883cb..07e6c8e 100644
--- a/pkg/controller/integrationplatform/kaniko_cache.go
+++ b/pkg/controller/integrationplatform/kaniko_cache.go
@@ -27,7 +27,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder/kaniko"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/defaults"
diff --git a/pkg/controller/integrationplatform/monitor.go b/pkg/controller/integrationplatform/monitor.go
index a96209c..d8968fc 100644
--- a/pkg/controller/integrationplatform/monitor.go
+++ b/pkg/controller/integrationplatform/monitor.go
@@ -20,7 +20,7 @@ package integrationplatform
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
platformutils "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/defaults"
)
diff --git a/pkg/controller/integrationplatform/warm.go b/pkg/controller/integrationplatform/warm.go
index 1978347..7fd48aa 100644
--- a/pkg/controller/integrationplatform/warm.go
+++ b/pkg/controller/integrationplatform/warm.go
@@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewWarmAction returns a action that creates resources needed by the platform
diff --git a/pkg/controller/integrationplatform/warm_test.go b/pkg/controller/integrationplatform/warm_test.go
index ab2b325..d580a2d 100644
--- a/pkg/controller/integrationplatform/warm_test.go
+++ b/pkg/controller/integrationplatform/warm_test.go
@@ -25,7 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/pkg/util/test"
"github.com/rs/xid"
diff --git a/pkg/install/common.go b/pkg/install/common.go
index 479dd50..315c224 100644
--- a/pkg/install/common.go
+++ b/pkg/install/common.go
@@ -22,7 +22,7 @@ import (
"strings"
"github.com/apache/camel-k/deploy"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/openshift"
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index ad49517..3472998 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"github.com/apache/camel-k/deploy"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/envvar"
"github.com/apache/camel-k/pkg/util/knative"
diff --git a/pkg/metadata/http.go b/pkg/metadata/http.go
index 57eed47..be56808 100644
--- a/pkg/metadata/http.go
+++ b/pkg/metadata/http.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
var restIndicator = regexp.MustCompile(`.*rest\s*\([^)]*\).*`)
diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go
index 3ffb27f..6a6e916 100644
--- a/pkg/metadata/metadata.go
+++ b/pkg/metadata/metadata.go
@@ -20,7 +20,7 @@ package metadata
import (
"github.com/scylladb/go-set/strset"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/gzip"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/log"
diff --git a/pkg/metadata/metadata_dependencies_test.go b/pkg/metadata/metadata_dependencies_test.go
index c1d660c..96d6d0b 100644
--- a/pkg/metadata/metadata_dependencies_test.go
+++ b/pkg/metadata/metadata_dependencies_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/metadata/metadata_http_test.go b/pkg/metadata/metadata_http_test.go
index 2a74622..e89365e 100644
--- a/pkg/metadata/metadata_http_test.go
+++ b/pkg/metadata/metadata_http_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/metadata/metadata_uri_test.go b/pkg/metadata/metadata_uri_test.go
index 4e8c12d..8314e8b 100644
--- a/pkg/metadata/metadata_uri_test.go
+++ b/pkg/metadata/metadata_uri_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 067336e..ca8d7c7 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -22,7 +22,7 @@ import (
"fmt"
"time"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/log"
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index e13f14a..f1b8765 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -20,7 +20,7 @@ package platform
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/trait/affinity.go b/pkg/trait/affinity.go
index b373ea8..2326dbb 100644
--- a/pkg/trait/affinity.go
+++ b/pkg/trait/affinity.go
@@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// Allows to constrain which nodes the integration pod(s) are eligible to be scheduled on, based on labels on the node,
diff --git a/pkg/trait/affinity_test.go b/pkg/trait/affinity_test.go
index 97bdabc..9c5b579 100644
--- a/pkg/trait/affinity_test.go
+++ b/pkg/trait/affinity_test.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index cafdfe5..d6d7cd4 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -28,7 +28,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/builder/kaniko"
"github.com/apache/camel-k/pkg/builder/runtime"
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index 1faf881..591c8a0 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/builder/kaniko"
"github.com/apache/camel-k/pkg/builder/s2i"
"github.com/apache/camel-k/pkg/util/camel"
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 37a31e4..836cb6c 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -25,7 +25,7 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index 3514d94..8e20b64 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/classpath.go b/pkg/trait/classpath.go
index ee76d36..aedbf91 100644
--- a/pkg/trait/classpath.go
+++ b/pkg/trait/classpath.go
@@ -27,7 +27,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
)
diff --git a/pkg/trait/classpath_test.go b/pkg/trait/classpath_test.go
index c214799..3c4c221 100644
--- a/pkg/trait/classpath_test.go
+++ b/pkg/trait/classpath_test.go
@@ -28,7 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 2bc6ba3..74cff3d 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -21,7 +21,7 @@ import (
"fmt"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index 9e86f71..26c20c5 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/debug.go b/pkg/trait/debug.go
index 87ad9c7..9ecaed8 100644
--- a/pkg/trait/debug.go
+++ b/pkg/trait/debug.go
@@ -18,7 +18,7 @@ limitations under the License.
package trait
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
)
diff --git a/pkg/trait/debug_test.go b/pkg/trait/debug_test.go
index 16b401e..71ea9d1 100644
--- a/pkg/trait/debug_test.go
+++ b/pkg/trait/debug_test.go
@@ -24,7 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/envvar"
)
diff --git a/pkg/trait/dependencies.go b/pkg/trait/dependencies.go
index 4781d4e..4ab558c 100644
--- a/pkg/trait/dependencies.go
+++ b/pkg/trait/dependencies.go
@@ -21,7 +21,7 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util"
)
diff --git a/pkg/trait/dependencies_test.go b/pkg/trait/dependencies_test.go
index be67117..5862b5c 100644
--- a/pkg/trait/dependencies_test.go
+++ b/pkg/trait/dependencies_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/trait/deployer.go b/pkg/trait/deployer.go
index 5807b51..002e6a6 100644
--- a/pkg/trait/deployer.go
+++ b/pkg/trait/deployer.go
@@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/patch"
)
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 9aa9e32..a943c1e 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// The Deployment trait is responsible for generating the Kubernetes deployment that will make sure
diff --git a/pkg/trait/deployment_test.go b/pkg/trait/deployment_test.go
index 29fac87..c03378d 100644
--- a/pkg/trait/deployment_test.go
+++ b/pkg/trait/deployment_test.go
@@ -21,7 +21,7 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index 5343c89..7621220 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -18,7 +18,7 @@ limitations under the License.
package trait
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/envvar"
)
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index 6c5b960..2e19937 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -28,7 +28,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go
index 111d67d..03877b4 100644
--- a/pkg/trait/gc.go
+++ b/pkg/trait/gc.go
@@ -38,7 +38,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
util "github.com/apache/camel-k/pkg/util/controller"
)
diff --git a/pkg/trait/gc_test.go b/pkg/trait/gc_test.go
index f78a877..81d2c33 100644
--- a/pkg/trait/gc_test.go
+++ b/pkg/trait/gc_test.go
@@ -21,7 +21,7 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go
index 3640076..345026a 100644
--- a/pkg/trait/ingress.go
+++ b/pkg/trait/ingress.go
@@ -21,7 +21,7 @@ import (
"errors"
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/pkg/trait/ingress_test.go b/pkg/trait/ingress_test.go
index 8b09fe9..3b99479 100644
--- a/pkg/trait/ingress_test.go
+++ b/pkg/trait/ingress_test.go
@@ -21,7 +21,7 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/stretchr/testify/assert"
diff --git a/pkg/trait/istio.go b/pkg/trait/istio.go
index fef2318..39230c6 100644
--- a/pkg/trait/istio.go
+++ b/pkg/trait/istio.go
@@ -24,7 +24,7 @@ import (
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// The Istio trait allows to configure properties related to the Istio service mesh,
diff --git a/pkg/trait/istio_test.go b/pkg/trait/istio_test.go
index 50c006f..20c12d5 100644
--- a/pkg/trait/istio_test.go
+++ b/pkg/trait/istio_test.go
@@ -28,7 +28,7 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index e6c09d3..9972b1a 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -22,7 +22,7 @@ import (
"strconv"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index bc38521..858da87 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -24,7 +24,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index fa882e3..b05bc8a 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -21,7 +21,7 @@ import (
"net/url"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
knativeapi "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util/envvar"
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 0ebac89..58eead5 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -25,7 +25,7 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go
index 6ef874d..6a312ce 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -28,7 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/envvar"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index 4c7c0df..c60271f 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -34,7 +34,7 @@ import (
duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
knativeapi "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/camel"
diff --git a/pkg/trait/owner.go b/pkg/trait/owner.go
index 5f7c13d..f976d20 100644
--- a/pkg/trait/owner.go
+++ b/pkg/trait/owner.go
@@ -20,7 +20,7 @@ package trait
import (
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/trait/owner_test.go b/pkg/trait/owner_test.go
index 48ca778..f0c42a2 100644
--- a/pkg/trait/owner_test.go
+++ b/pkg/trait/owner_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
diff --git a/pkg/trait/platform.go b/pkg/trait/platform.go
index 476c15e..360c06c 100644
--- a/pkg/trait/platform.go
+++ b/pkg/trait/platform.go
@@ -18,7 +18,7 @@ limitations under the License.
package trait
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/openshift"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/trait/platform_test.go b/pkg/trait/platform_test.go
index f7dc8dd..e8808c6 100644
--- a/pkg/trait/platform_test.go
+++ b/pkg/trait/platform_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/probes.go b/pkg/trait/probes.go
index dbb9de1..66e6444 100644
--- a/pkg/trait/probes.go
+++ b/pkg/trait/probes.go
@@ -21,7 +21,7 @@ import (
"sort"
"strconv"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/pkg/trait/probes_test.go b/pkg/trait/probes_test.go
index 41e56f8..68bc163 100644
--- a/pkg/trait/probes_test.go
+++ b/pkg/trait/probes_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/stretchr/testify/assert"
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index eb847ce..b995f63 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -21,7 +21,7 @@ import (
"fmt"
"strconv"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/envvar"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/prometheus_test.go b/pkg/trait/prometheus_test.go
index 7b8958d..f5f7ab0 100644
--- a/pkg/trait/prometheus_test.go
+++ b/pkg/trait/prometheus_test.go
@@ -21,7 +21,7 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
diff --git a/pkg/trait/pull_secret.go b/pkg/trait/pull_secret.go
index 531d7a6..60b5d8f 100644
--- a/pkg/trait/pull_secret.go
+++ b/pkg/trait/pull_secret.go
@@ -18,7 +18,7 @@ limitations under the License.
package trait
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/trait/pull_secret_test.go b/pkg/trait/pull_secret_test.go
index 49dc93e..c5e7b9e 100644
--- a/pkg/trait/pull_secret_test.go
+++ b/pkg/trait/pull_secret_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/rest-dsl.go b/pkg/trait/rest-dsl.go
index d709be5..dd33722 100644
--- a/pkg/trait/rest-dsl.go
+++ b/pkg/trait/rest-dsl.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/gzip"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/trait/rest-dsl_test.go b/pkg/trait/rest-dsl_test.go
index 96ce109..d02203c 100644
--- a/pkg/trait/rest-dsl_test.go
+++ b/pkg/trait/rest-dsl_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/trait/route.go b/pkg/trait/route.go
index 324a5f2..fcee58a 100644
--- a/pkg/trait/route.go
+++ b/pkg/trait/route.go
@@ -27,7 +27,7 @@ import (
routev1 "github.com/openshift/api/route/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// The Route trait can be used to configure the creation of OpenShift routes for the integration.
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index 5d1950c..87c0068 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/service.go b/pkg/trait/service.go
index f7e6465..4fda5f2 100644
--- a/pkg/trait/service.go
+++ b/pkg/trait/service.go
@@ -18,7 +18,7 @@ limitations under the License.
package trait
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util/kubernetes"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index b37f861..f5e6d9f 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -28,7 +28,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/trait.go b/pkg/trait/trait.go
index ccb195b..649e817 100644
--- a/pkg/trait/trait.go
+++ b/pkg/trait/trait.go
@@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/kubernetes"
diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go
index dac3470..102744d 100644
--- a/pkg/trait/trait_catalog.go
+++ b/pkg/trait/trait_catalog.go
@@ -23,7 +23,7 @@ import (
"reflect"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
"github.com/fatih/structs"
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 12800c1..0738777 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
)
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index dc716da..2e0ca92 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/platform"
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index c477def..1924bca 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -28,7 +28,7 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/scylladb/go-set/strset"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/trait/util_test.go b/pkg/trait/util_test.go
index f30d4d1..30ad2e1 100644
--- a/pkg/trait/util_test.go
+++ b/pkg/trait/util_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
func TestCollectConfigurationValues(t *testing.T) {
diff --git a/pkg/util/camel/camel_runtime.go b/pkg/util/camel/camel_runtime.go
index 7393b48..a9b91ff 100644
--- a/pkg/util/camel/camel_runtime.go
+++ b/pkg/util/camel/camel_runtime.go
@@ -25,7 +25,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/controller"
)
diff --git a/pkg/util/camel/camel_runtime_catalog.go b/pkg/util/camel/camel_runtime_catalog.go
index 432cae1..38bee12 100644
--- a/pkg/util/camel/camel_runtime_catalog.go
+++ b/pkg/util/camel/camel_runtime_catalog.go
@@ -20,7 +20,7 @@ package camel
import (
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// NewRuntimeCatalog --
diff --git a/pkg/util/camel/camel_types.go b/pkg/util/camel/camel_types.go
index d405756..60524ef 100644
--- a/pkg/util/camel/camel_types.go
+++ b/pkg/util/camel/camel_types.go
@@ -19,7 +19,7 @@ package camel
import (
"github.com/Masterminds/semver"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// CatalogVersion --
diff --git a/pkg/util/camel/camel_util.go b/pkg/util/camel/camel_util.go
index 1e7a3f3..a6510a3 100644
--- a/pkg/util/camel/camel_util.go
+++ b/pkg/util/camel/camel_util.go
@@ -22,7 +22,7 @@ import (
"github.com/Masterminds/semver"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/log"
)
diff --git a/pkg/util/camel/camel_util_test.go b/pkg/util/camel/camel_util_test.go
index 0c516b6..64a1592 100644
--- a/pkg/util/camel/camel_util_test.go
+++ b/pkg/util/camel/camel_util_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
func TestFindBestMatch_Camel(t *testing.T) {
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index beff329..ba60598 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -29,7 +29,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/apache/camel-k/deploy"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/maven"
diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go
index 8e2eead..ea5afa7 100644
--- a/pkg/util/digest/digest.go
+++ b/pkg/util/digest/digest.go
@@ -24,7 +24,7 @@ import (
"sort"
"strconv"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/defaults"
)
diff --git a/pkg/util/kubernetes/collection.go b/pkg/util/kubernetes/collection.go
index 71b839a..c75e745 100644
--- a/pkg/util/kubernetes/collection.go
+++ b/pkg/util/kubernetes/collection.go
@@ -18,7 +18,7 @@ limitations under the License.
package kubernetes
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
routev1 "github.com/openshift/api/route/v1"
appsv1 "k8s.io/api/apps/v1"
diff --git a/pkg/util/kubernetes/customclient/customclient.go b/pkg/util/kubernetes/customclient/customclient.go
index f705ebf..d3810be 100644
--- a/pkg/util/kubernetes/customclient/customclient.go
+++ b/pkg/util/kubernetes/customclient/customclient.go
@@ -18,7 +18,7 @@ limitations under the License.
package customclient
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
diff --git a/pkg/util/kubernetes/log/util.go b/pkg/util/kubernetes/log/util.go
index a8f1458..bd72a94 100644
--- a/pkg/util/kubernetes/log/util.go
+++ b/pkg/util/kubernetes/log/util.go
@@ -23,7 +23,7 @@ import (
"io"
"io/ioutil"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"k8s.io/client-go/kubernetes"
)
diff --git a/pkg/util/kubernetes/resolver.go b/pkg/util/kubernetes/resolver.go
index b4cb190..fbb3eff 100644
--- a/pkg/util/kubernetes/resolver.go
+++ b/pkg/util/kubernetes/resolver.go
@@ -21,7 +21,7 @@ import (
"context"
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
controller "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/util/kubernetes/util.go b/pkg/util/kubernetes/util.go
index e1a1c74..9fd960a 100644
--- a/pkg/util/kubernetes/util.go
+++ b/pkg/util/kubernetes/util.go
@@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/json"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
yaml2 "gopkg.in/yaml.v2"
)
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index 98334f8..8287561 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -20,11 +20,9 @@ package log
import (
"fmt"
- logf "sigs.k8s.io/controller-runtime/pkg/log"
-
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/go-logr/logr"
-
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
)
// Log --
diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go
index a6ce756..06f4071 100644
--- a/pkg/util/source/inspector.go
+++ b/pkg/util/source/inspector.go
@@ -21,7 +21,7 @@ import (
"regexp"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/camel"
)
diff --git a/pkg/util/source/inspector_groovy.go b/pkg/util/source/inspector_groovy.go
index 6207915..8ec8823 100644
--- a/pkg/util/source/inspector_groovy.go
+++ b/pkg/util/source/inspector_groovy.go
@@ -18,7 +18,7 @@ limitations under the License.
package source
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
)
diff --git a/pkg/util/source/inspector_java_script.go b/pkg/util/source/inspector_java_script.go
index a207998..60e68f3 100644
--- a/pkg/util/source/inspector_java_script.go
+++ b/pkg/util/source/inspector_java_script.go
@@ -18,7 +18,7 @@ limitations under the License.
package source
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
)
diff --git a/pkg/util/source/inspector_java_source.go b/pkg/util/source/inspector_java_source.go
index 0e6f2c4..7b79198 100644
--- a/pkg/util/source/inspector_java_source.go
+++ b/pkg/util/source/inspector_java_source.go
@@ -18,7 +18,7 @@ limitations under the License.
package source
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
)
diff --git a/pkg/util/source/inspector_kotlin.go b/pkg/util/source/inspector_kotlin.go
index ac5a99d..44efd09 100644
--- a/pkg/util/source/inspector_kotlin.go
+++ b/pkg/util/source/inspector_kotlin.go
@@ -18,7 +18,7 @@ limitations under the License.
package source
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util"
)
diff --git a/pkg/util/source/inspector_xml.go b/pkg/util/source/inspector_xml.go
index f9e3e20..f68d974 100644
--- a/pkg/util/source/inspector_xml.go
+++ b/pkg/util/source/inspector_xml.go
@@ -21,7 +21,7 @@ import (
"encoding/xml"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// XMLInspector --
diff --git a/pkg/util/source/inspector_yaml.go b/pkg/util/source/inspector_yaml.go
index 00e2be1..1a4ed47 100644
--- a/pkg/util/source/inspector_yaml.go
+++ b/pkg/util/source/inspector_yaml.go
@@ -20,7 +20,7 @@ package source
import (
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
yaml2 "gopkg.in/yaml.v2"
)
diff --git a/pkg/util/watch/watch.go b/pkg/util/watch/watch.go
index 1db7d76..baaaa7c 100644
--- a/pkg/util/watch/watch.go
+++ b/pkg/util/watch/watch.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes/customclient"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
diff --git a/script/Makefile b/script/Makefile
index 65bde1c..3e75d44 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -166,6 +166,10 @@ dep:
lint:
GOGC=$(LINT_GOGC) golangci-lint run --verbose --deadline $(LINT_DEADLINE)
+lint-fix:
+ GOGC=$(LINT_GOGC) golangci-lint run --verbose --deadline $(LINT_DEADLINE) --fix
+
+
check-licenses:
./script/check_licenses.sh