Merge remote-tracking branch 'upstream/master' into k8s-bump

OWNERS

@@ -1,7 +1,7 @@
 # Approvers in this repo should also be added to the eventing-contrib
 # approvers list.
 approvers:
-- evankanderson
+- toc
 - grantr
 - Harwayne
 - vaikas
@@ -15,14 +15,14 @@ approvers:
 # list. To add reviewers while spreading the load among existing approvers,
 # copy the approvers to the reviewers list too.
 reviewers:
-- evankanderson
 - grantr
 - Harwayne
 - vaikas
 - n3wscott
 - matzew
 - nachocano
 - lionelvillard
+- slinkydeveloper
 # Add reviewers below
 - liu-cong
 - yolocs

OWNERS_ALIASES

@@ -1,4 +1,11 @@
 aliases:
+  toc:
+  - evankanderson
+  - grantr
+  - markusthoemmes
+  - mattmoor
+  - tcnghia
+
   # These aliases are for OWNERS of the various Channel implementations. These
   # Are in addition to the repo level OWNERS.
 

cmd/pong/main.go

@@ -22,7 +22,7 @@ import (
 	"flag"
 	"log"
 
-	cloudevents "github.com/cloudevents/sdk-go"
+	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"github.com/google/uuid"
 )
 
@@ -38,19 +38,15 @@ func init() {
 	flag.StringVar(&pongType, "pong", "dev.knative.pong", "Responds with this CloudEvent Type.")
 }
 
