Upgrade pingsource storage to v1alpha2

config/200-pingsource-adapter-clusterrole.yaml

@@ -0,0 +1 @@
+core/roles/pingsource-adapter-clusterrole.yaml

config/core/resources/pingsource.yaml

@@ -70,8 +70,8 @@ spec:
       JSONPath: .metadata.creationTimestamp
   versions:
   - name: v1alpha1
-    served: true
-    storage: true
+    served: false
+    storage: false
   - name: v1alpha2
     served: true
-    storage: false
+    storage: true

config/core/roles/pingsource-adapter-clusterrole.yaml

@@ -0,0 +1,21 @@
+# 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-pingsource-adapter
+  labels:
+    eventing.knative.dev/release: devel
+rules: []

config/pre-install/v0.16.0/clusterrole.yaml

@@ -34,8 +34,10 @@ rules:
   # Our own resources we care about.
   - apiGroups:
       - "eventing.knative.dev"
+      - "sources.knative.dev"
     resources:
       - "brokers"
+      - "pingsources"
     verbs:
       - "get"
       - "list"

config/pre-install/v0.16.0/pingsource.yaml

@@ -0,0 +1,77 @@
+# 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: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    eventing.knative.dev/release: devel
+    eventing.knative.dev/source: "true"
+    duck.knative.dev/source: "true"
+    knative.dev/crd-install: "true"
+  annotations:
+    # TODO add schemas and descriptions
+    registry.knative.dev/eventTypes: |
+      [
+        { "type": "dev.knative.sources.ping" }
+      ]
+  name: pingsources.sources.knative.dev
+spec:
+  group: sources.knative.dev
+  names:
+    categories:
+    - all
+    - knative
+    - eventing
+    - sources
+    kind: PingSource
+    plural: pingsources
+  scope: Namespaced
+  subresources:
+    status: {}
+  preserveUnknownFields: false
+  validation:
+    openAPIV3Schema:
+      type: object
+      # this is a work around so we don't need to flesh out the
+      # schema for each version at this time
+      #
+      # see issue: https://github.com/knative/serving/issues/912
+      x-kubernetes-preserve-unknown-fields: true
+  conversion:
+    strategy: Webhook
+    webhookClientConfig:
+      service:
+        name: eventing-webhook
+        namespace: knative-eventing
+  additionalPrinterColumns:
+    - name: Ready
+      type: string
+      JSONPath: ".status.conditions[?(@.type=='Ready')].status"
+    - name: Reason
+      type: string
+      JSONPath: ".status.conditions[?(@.type=='Ready')].reason"
+    - name: Sink
+      type: string
+      JSONPath: .status.sinkUri
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  versions:
+  - name: v1alpha1
+    served: false
+    storage: false
+  - name: v1alpha2
+    served: true
+    storage: true

config/pre-install/v0.16.0/storage-version-migration.yaml

@@ -37,3 +37,4 @@ spec:
         image: ko://knative.dev/eventing/vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate
         args:
           - "brokers.eventing.knative.dev"
+          - "pingsources.sources.knative.dev"

pkg/adapter/mtping/controller.go

@@ -20,15 +20,14 @@ import (
 	"context"
 	"sync"
 
-	"knative.dev/eventing/pkg/adapter/v2"
-
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/source"
 
+	"knative.dev/eventing/pkg/adapter/v2"
 	eventingclient "knative.dev/eventing/pkg/client/injection/client"
 	pingsourceinformer "knative.dev/eventing/pkg/client/injection/informers/sources/v1alpha2/pingsource"
 	pingsourcereconciler "knative.dev/eventing/pkg/client/injection/reconciler/sources/v1alpha2/pingsource"

pkg/adapter/mtping/pingsource_test.go

@@ -87,7 +87,7 @@ func TestAllCases(t *testing.T) {
 					WithValidPingSourceV1A2Schedule,
 					WithPingSourceV1A2Deployed,
 					WithPingSourceV1A2Sink(sinkURI),
-					WithPingSourceV1A2EventType,
+					WithPingSourceV1A2CloudEventAttributes,
 				),
 			},
 			WantEvents: []string{
@@ -114,7 +114,7 @@ func TestAllCases(t *testing.T) {
 					WithValidPingSourceV1A2Schedule,
 					WithPingSourceV1A2Deployed,
 					WithPingSourceV1A2Sink(sinkURI),
-					WithPingSourceV1A2EventType,
+					WithPingSourceV1A2CloudEventAttributes,
 					WithPingSourceV1A2Finalizers(defaultFinalizerName),
 				),
 			},
@@ -136,7 +136,7 @@ func TestAllCases(t *testing.T) {
 					WithValidPingSourceV1A2Schedule,
 					WithPingSourceV1A2Deployed,
 					WithPingSourceV1A2Sink(sinkURI),
-					WithPingSourceV1A2EventType,
+					WithPingSourceV1A2CloudEventAttributes,
 					WithPingSourceV1A2Finalizers(defaultFinalizerName),
 					WithPingSourceV1A2Deleted,
 				),
