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 2020/09/03 14:43:27 UTC
[camel-k] branch master updated: Fix #1670: upgrade to Knative 0.16
and support from 0.15 to 0.17 (#1685)
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
The following commit(s) were added to refs/heads/master by this push:
new 85cc176 Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17 (#1685)
85cc176 is described below
commit 85cc1764b61a1e4a49f0345dc775e49d67a35ee5
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Thu Sep 3 16:43:20 2020 +0200
Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17 (#1685)
* Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17
* Fix #1668: restore catalog and fix source version
* Fix #1668: add sugar controller to enable broker injection in e2e tests
---
.github/workflows/knative.yml | 22 +++++++++++-------
e2e/support/test_support.go | 13 +++++------
go.mod | 10 ++++-----
go.sum | 38 ++++++++++++++++++++++++++++++++
pkg/apis/addtoscheme_knative_eventing.go | 10 +++++----
pkg/trait/knative.go | 5 ++---
pkg/trait/knative_test.go | 35 ++++++++++++++---------------
pkg/util/knative/apis.go | 22 +++++++++---------
pkg/util/knative/apis_test.go | 14 ++++++------
pkg/util/knative/knative.go | 12 +++++-----
pkg/util/knative/uri_test.go | 6 ++---
pkg/util/kubernetes/collection.go | 2 +-
pkg/util/kubernetes/replace.go | 10 ---------
13 files changed, 115 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index cac2970..e27f1e1 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -102,9 +102,9 @@ jobs:
# Prerequisites
sudo pip install yq
- export SERVING_VERSION=v0.14.0
- export EVENTING_VERSION=v0.14.1
- export SOURCES_VERSION=v0.14.1
+ export SERVING_VERSION=v0.16.0
+ export EVENTING_VERSION=v0.16.2
+ export SOURCES_VERSION=v0.16.0
# Serving
kubectl apply --filename https://github.com/knative/serving/releases/download/$SERVING_VERSION/serving-crds.yaml
@@ -125,7 +125,10 @@ jobs:
curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/in-memory-channel.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
# Eventing broker
- curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/channel-broker.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
+ curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/mt-channel-broker.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
+
+ # Eventing sugar controller for injection
+ kubectl apply -f https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/eventing-sugar-controller.yaml
# Camel Sources
kubectl apply --filename https://github.com/knative/eventing-contrib/releases/download/$SOURCES_VERSION/camel.yaml
@@ -251,9 +254,9 @@ jobs:
# Prerequisites
sudo pip install yq
- export SERVING_VERSION=v0.14.0
- export EVENTING_VERSION=v0.14.1
- export SOURCES_VERSION=v0.14.1
+ export SERVING_VERSION=v0.16.0
+ export EVENTING_VERSION=v0.16.2
+ export SOURCES_VERSION=v0.16.0
# Serving
kubectl apply --filename https://github.com/knative/serving/releases/download/$SERVING_VERSION/serving-crds.yaml
@@ -274,7 +277,10 @@ jobs:
curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/in-memory-channel.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
# Eventing broker
- curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/channel-broker.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
+ curl -L -s https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/mt-channel-broker.yaml | yq 'del(.spec.template.spec.containers[]?.resources)' -y | kubectl apply -f -
+
+ # Eventing sugar controller for injection
+ kubectl apply -f https://github.com/knative/eventing/releases/download/$EVENTING_VERSION/eventing-sugar-controller.yaml
# Camel Sources
kubectl apply --filename https://github.com/knative/eventing-contrib/releases/download/$SOURCES_VERSION/camel.yaml
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 6f76aba..33d7bf4 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -57,9 +57,8 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
- messagingv1alpha1 "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
- messagingv1beta1 "knative.dev/eventing/pkg/apis/messaging/v1beta1"
+ eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+ messaging "knative.dev/eventing/pkg/apis/messaging/v1beta1"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
// let's enable addons in all tests
@@ -881,10 +880,10 @@ func CreateKamelPod(ns string, name string, command ...string) error {
func CreateKnativeChannelv1Alpha1(ns string, name string) func() error {
return func() error {
- channel := messagingv1alpha1.InMemoryChannel{
+ channel := messaging.InMemoryChannel{
TypeMeta: metav1.TypeMeta{
Kind: "InMemoryChannel",
- APIVersion: messagingv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
@@ -897,10 +896,10 @@ func CreateKnativeChannelv1Alpha1(ns string, name string) func() error {
func CreateKnativeChannelv1Beta1(ns string, name string) func() error {
return func() error {
- channel := messagingv1beta1.InMemoryChannel{
+ channel := messaging.InMemoryChannel{
TypeMeta: metav1.TypeMeta{
Kind: "InMemoryChannel",
- APIVersion: messagingv1beta1.SchemeGroupVersion.String(),
+ APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
diff --git a/go.mod b/go.mod
index b292d07..196c650 100644
--- a/go.mod
+++ b/go.mod
@@ -42,14 +42,14 @@ require (
k8s.io/apimachinery v0.18.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12
- knative.dev/eventing v0.15.0
- knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7
- knative.dev/serving v0.15.0
+ knative.dev/eventing v0.16.2
+ knative.dev/pkg v0.0.0-20200702222342-ea4d6e985ba0
+ knative.dev/serving v0.16.0
sigs.k8s.io/controller-runtime v0.5.2
)
-// Pinned to Kubernetes 1.17.6:
-// - Knative 0.15.0 requires 1.16.4
+// Pinned to Kubernetes 0.17.6:
+// - Knative 0.16.0 requires 0.17.6
// - Operator SDK 0.17.1 requires 1.17.4
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
diff --git a/go.sum b/go.sum
index c5bf1b1..40b5e55 100644
--- a/go.sum
+++ b/go.sum
@@ -189,6 +189,7 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
github.com/aslakhellesoy/gox v1.0.100/go.mod h1:AJl542QsKKG96COVsv0N74HHzVQgDIQPceVUh1aeU2M=
github.com/aws/aws-k8s-tester v0.0.0-20190114231546-b411acf57dfe/go.mod h1:1ADF5tAtU1/mVtfMcHAYSm2fPw71DA7fFk0yed64/0I=
github.com/aws/aws-k8s-tester v0.9.3/go.mod h1:nsh1f7joi8ZI1lvR+Ron6kJM2QdCYPU/vFePghSSuTc=
+github.com/aws/aws-k8s-tester v1.0.0/go.mod h1:NUNd9k43+h9O5tvwL+4N1Ctb//SapmeeFX1G0/2/0Qc=
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
@@ -205,6 +206,8 @@ github.com/aws/aws-sdk-go v1.27.1 h1:MXnqY6SlWySaZAqNnXThOvjRFdiiOuKtC6i7baFdNdU
github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.29.32/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
github.com/aws/aws-sdk-go v1.29.34/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
+github.com/aws/aws-sdk-go v1.30.4/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
github.com/benbjohnson/clock v1.0.0/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -259,9 +262,11 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp
github.com/clarketm/json v1.13.4/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudevents/sdk-go v0.0.0-20190509003705-56931988abe3/go.mod h1:j1nZWMLGg3om8SswStBoY6/SHvcLM19MuZqwDtMtmzs=
+github.com/cloudevents/sdk-go v1.0.0/go.mod h1:3TkmM0cFqkhCHOq5JzzRU/RxRkwzoS8TZ+G448qVTog=
github.com/cloudevents/sdk-go v1.1.2/go.mod h1:ss+jWJ88wypiewnPEzChSBzTYXGpdcILoN9YHk8uhTQ=
github.com/cloudevents/sdk-go v1.2.0/go.mod h1:ss+jWJ88wypiewnPEzChSBzTYXGpdcILoN9YHk8uhTQ=
github.com/cloudevents/sdk-go/v2 v2.0.0-RC4/go.mod h1:/1Ntmoq0bPbVtRedMtX+58TicVkehGQGu5FIigC38JQ=
+github.com/cloudevents/sdk-go/v2 v2.0.1-0.20200630063327-b91da81265fe/go.mod h1:3CTrpB4+u7Iaj6fd7E2Xvm5IxMdRoaAhqaRVnOr2rCU=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
@@ -419,11 +424,13 @@ github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aev
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
+github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-ini/ini v1.46.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
+github.com/go-ini/ini v1.55.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -740,6 +747,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
github.com/jenkins-x/go-scm v1.5.65/go.mod h1:MgGRkJScE/rJ30J/bXYqduN5sDPZqZFITJopsnZmTOw=
+github.com/jenkins-x/go-scm v1.5.79/go.mod h1:PCT338UhP/pQ0IeEeMEf/hoLTYKcH7qjGEKd7jPkeYg=
github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jinzhu/gorm v0.0.0-20170316141641-572d0a0ab1eb/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo=
@@ -947,6 +955,7 @@ github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -1223,7 +1232,9 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/tektoncd/pipeline v0.8.0/go.mod h1:IZzJdiX9EqEMuUcgdnElozdYYRh0/ZRC+NKMLj1K3Yw=
github.com/tektoncd/pipeline v0.10.1/go.mod h1:D2X0exT46zYx95BU7ByM8+erpjoN7thmUBvlKThOszU=
+github.com/tektoncd/pipeline v0.11.0/go.mod h1:hlkH32S92+/UODROH0dmxzyuMxfRFp/Nc3e29MewLn8=
github.com/tektoncd/plumbing v0.0.0-20191216083742-847dcf196de9/go.mod h1:QZHgU07PRBTRF6N57w4+ApRu8OgfYLFNqCDlfEZaD9Y=
+github.com/tektoncd/plumbing v0.0.0-20200217163359-cd0db6e567d2/go.mod h1:QZHgU07PRBTRF6N57w4+ApRu8OgfYLFNqCDlfEZaD9Y=
github.com/tektoncd/plumbing/pipelinerun-logs v0.0.0-20191206114338-712d544c2c21/go.mod h1:S62EUWtqmejjJgUMOGB1CCCHRp6C706laH06BoALkzU=
github.com/thanos-io/thanos v0.11.0/go.mod h1:N/Yes7J68KqvmY+xM6J5CJqEvWIvKSR5sqGtmuD6wDc=
github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -1295,16 +1306,20 @@ go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/otel v0.2.3/go.mod h1:OgNpQOjrlt33Ew6Ds0mGjmcTQg/rhUctsbkRdk/g1fw=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/automaxprocs v1.2.0/go.mod h1:YfO3fm683kQpzETxlTGZhGIVmXAhaw3gxeBADbpZtnU=
go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
@@ -1313,6 +1328,7 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo=
go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI=
@@ -1600,6 +1616,7 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
golang.org/x/tools v0.0.0-20200210192313-1ace956b0e17 h1:a/Fd23DJvg1CaeDH0dYHahE+hCI0v9rFgxSNIThoUcM=
golang.org/x/tools v0.0.0-20200210192313-1ace956b0e17/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200214144324-88be01311a71/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200303214625-2b0b585e22fe/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
@@ -1716,6 +1733,7 @@ google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1776,6 +1794,7 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
helm.sh/helm/v3 v3.1.0/go.mod h1:WYsFJuMASa/4XUqLyv54s0U/f3mlAaRErGmyy4z921g=
@@ -1793,7 +1812,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
istio.io/api v0.0.0-20191109011807-2629c6ac1513/go.mod h1:+cyHH83OwC0rFpwk8eXctzPNpiCAbB+r6kmMiAxxBHw=
istio.io/api v0.0.0-20191115173247-e1a1952e5b81/go.mod h1:+cyHH83OwC0rFpwk8eXctzPNpiCAbB+r6kmMiAxxBHw=
+istio.io/api v0.0.0-20200512234804-e5412c253ffe/go.mod h1:kyq3g5w42zl/AKlbzDGppYpGMQYMYMyZKeq0/eexML8=
istio.io/client-go v0.0.0-20191120150049-26c62a04cdbc/go.mod h1:Bn3fm/aQ7JXVHiMYB4TrSp+NnUlZ5A5sH20xwzureII=
+istio.io/client-go v0.0.0-20200513000250-b1d6e9886b7b/go.mod h1:aUDVNCOKom8n53OPEb7JxKucbKVNveDY4WJj7PGQb14=
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
istio.io/gogo-genproto v0.0.0-20191029161641-f7d19ec0141d/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
k8s.io/api v0.17.6 h1:S6qZSkjdOU0N/TYBZKoR1o7YVSiWMGFU0XXDoqs2ioA=
@@ -1844,6 +1865,7 @@ k8s.io/metrics v0.17.6/go.mod h1:5AuIG+m+U5ga8DpqAUqQWBhGVyY485HfKpn471pmWrQ=
k8s.io/test-infra v0.0.0-20181019233642-2e10a0bbe9b3/go.mod h1:2NzXB13Ji0nqpyublHeiPC4FZwU0TknfvyaaNfl/BTA=
k8s.io/test-infra v0.0.0-20191212060232-70b0b49fe247/go.mod h1:d8SKryJBXAwfCFVL4wieRez47J2NOOAb9d029sWLseQ=
k8s.io/test-infra v0.0.0-20200407001919-bc7f71ef65b8/go.mod h1:/WpJWcaDvuykB322WXP4kJbX8IpalOzuPxA62GpwkJk=
+k8s.io/test-infra v0.0.0-20200514184223-ba32c8aae783/go.mod h1:bW6thaPZfL2hW7ecjx2WYwlP9KQLM47/xIJyttkVk5s=
k8s.io/utils v0.0.0-20181019225348-5e321f9a457c/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
@@ -1856,14 +1878,23 @@ k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl
k8s.io/utils v0.0.0-20200124190032-861946025e34 h1:HjlUD6M0K3P8nRXmr2B9o4F9dUy9TCj/aEpReeyi6+k=
k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
+knative.dev/caching v0.0.0-20200116200605-67bca2c83dfa/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
knative.dev/caching v0.0.0-20200521155757-e78d17bc250e/go.mod h1:bsKPIG2XZFYL8uw5BAxg7EMBLp0vNpu9jZIGus8HUPU=
+knative.dev/caching v0.0.0-20200630172829-a78409990d76/go.mod h1:iyrTBBqVs1H+bmj+mqyGEgNiLBzuGsY1LslIayGy0OE=
knative.dev/eventing v0.14.1 h1:YmnEl3IBVRkBcVYWPMWZegRGifeI7ibcA9xuhHWvAaw=
knative.dev/eventing v0.14.1/go.mod h1:UxweNv8yXhsdHJitcb9R6rmfNaUD2DFi9GWwNRyIs58=
knative.dev/eventing v0.15.0 h1:0/RdQJ4RLixycbeHgJ7JTcStL64iacafU5NTh0CDOIs=
knative.dev/eventing v0.15.0/go.mod h1:J6FnmHXZaB3g2TmP2QkzUCuiysahAEHAdvpWx2gRh0o=
+knative.dev/eventing v0.16.2 h1:IgPvW8g6gZjSfgd41EdFfJHI+k2t9j0gJpbPVhHd7BQ=
+knative.dev/eventing v0.16.2/go.mod h1:jU8gg/VL4ZBDkAlqTPaBMnoC1Vrw/2ue1n4vc19EN5k=
+knative.dev/eventing v0.17.3 h1:Ie2VpLAegWzqAd/SxYUylr4c1mqLVvmx0fkc9DMVbgo=
knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
+knative.dev/eventing-contrib v0.11.2/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
+knative.dev/networking v0.0.0-20200630191330-5080f859c17d h1:/U/lrkoEsrnDc3LHpaKHhy0uRVXpxOpH8eGVdDltsLE=
+knative.dev/networking v0.0.0-20200630191330-5080f859c17d/go.mod h1:76Bt5r+xMgNrjwIjSvCvuQwbYG23cTFDIDrxU1ECA54=
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
+knative.dev/pkg v0.0.0-20200207155214-fef852970f43/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/pkg v0.0.0-20200410152005-2a1db869228c h1:+Ob3pOC0WuNFxKv2UdMGkC0FGSbWC24FvJleJ8+Lp1A=
knative.dev/pkg v0.0.0-20200410152005-2a1db869228c/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/pkg v0.0.0-20200428194351-90fc61bae7f7/go.mod h1:o+e8OVEJKIuvXPsGVPIautjXgs05xbos7G+QMRjuUps=
@@ -1871,15 +1902,21 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC
knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY=
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7 h1:9S2r59HZJF9nKvoRLg5zJzx6XpVlVyvVRqz/C/h6h2s=
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA=
+knative.dev/pkg v0.0.0-20200630170034-2c1a029eb97f/go.mod h1:7T15JzvjKXWnvIKcohz4brrsVq8jvwAcJwWY9xigAc0=
+knative.dev/pkg v0.0.0-20200702222342-ea4d6e985ba0 h1:+k2ADqygEgy5BIEahUUEgdY3LbQkaRxbObIO1ZjQswE=
+knative.dev/pkg v0.0.0-20200702222342-ea4d6e985ba0/go.mod h1:7T15JzvjKXWnvIKcohz4brrsVq8jvwAcJwWY9xigAc0=
knative.dev/serving v0.14.0 h1:9iDyOqTciNuAh2D5KJP0soOq23FDR4HQHdIQNBQ/rAE=
knative.dev/serving v0.14.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
knative.dev/serving v0.15.0 h1:sOzAJ5VGg8458wHsCT3bG5KqtpBVgOY7g2Vt/rHwf2A=
knative.dev/serving v0.15.0/go.mod h1:cc+LozTiaDvg3802drxoRta8qovnJbxxbtw5l5mqV3o=
+knative.dev/serving v0.16.0 h1:vtYJRsCHSl1PkyXDoDTJ0ksJIlAEEbxyBHqURbbgC5g=
+knative.dev/serving v0.16.0/go.mod h1:XG6NOSbtstohsGGl0UYcTazPDMLWDk8W8F0Cd+W9ioI=
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=
knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE=
knative.dev/test-infra v0.0.0-20200519161858-554a95a37986/go.mod h1:LeNa1Wvn47efeQUkpkn3XG7Fx9Ga+rhAP13SZyjaEGg=
+knative.dev/test-infra v0.0.0-20200630141629-15f40fe97047/go.mod h1:30tMsI1VXrG2m4ut7CFZbLg1VbcRsslPfGU+GWILm6E=
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=
@@ -1892,6 +1929,7 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/boskos v0.0.0-20200530174753-71e795271860/go.mod h1:L1ubP7d1CCMSQSjKiZv6dGbh7b4kfoG+dFPj8cfYDnI=
sigs.k8s.io/controller-runtime v0.3.0/go.mod h1:Cw6PkEg0Sa7dAYovGT4R0tRkGhHXpYijwNxYhAnAZZk=
sigs.k8s.io/controller-runtime v0.5.0/go.mod h1:REiJzC7Y00U+2YkMbT8wxgrsX5USpXKGhb2sCtAXiT8=
sigs.k8s.io/controller-runtime v0.5.2 h1:pyXbUfoTo+HA3jeIfr0vgi+1WtmNh0CwlcnQGLXwsSw=
diff --git a/pkg/apis/addtoscheme_knative_eventing.go b/pkg/apis/addtoscheme_knative_eventing.go
index de1ef1e..f480284 100644
--- a/pkg/apis/addtoscheme_knative_eventing.go
+++ b/pkg/apis/addtoscheme_knative_eventing.go
@@ -18,18 +18,20 @@ limitations under the License.
package apis
import (
- eventingv1alpha1 "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
+ eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"
- messagingv1alpha1 "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
+ messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
messagingv1beta1 "knative.dev/eventing/pkg/apis/messaging/v1beta1"
sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+ sourcesv1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2"
)
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
- AddToSchemes = append(AddToSchemes, eventingv1alpha1.AddToScheme)
AddToSchemes = append(AddToSchemes, eventingv1beta1.AddToScheme)
- AddToSchemes = append(AddToSchemes, messagingv1alpha1.AddToScheme)
+ AddToSchemes = append(AddToSchemes, eventingv1.AddToScheme)
AddToSchemes = append(AddToSchemes, messagingv1beta1.AddToScheme)
+ AddToSchemes = append(AddToSchemes, messagingv1.AddToScheme)
AddToSchemes = append(AddToSchemes, sourcesv1alpha1.AddToScheme)
+ AddToSchemes = append(AddToSchemes, sourcesv1alpha2.AddToScheme)
}
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 3f4fbf8..92103f4 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -33,7 +33,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
- eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
+ eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
serving "knative.dev/serving/pkg/apis/serving/v1"
)
@@ -492,8 +492,7 @@ func (t *knativeTrait) createTrigger(e *Environment, ref *corev1.ObjectReference
found := e.Resources.HasKnativeTrigger(func(trigger *eventing.Trigger) bool {
return trigger.Spec.Broker == ref.Name &&
trigger.Spec.Filter != nil &&
- trigger.Spec.Filter.Attributes != nil &&
- (*trigger.Spec.Filter.Attributes)["type"] == eventType
+ trigger.Spec.Filter.Attributes["type"] == eventType
})
if !found {
trigger := knativeutil.CreateTrigger(*ref, e.Integration.Name, eventType)
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index 42bda5c..c74e716 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -19,6 +19,7 @@ package trait
import (
"context"
+ "knative.dev/eventing/pkg/apis/duck/v1beta1"
"testing"
"github.com/stretchr/testify/assert"
@@ -26,12 +27,10 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
- messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
+ eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+ messaging "knative.dev/eventing/pkg/apis/messaging/v1beta1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
- duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
- duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
serving "knative.dev/serving/pkg/apis/serving/v1"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
@@ -122,11 +121,11 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
err = ne.Deserialize(kc.Value)
assert.Nil(t, err)
- cSource1 := ne.FindService("channel-source-1", knativeapi.CamelEndpointKindSource, knativeapi.CamelServiceTypeChannel, "messaging.knative.dev/v1alpha1", "Channel")
+ cSource1 := ne.FindService("channel-source-1", knativeapi.CamelEndpointKindSource, knativeapi.CamelServiceTypeChannel, "messaging.knative.dev/v1beta1", "Channel")
assert.NotNil(t, cSource1)
assert.Empty(t, cSource1.Host)
- cSink1 := ne.FindService("channel-sink-1", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeChannel, "messaging.knative.dev/v1alpha1", "Channel")
+ cSink1 := ne.FindService("channel-sink-1", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeChannel, "messaging.knative.dev/v1beta1", "Channel")
assert.NotNil(t, cSink1)
assert.Equal(t, "channel-sink-1.host", cSink1.Host)
@@ -141,9 +140,9 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
assert.NotNil(t, eSink2)
assert.Equal(t, "endpoint-sink-2.host", eSink2.Host)
- eEventSource := ne.FindService("default", knativeapi.CamelEndpointKindSource, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1alpha1", "Broker")
+ eEventSource := ne.FindService("default", knativeapi.CamelEndpointKindSource, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1beta1", "Broker")
assert.NotNil(t, eEventSource)
- eEventSink := ne.FindService("default", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1alpha1", "Broker")
+ eEventSink := ne.FindService("default", knativeapi.CamelEndpointKindSink, knativeapi.CamelServiceTypeEvent, "eventing.knative.dev/v1beta1", "Broker")
assert.NotNil(t, eEventSink)
assert.Equal(t, "broker-default.host", eEventSink.Host)
}
@@ -440,9 +439,9 @@ func NewFakeClient(namespace string) (client.Client, error) {
Name: "channel-source-1",
},
Status: messaging.ChannelStatus{
- AddressStatus: duckv1alpha1.AddressStatus{
- Address: &duckv1alpha1.Addressable{
- Addressable: duckv1beta1.Addressable{
+ ChannelableStatus: v1beta1.ChannelableStatus{
+ AddressStatus: duckv1.AddressStatus{
+ Address: &duckv1.Addressable{
URL: channelSourceURL,
},
},
@@ -459,9 +458,9 @@ func NewFakeClient(namespace string) (client.Client, error) {
Name: "channel-sink-1",
},
Status: messaging.ChannelStatus{
- AddressStatus: duckv1alpha1.AddressStatus{
- Address: &duckv1alpha1.Addressable{
- Addressable: duckv1beta1.Addressable{
+ ChannelableStatus: v1beta1.ChannelableStatus{
+ AddressStatus: duckv1.AddressStatus{
+ Address: &duckv1.Addressable{
URL: channelSinkURL,
},
},
@@ -513,10 +512,8 @@ func NewFakeClient(namespace string) (client.Client, error) {
},
Spec: eventing.BrokerSpec{},
Status: eventing.BrokerStatus{
- Address: duckv1alpha1.Addressable{
- Addressable: duckv1beta1.Addressable{
- URL: brokerURL,
- },
+ Address: duckv1.Addressable{
+ URL: brokerURL,
},
},
},
@@ -531,7 +528,7 @@ func NewFakeClient(namespace string) (client.Client, error) {
},
Spec: eventing.TriggerSpec{
Filter: &eventing.TriggerFilter{
- Attributes: &eventing.TriggerFilterAttributes{
+ Attributes: eventing.TriggerFilterAttributes{
"type": "event-source-1",
},
},
diff --git a/pkg/util/knative/apis.go b/pkg/util/knative/apis.go
index fbe26ce..72607f1 100644
--- a/pkg/util/knative/apis.go
+++ b/pkg/util/knative/apis.go
@@ -31,7 +31,7 @@ var (
GroupVersionKind: schema.GroupVersionKind{
Kind: "Channel",
Group: "messaging.knative.dev",
- Version: "v1beta1",
+ Version: "v1",
},
Resource: "channels",
},
@@ -39,17 +39,17 @@ var (
GroupVersionKind: schema.GroupVersionKind{
Kind: "Channel",
Group: "messaging.knative.dev",
- Version: "v1alpha1",
+ Version: "v1beta1",
},
Resource: "channels",
},
{
GroupVersionKind: schema.GroupVersionKind{
- Kind: "Channel",
- Group: "eventing.knative.dev",
- Version: "v1alpha1",
+ Kind: "InMemoryChannel",
+ Group: "messaging.knative.dev",
+ Version: "v1",
},
- Resource: "channels",
+ Resource: "inmemorychannels",
},
{
GroupVersionKind: schema.GroupVersionKind{
@@ -61,11 +61,11 @@ var (
},
{
GroupVersionKind: schema.GroupVersionKind{
- Kind: "InMemoryChannel",
+ Kind: "KafkaChannel",
Group: "messaging.knative.dev",
- Version: "v1alpha1",
+ Version: "v1beta1",
},
- Resource: "inmemorychannels",
+ Resource: "kafkachannels",
},
{
GroupVersionKind: schema.GroupVersionKind{
@@ -119,7 +119,7 @@ var (
GroupVersionKind: schema.GroupVersionKind{
Kind: "Broker",
Group: "eventing.knative.dev",
- Version: "v1beta1",
+ Version: "v1",
},
Resource: "brokers",
},
@@ -127,7 +127,7 @@ var (
GroupVersionKind: schema.GroupVersionKind{
Kind: "Broker",
Group: "eventing.knative.dev",
- Version: "v1alpha1",
+ Version: "v1beta1",
},
Resource: "brokers",
},
diff --git a/pkg/util/knative/apis_test.go b/pkg/util/knative/apis_test.go
index b1014b6..3f1730f 100644
--- a/pkg/util/knative/apis_test.go
+++ b/pkg/util/knative/apis_test.go
@@ -85,7 +85,7 @@ func TestAPIs(t *testing.T) {
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "Channel",
- APIVersion: "messaging.knative.dev/v1beta1",
+ APIVersion: "messaging.knative.dev/v1",
Name: "ciao",
}, refs[0])
@@ -95,7 +95,7 @@ func TestAPIs(t *testing.T) {
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "KafkaChannel",
- APIVersion: "messaging.knative.dev/v1alpha1",
+ APIVersion: "messaging.knative.dev/v1beta1",
Name: "ciao",
}, refs[0])
@@ -105,17 +105,17 @@ func TestAPIs(t *testing.T) {
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "Channel",
- APIVersion: "messaging.knative.dev/v1beta1",
+ APIVersion: "messaging.knative.dev/v1",
Name: "ciao",
}, refs[0])
- ref, err = ExtractObjectReference("knative:channel/ciao?apiVersion=eventing.knative.dev/v1alpha1")
+ ref, err = ExtractObjectReference("knative:channel/ciao?apiVersion=messaging.knative.dev/v1")
assert.Nil(t, err)
refs = FillMissingReferenceData(knative.CamelServiceTypeChannel, ref)
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "Channel",
- APIVersion: "eventing.knative.dev/v1alpha1",
+ APIVersion: "messaging.knative.dev/v1",
Name: "ciao",
}, refs[0])
@@ -130,7 +130,7 @@ func TestAPIs(t *testing.T) {
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "Broker",
- APIVersion: "eventing.knative.dev/v1beta1",
+ APIVersion: "eventing.knative.dev/v1",
Name: "default",
}, refs[0])
@@ -150,7 +150,7 @@ func TestAPIs(t *testing.T) {
checkValidRefs(t, refs)
assert.Equal(t, v1.ObjectReference{
Kind: "Broker",
- APIVersion: "eventing.knative.dev/v1beta1",
+ APIVersion: "eventing.knative.dev/v1",
Name: "aaa",
}, refs[0])
}
diff --git a/pkg/util/knative/knative.go b/pkg/util/knative/knative.go
index 5df1247..2a45fb1 100644
--- a/pkg/util/knative/knative.go
+++ b/pkg/util/knative/knative.go
@@ -30,9 +30,9 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
- eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
+ eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
messaging "knative.dev/eventing/pkg/apis/messaging/v1beta1"
- sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+ sources "knative.dev/eventing/pkg/apis/sources/v1alpha2"
"knative.dev/pkg/apis/duck"
duckv1 "knative.dev/pkg/apis/duck/v1"
duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1"
@@ -84,7 +84,7 @@ func CreateTrigger(brokerReference corev1.ObjectReference, serviceName string, e
},
Spec: eventing.TriggerSpec{
Filter: &eventing.TriggerFilter{
- Attributes: &eventing.TriggerFilterAttributes{
+ Attributes: eventing.TriggerFilterAttributes{
"type": eventType,
},
},
@@ -103,16 +103,16 @@ func CreateTrigger(brokerReference corev1.ObjectReference, serviceName string, e
// CreateSinkBinding ---
func CreateSinkBinding(source corev1.ObjectReference, target corev1.ObjectReference) runtime.Object {
- binding := sourcesv1alpha1.SinkBinding{
+ binding := sources.SinkBinding{
TypeMeta: metav1.TypeMeta{
- APIVersion: sourcesv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: sources.SchemeGroupVersion.String(),
Kind: "SinkBinding",
},
ObjectMeta: metav1.ObjectMeta{
Namespace: source.Namespace,
Name: source.Name,
},
- Spec: sourcesv1alpha1.SinkBindingSpec{
+ Spec: sources.SinkBindingSpec{
BindingSpec: duckv1alpha1.BindingSpec{
Subject: tracker.Reference{
APIVersion: source.APIVersion,
diff --git a/pkg/util/knative/uri_test.go b/pkg/util/knative/uri_test.go
index 1ee24ee..ece603f 100644
--- a/pkg/util/knative/uri_test.go
+++ b/pkg/util/knative/uri_test.go
@@ -74,15 +74,15 @@ func TestChannelUri(t *testing.T) {
Name: "ciao",
}, ref)
- ref, err = ExtractObjectReference("knative://event/chuck?&brokerApiVersion=eventing.knative.dev/v1alpha1&brokerName=broker2")
+ ref, err = ExtractObjectReference("knative://event/chuck?&brokerApiVersion=eventing.knative.dev/v1beta1&brokerName=broker2")
assert.Nil(t, err)
assert.Equal(t, v1.ObjectReference{
- APIVersion: "eventing.knative.dev/v1alpha1",
+ APIVersion: "eventing.knative.dev/v1beta1",
Name: "broker2",
Kind: "Broker",
}, ref)
- ref, err = ExtractObjectReference("knative://event/chuck?&brokerApxxiVersion=eventing.knative.dev/v1alpha1&brokxerName=broker2")
+ ref, err = ExtractObjectReference("knative://event/chuck?&brokerApxxiVersion=eventing.knative.dev/v1beta1&brokxerName=broker2")
assert.Nil(t, err)
assert.Equal(t, v1.ObjectReference{
Name: "default",
diff --git a/pkg/util/kubernetes/collection.go b/pkg/util/kubernetes/collection.go
index 8ad7bf2..4eef47d 100644
--- a/pkg/util/kubernetes/collection.go
+++ b/pkg/util/kubernetes/collection.go
@@ -26,7 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
+ eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
serving "knative.dev/serving/pkg/apis/serving/v1"
)
diff --git a/pkg/util/kubernetes/replace.go b/pkg/util/kubernetes/replace.go
index c0c417a..55c8dcf 100644
--- a/pkg/util/kubernetes/replace.go
+++ b/pkg/util/kubernetes/replace.go
@@ -27,7 +27,6 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
serving "knative.dev/serving/pkg/apis/serving/v1"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -60,7 +59,6 @@ func ReplaceResource(ctx context.Context, c client.Client, res runtime.Object) e
mapRequiredMeta(existing, res)
mapRequiredServiceData(existing, res)
mapRequiredRouteData(existing, res)
- mapRequiredKnativeData(existing, res)
mapRequiredKnativeServiceV1Beta1Data(existing, res)
mapRequiredKnativeServiceV1Data(existing, res)
err = c.Update(ctx, res)
@@ -95,14 +93,6 @@ func mapRequiredRouteData(from runtime.Object, to runtime.Object) {
}
}
-func mapRequiredKnativeData(from runtime.Object, to runtime.Object) {
- if fromC, ok := from.(*messaging.Subscription); ok {
- if toC, ok := to.(*messaging.Subscription); ok {
- toC.Spec.DeprecatedGeneration = fromC.Spec.DeprecatedGeneration
- }
- }
-}
-
func mapRequiredKnativeServiceV1Beta1Data(from runtime.Object, to runtime.Object) {
if fromC, ok := from.(*serving.Service); ok {
if toC, ok := to.(*serving.Service); ok {