You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/10/01 13:53:51 UTC
[camel-k] 08/08: Fix #952: fix findings
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6928b9cd7db36589025161f8af1be12c38a4f8e0
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Sep 27 13:07:16 2019 +0200
Fix #952: fix findings
---
pkg/apis/knative08compat/knative08compat.go | 2 --
pkg/trait/knative_test.go | 4 ++--
pkg/util/knative/knative.go | 8 ++------
pkg/util/kubernetes/collection.go | 5 ++---
pkg/util/kubernetes/replace.go | 6 +++---
5 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/pkg/apis/knative08compat/knative08compat.go b/pkg/apis/knative08compat/knative08compat.go
index a43a73f..d3b1cdf 100644
--- a/pkg/apis/knative08compat/knative08compat.go
+++ b/pkg/apis/knative08compat/knative08compat.go
@@ -49,7 +49,6 @@ func (in *Subscription) DeepCopyInto(out *Subscription) {
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.Spec.DeepCopyInto(&out.Spec)
in.Status.DeepCopyInto(&out.Status)
- return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Subscription.
@@ -82,7 +81,6 @@ func (in *SubscriptionList) DeepCopyInto(out *SubscriptionList) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
- return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SubscriptionList.
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index 35b0a66..422eccd 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -19,8 +19,6 @@ package trait
import (
"context"
- "k8s.io/apimachinery/pkg/runtime/schema"
- "knative.dev/pkg/apis"
"testing"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
@@ -36,7 +34,9 @@ import (
k8sutils "github.com/apache/camel-k/pkg/util/kubernetes"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime/schema"
messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
+ "knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
diff --git a/pkg/util/knative/knative.go b/pkg/util/knative/knative.go
index bfa7343..bc5b3bd 100644
--- a/pkg/util/knative/knative.go
+++ b/pkg/util/knative/knative.go
@@ -114,9 +114,7 @@ func GetAnySinkURL(ctx context.Context, c client.Client, types []schema.GroupVer
}
res, err := GetSinkURI(ctx, c, &sink, namespace)
- if err != nil && k8serrors.IsNotFound(err) {
- continue
- } else if err != nil && kubernetesutils.IsUnknownAPIError(err) {
+ if err != nil && (k8serrors.IsNotFound(err) || kubernetesutils.IsUnknownAPIError(err)) {
continue
} else if err != nil {
return nil, err
@@ -137,9 +135,7 @@ func GetAddressableReference(ctx context.Context, c client.Client, types []schem
}
_, err := GetSinkURI(ctx, c, &sink, namespace)
- if err != nil && k8serrors.IsNotFound(err) {
- continue
- } else if err != nil && kubernetesutils.IsUnknownAPIError(err) {
+ if err != nil && (k8serrors.IsNotFound(err) || kubernetesutils.IsUnknownAPIError(err)) {
continue
} else if err != nil {
return nil, err
diff --git a/pkg/util/kubernetes/collection.go b/pkg/util/kubernetes/collection.go
index 0f52d4a..bc84cea 100644
--- a/pkg/util/kubernetes/collection.go
+++ b/pkg/util/kubernetes/collection.go
@@ -19,14 +19,13 @@ package kubernetes
import (
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- serving "knative.dev/serving/pkg/apis/serving/v1beta1"
- servingv1 "knative.dev/serving/pkg/apis/serving/v1"
routev1 "github.com/openshift/api/route/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
"k8s.io/apimachinery/pkg/runtime"
+ servingv1 "knative.dev/serving/pkg/apis/serving/v1"
+ serving "knative.dev/serving/pkg/apis/serving/v1beta1"
)
// A Collection is a container of Kubernetes resources
diff --git a/pkg/util/kubernetes/replace.go b/pkg/util/kubernetes/replace.go
index cbf5029..7a25ab3 100644
--- a/pkg/util/kubernetes/replace.go
+++ b/pkg/util/kubernetes/replace.go
@@ -21,16 +21,16 @@ import (
"context"
"github.com/apache/camel-k/pkg/client"
- messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
routev1 "github.com/openshift/api/route/v1"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- serving "knative.dev/serving/pkg/apis/serving/v1beta1"
+ messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
+ serving "knative.dev/serving/pkg/apis/serving/v1beta1"
+ k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
// ReplaceResources allows to completely replace a list of resources on Kubernetes, taking care of immutable fields and resource versions