-func receive(event cloudevents.Event, resp *cloudevents.EventResponse) {
-	log.Printf("Received CloudEvent,\n%s", event)
+func receive(event cloudevents.Event) *cloudevents.Event {
+	log.Printf("Received CloudEvent:\n%s", event)
 	if event.Type() == pingType {
-		pong := cloudevents.NewEvent()
+		pong := event.Clone()
 		pong.SetType(pongType)
 		pong.SetSource("knative.dev/eventing/cmd/pong/" + id)
-		if err := pong.SetData(event.Data); err != nil {
-			log.Printf("failed to set data on pong: %s", err)
-			resp.Error(400, "bad data")
-			return
-		}
-		resp.RespondWith(200, &pong)
+		return &pong
 	}
+	return nil
 }
 
 func main() {

cmd/sendevent/main.go

@@ -25,7 +25,7 @@ import (
 	"log"
 	"os"
 
-	cloudevents "github.com/cloudevents/sdk-go"
+	cloudevents "github.com/cloudevents/sdk-go/v2"
 
 	"knative.dev/eventing/pkg/utils"
 )
@@ -64,10 +64,7 @@ func main() {
 		source = fmt.Sprintf("http://%s", utils.GetClusterDomainName())
 	}
 
-	t, err := cloudevents.NewHTTPTransport(
-		cloudevents.WithTarget(target),
-		cloudevents.WithBinaryEncoding(),
-	)
+	t, err := cloudevents.NewHTTP(cloudevents.WithTarget(target))
 	if err != nil {
 		log.Printf("failed to create transport, %v", err)
 		os.Exit(1)
@@ -87,13 +84,13 @@ func main() {
 	}
 	event.SetType(eventType)
 	event.SetSource(source)
-	if err := event.SetData(untyped); err != nil {
+	if err := event.SetData(cloudevents.ApplicationJSON, untyped); err != nil {
 		log.Printf("failed to set data, %v", err)
 		os.Exit(1)
 	}
 
-	if _, resp, err := c.Send(context.Background(), event); err != nil {
-		fmt.Printf("Failed to send event to %s: %s\n", target, err)
+	if resp, res := c.Request(context.Background(), event); !cloudevents.IsACK(res) {
+		fmt.Printf("Failed to send event to %s: %s\n", target, res.Error())
 		os.Exit(1)
 	} else if resp != nil {
 		fmt.Printf("Got response from %s\n%s\n", target, resp)

cmd/upgrade/v0.15.0/main.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
+	//	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
+
+	"context"
+	"fmt"
+	"os"
+
+	"k8s.io/client-go/kubernetes"
+	kubeclient "knative.dev/pkg/client/injection/kube/client"
+	"knative.dev/pkg/injection/sharedmain"
+	"knative.dev/pkg/signals"
+
+	versioned "knative.dev/eventing/pkg/client/clientset/versioned"
+	eventingclient "knative.dev/eventing/pkg/client/injection/client"
+	broker "knative.dev/eventing/pkg/upgrader/broker/v0.15.0"
+)
+
+func main() {
+	ctx := signals.NewContext()
+	cfg := sharedmain.ParseAndGetConfigOrDie()
+	ctx = context.WithValue(ctx, kubeclient.Key{}, kubernetes.NewForConfigOrDie(cfg))
+	ctx = context.WithValue(ctx, eventingclient.Key{}, versioned.NewForConfigOrDie(cfg))
+	if err := broker.Upgrade(ctx); err != nil {
+		fmt.Printf("Broker Upgrade failed with: %v\n", err)
+		os.Exit(1)
+	}
+}

config/channels/in-memory-channel/300-in-memory-channel.yaml

@@ -67,7 +67,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
   - name: v1beta1
     served: true
-    storage: false
+    storage: true

config/core/resources/channel.yaml

@@ -60,7 +60,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object
@@ -136,7 +136,7 @@ spec:
             x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
-    storage: false
+    storage: true
     schema:
       openAPIV3Schema:
         type: object

config/core/resources/eventtype.yaml

@@ -72,7 +72,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
   - name: v1beta1
     served: true
-    storage: false
+    storage: true

config/core/resources/parallel.yaml

@@ -64,8 +64,8 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
   - name: v1beta1
     served: true
-    storage: false
+    storage: true
 

config/core/resources/sequence.yaml

@@ -64,7 +64,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
   - name: v1beta1
     served: true
-    storage: false
+    storage: true

config/core/resources/subscription.yaml

@@ -142,7 +142,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
   - name: v1beta1
     served: true
-    storage: false
+    storage: true

config/core/resources/trigger.yaml

@@ -58,7 +58,7 @@ spec:
   versions:
   - name: v1alpha1
     served: true
-    storage: true
+    storage: false
     schema:
       openAPIV3Schema:
         type: object
@@ -118,7 +118,7 @@ spec:
             x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
-    storage: false
+    storage: true
     schema:
       openAPIV3Schema:
         type: object

config/post-install/v0.15.0/clusterrole.yaml

@@ -0,0 +1,63 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: knative-eventing-post-install-job-role
+  labels:
+    eventing.knative.dev/release: devel
+rules:
+  # Storage version upgrader needs to be able to patch CRDs.
+  - apiGroups:
+      - "apiextensions.k8s.io"
+    resources:
+      - "customresourcedefinitions"
+      - "customresourcedefinitions/status"
+    verbs:
+      - "get"
+      - "list"
+      - "update"
+      - "patch"
+      - "watch"
+  # Our own resources we care about.
+  - apiGroups:
+      - "eventing.knative.dev"
+    resources:
+      - "triggers"
+      - "eventtypes"
+      - "eventtypes/status"
+    verbs: &everything
+      - "get"
+      - "list"
+      - "create"
+      - "update"
+      - "delete"
+      - "patch"
+      - "watch"
+  - apiGroups:
+      - "messaging.knative.dev"
+    resources:
+      - "channels"
+      - "subscriptions"
+      - "inmemorychannels"
+    verbs: *everything
+
+  # Flow resources and statuses we care about.
+  - apiGroups:
+      - "flows.knative.dev"
+    resources:
+      - "sequences"
+      - "parallels"
+    verbs: *everything

config/post-install/v0.15.0/dummy.go

@@ -0,0 +1,19 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package postinstall is a placeholder that allows us to pull in config files
+// via go mod vendor.
+package postinstall

config/post-install/v0.15.0/serviceaccount.yaml

@@ -0,0 +1,39 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: knative-eventing-post-install-job
+  namespace: knative-eventing
+  labels:
+    eventing.knative.dev/release: devel
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: knative-eventing-post-install-job-role-binding
+  labels:
+    eventing.knative.dev/release: devel
+subjects:
+  - kind: ServiceAccount
+    name: knative-eventing-post-install-job
+    namespace: knative-eventing
+roleRef:
+  kind: ClusterRole
+  name: knative-eventing-post-install-job-role
+  apiGroup: rbac.authorization.k8s.io
+