Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17 #1685

Merged
merged 3 commits into from
Sep 3, 2020
Merged

Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17 #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f59ad
Fix #1670: upgrade to Knative 0.16 and support from 0.15 to 0.17
nicolaferraro Sep 2, 2020
bdc7f9b
Fix #1668: restore catalog and fix source version
nicolaferraro Sep 2, 2020
03a59cf
Fix #1668: add sugar controller to enable broker injection in e2e tests
nicolaferraro Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .github/workflows/knative.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 6 additions & 7 deletions e2e/support/test_support.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading