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/12/09 14:13:50 UTC
[camel-k] 02/03: Fix #1112: upgrade to knative 0.10
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 dd0b09d37d71bb42d0bb806368a9882281b76c52
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Thu Dec 5 16:22:13 2019 +0100
Fix #1112: upgrade to knative 0.10
---
go.mod | 6 +++---
go.sum | 12 ++++++------
pkg/util/knative/knative.go | 5 +++--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/go.mod b/go.mod
index d35bfdf..5af83f5 100644
--- a/go.mod
+++ b/go.mod
@@ -31,9 +31,9 @@ require (
k8s.io/apimachinery v0.0.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
- knative.dev/eventing v0.9.0
- knative.dev/pkg v0.0.0-20191017202117-b5a8deb92e5c
- knative.dev/serving v0.9.0
+ knative.dev/eventing v0.10.0
+ knative.dev/pkg v0.0.0-20191107185656-884d50f09454
+ knative.dev/serving v0.10.0
sigs.k8s.io/controller-runtime v0.3.0
)
diff --git a/go.sum b/go.sum
index cebac5f..c55c3c8 100644
--- a/go.sum
+++ b/go.sum
@@ -776,12 +776,12 @@ k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y=
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-knative.dev/eventing v0.9.0 h1:0eqp7rES1E5DE5Hj3MOHHyM2BzCe/7Mtp5tPjYoeCxs=
-knative.dev/eventing v0.9.0/go.mod h1:UxweNv8yXhsdHJitcb9R6rmfNaUD2DFi9GWwNRyIs58=
-knative.dev/pkg v0.0.0-20191017202117-b5a8deb92e5c h1:8JcuEBoJQJ6XyR72emqB2cQg/3UZfRREY2lMAJw92n4=
-knative.dev/pkg v0.0.0-20191017202117-b5a8deb92e5c/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
-knative.dev/serving v0.9.0 h1:GVnsksAEX6vMXGygvzsGPIrFTypiesaseK7emm0LKWQ=
-knative.dev/serving v0.9.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
+knative.dev/eventing v0.10.0 h1:dDrOjBWWgloOCUjxR8ixUIh8nqCTbmM5BbGo8rvf1bc=
+knative.dev/eventing v0.10.0/go.mod h1:UxweNv8yXhsdHJitcb9R6rmfNaUD2DFi9GWwNRyIs58=
+knative.dev/pkg v0.0.0-20191107185656-884d50f09454 h1:nkslWFyRWaJp3nPDm+GSQOSvN8NpZg8qIYTR+XssNNg=
+knative.dev/pkg v0.0.0-20191107185656-884d50f09454/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
+knative.dev/serving v0.10.0 h1:T1csznAQrc/DvCE4KROz4NqOtJ24mnU9eF9RMeeYaCc=
+knative.dev/serving v0.10.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
diff --git a/pkg/util/knative/knative.go b/pkg/util/knative/knative.go
index 5e4aabf..8c24d3d 100644
--- a/pkg/util/knative/knative.go
+++ b/pkg/util/knative/knative.go
@@ -39,6 +39,7 @@ import (
messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
"knative.dev/pkg/apis/duck"
duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
+ apisv1alpha1 "knative.dev/pkg/apis/v1alpha1"
serving "knative.dev/serving/pkg/apis/serving/v1beta1"
)
@@ -86,7 +87,7 @@ func CreateSubscription(channelReference corev1.ObjectReference, serviceName str
Kind: channelReference.Kind,
Name: channelReference.Name,
},
- Subscriber: &messaging.SubscriberSpec{
+ Subscriber: &apisv1alpha1.Destination{
Ref: &corev1.ObjectReference{
APIVersion: serving.SchemeGroupVersion.String(),
Kind: "Service",
@@ -117,7 +118,7 @@ func CreateTrigger(brokerReference corev1.ObjectReference, serviceName string, e
},
},
Broker: brokerReference.Name,
- Subscriber: &messaging.SubscriberSpec{
+ Subscriber: &apisv1alpha1.Destination{
Ref: &corev1.ObjectReference{
APIVersion: serving.SchemeGroupVersion.String(),
Kind: "Service",