@@ -165,7 +165,7 @@ func TestAllCases(t *testing.T) {
 					WithValidPingSourceV1A2Schedule,
 					WithPingSourceV1A2Deployed,
 					WithPingSourceV1A2Sink(sinkURI),
-					WithPingSourceV1A2EventType,
+					WithPingSourceV1A2CloudEventAttributes,
 					WithPingSourceV1A2Deleted,
 				),
 			},

pkg/adapter/ping/adapter.go

@@ -25,10 +25,10 @@ import (
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
 	"knative.dev/pkg/logging"
 
 	"knative.dev/eventing/pkg/adapter/v2"
+	sourcesv1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2"
 )
 
 type envConfig struct {
@@ -100,8 +100,8 @@ func (a *pingAdapter) start(stopCh <-chan struct{}) error {
 func (a *pingAdapter) cronTick() {
 	ctx := context.Background()
 	event := cloudevents.NewEvent(cloudevents.VersionV1)
-	event.SetType(sourcesv1alpha1.PingSourceEventType)
-	event.SetSource(sourcesv1alpha1.PingSourceSource(a.Namespace, a.Name))
+	event.SetType(sourcesv1alpha2.PingSourceEventType)
+	event.SetSource(sourcesv1alpha2.PingSourceSource(a.Namespace, a.Name))
 	if err := event.SetData(cloudevents.ApplicationJSON, message(a.Data)); err != nil {
 		logging.FromContext(ctx).Errorw("ping failed to set event data", zap.Error(err))
 	}

pkg/reconciler/mtbroker/broker_test.go

@@ -1486,7 +1486,7 @@ func makeReadyPingSource() *sourcesv1alpha2.PingSource {
 		rtv1alpha1.WithValidPingSourceV1A2Schedule,
 		rtv1alpha1.WithValidPingSourceV1A2Resources,
 		rtv1alpha1.WithPingSourceV1A2Deployed,
-		rtv1alpha1.WithPingSourceV1A2EventType,
+		rtv1alpha1.WithPingSourceV1A2CloudEventAttributes,
 		rtv1alpha1.WithPingSourceV1A2Sink(u),
 	)
 }

pkg/reconciler/pingsource/controller.go

@@ -22,7 +22,6 @@ import (
 	"github.com/kelseyhightower/envconfig"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/client-go/tools/cache"
-	"knative.dev/eventing/pkg/apis/sources/v1alpha1"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
@@ -31,10 +30,13 @@ import (
 	"knative.dev/pkg/system"
 	"knative.dev/pkg/tracker"
 
-	pingsourceinformer "knative.dev/eventing/pkg/client/injection/informers/sources/v1alpha1/pingsource"
-	pingsourcereconciler "knative.dev/eventing/pkg/client/injection/reconciler/sources/v1alpha1/pingsource"
+	"knative.dev/eventing/pkg/apis/sources/v1alpha2"
+	pingsourceinformer "knative.dev/eventing/pkg/client/injection/informers/sources/v1alpha2/pingsource"
+	pingsourcereconciler "knative.dev/eventing/pkg/client/injection/reconciler/sources/v1alpha2/pingsource"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
+	"knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount"
+	"knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding"
 )
 
 // envConfig will be used to extract the required environment variables using
@@ -54,11 +56,15 @@ func NewController(
 
 	deploymentInformer := deploymentinformer.Get(ctx)
 	pingSourceInformer := pingsourceinformer.Get(ctx)
+	serviceAccountInformer := serviceaccount.Get(ctx)
+	roleBindingInformer := rolebinding.Get(ctx)
 
 	r := &Reconciler{
-		kubeClientSet:    kubeclient.Get(ctx),
-		pingLister:       pingSourceInformer.Lister(),
-		deploymentLister: deploymentInformer.Lister(),
+		kubeClientSet:        kubeclient.Get(ctx),
+		pingLister:           pingSourceInformer.Lister(),
+		deploymentLister:     deploymentInformer.Lister(),
+		serviceAccountLister: serviceAccountInformer.Lister(),
+		roleBindingLister:    roleBindingInformer.Lister(),
 
 		loggingContext: ctx,
 	}
@@ -79,7 +85,7 @@ func NewController(
 
 	// Watch for deployments owned by the source
 	deploymentInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
-		FilterFunc: controller.FilterControllerGK(v1alpha1.Kind("PingSource")),
+		FilterFunc: controller.FilterControllerGK(v1alpha2.Kind("PingSource")),
 		Handler:    controller.HandleAll(impl.EnqueueControllerOf),
 	})
 

pkg/reconciler/pingsource/controller_test.go

@@ -27,9 +27,11 @@ import (
 
 	// Fake injection informers
 	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/eventtype/fake"
-	_ "knative.dev/eventing/pkg/client/injection/informers/sources/v1alpha1/pingsource/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/sources/v1alpha2/pingsource/fake"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake"
+	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake"
+	_ "knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/fake"
 )
 
 func TestNew(t *testing.T) {