remove sources v1beta1 APIs (#5319)

cmd/webhook/main.go

@@ -49,7 +49,6 @@ import (
 	"knative.dev/eventing/pkg/apis/sources"
 	pingdefaultconfig "knative.dev/eventing/pkg/apis/sources/config"
 	sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1"
-	sourcesv1beta1 "knative.dev/eventing/pkg/apis/sources/v1beta1"
 	sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2"
 	"knative.dev/eventing/pkg/reconciler/sinkbinding"
 )
@@ -69,11 +68,6 @@ var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	messagingv1.SchemeGroupVersion.WithKind("Subscription"):    &messagingv1.Subscription{},
 
 	// For group sources.knative.dev.
-	// v1beta1
-	sourcesv1beta1.SchemeGroupVersion.WithKind("ApiServerSource"): &sourcesv1beta1.ApiServerSource{},
-	sourcesv1beta1.SchemeGroupVersion.WithKind("PingSource"):      &sourcesv1beta1.PingSource{},
-	sourcesv1beta1.SchemeGroupVersion.WithKind("SinkBinding"):     &sourcesv1beta1.SinkBinding{},
-	sourcesv1beta1.SchemeGroupVersion.WithKind("ContainerSource"): &sourcesv1beta1.ContainerSource{},
 	// v1beta2
 	sourcesv1beta2.SchemeGroupVersion.WithKind("PingSource"): &sourcesv1beta2.PingSource{},
 	// v1
@@ -213,7 +207,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 	}
 
 	var (
-		sourcesv1beta1_ = sourcesv1beta1.SchemeGroupVersion.Version
 		sourcesv1beta2_ = sourcesv1beta2.SchemeGroupVersion.Version
 		sourcesv1_      = sourcesv1.SchemeGroupVersion.Version
 	)
@@ -227,34 +220,30 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 			// Sources
 			sourcesv1.Kind("ApiServerSource"): {
 				DefinitionName: sources.ApiServerSourceResource.String(),
-				HubVersion:     sourcesv1beta1_,
+				HubVersion:     sourcesv1_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1beta1_: &sourcesv1beta1.ApiServerSource{},
-					sourcesv1_:      &sourcesv1.ApiServerSource{},
+					sourcesv1_: &sourcesv1.ApiServerSource{},
 				},
 			},
-			sourcesv1beta1.Kind("PingSource"): {
+			sourcesv1beta2.Kind("PingSource"): {
 				DefinitionName: sources.PingSourceResource.String(),
-				HubVersion:     sourcesv1beta1_,
+				HubVersion:     sourcesv1beta2_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1beta1_: &sourcesv1beta1.PingSource{},
 					sourcesv1beta2_: &sourcesv1beta2.PingSource{},
 				},
 			},
 			sourcesv1.Kind("SinkBinding"): {
 				DefinitionName: sources.SinkBindingResource.String(),
-				HubVersion:     sourcesv1beta1_,
+				HubVersion:     sourcesv1_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1beta1_: &sourcesv1beta1.SinkBinding{},
-					sourcesv1_:      &sourcesv1.SinkBinding{},
+					sourcesv1_: &sourcesv1.SinkBinding{},
 				},
 			},
 			sourcesv1.Kind("ContainerSource"): {
 				DefinitionName: sources.ContainerSourceResource.String(),
-				HubVersion:     sourcesv1beta1_,
+				HubVersion:     sourcesv1_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1beta1_: &sourcesv1beta1.ContainerSource{},
-					sourcesv1_:      &sourcesv1.ContainerSource{},
+					sourcesv1_: &sourcesv1.ContainerSource{},
 				},
 			},
 		},

config/core/resources/apiserversource.yaml

@@ -36,14 +36,13 @@ metadata:
 spec:
   group: sources.knative.dev
   versions:
-  - &version
-    name: v1beta1
+  - name: v1
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
     schema:
-      openAPIV3Schema: &openAPIV3Schema
+      openAPIV3Schema:
         type: object
         description: 'ApiServerSource is an event source that brings Kubernetes API server events into Knative.'
         properties:
@@ -261,14 +260,6 @@ spec:
     - name: Reason
       type: string
       jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
-  - <<: *version
-    name: v1
-    served: true
-    storage: true
-    # the schema of v1 is exactly the same as v1beta1 schema
-    schema:
-      openAPIV3Schema:
-        <<: *openAPIV3Schema
   names:
     categories:
      - all

config/core/resources/containersource.yaml

@@ -24,10 +24,9 @@ metadata:
 spec:
   group: sources.knative.dev
   versions:
-    - &version
-      name: v1beta1
+    - name: v1
       served: true
-      storage: false
+      storage: true
       subresources:
         status: {}
       schema:
@@ -401,14 +400,6 @@ spec:
         - name: Reason
           type: string
           jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
-    - <<: *version
-      name: v1
-      served: true
-      storage: true
-      # the schema of v1 is exactly the same as v1beta1 schema
-      schema:
-        openAPIV3Schema:
-          <<: *openAPIV3Schema
 
   names:
     categories:

config/core/resources/pingsource.yaml

@@ -30,167 +30,11 @@ metadata:
 spec:
   group: sources.knative.dev
   versions:
-  - &version
-    name: v1beta1
+  - name: v1beta2
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
-    schema:
-      openAPIV3Schema:
-        type: object
-        description: 'PingSource describes an event source with a fixed payload produced on a specified cron schedule.'
-        properties:
-          spec:
-            type: object
-            description: 'PingSourceSpec defines the desired state of the PingSource (from the client).'
-            properties:
-                ceOverrides:
-                    description: 'CloudEventOverrides defines overrides to control the
-                        output format and modifications of the event sent to the sink.'
-                    type: object
-                    properties:
-                        extensions:
-                            description: 'Extensions specify what attribute are added or
-                                overridden on the outbound event. Each `Extensions` key-value
-                                pair are set on the event as an attribute extension independently.'
-                            type: object
-                            additionalProperties:
-                              type: string
-                            x-kubernetes-preserve-unknown-fields: true
-                jsonData:
-                    description: 'JsonData is json encoded data used as the body of the
-                        event posted to the sink. Default is empty. If set, datacontenttype
-                        will also be set to "application/json".'
-                    type: string
-                schedule:
-                    description: 'Schedule is the cronjob schedule. Defaults to `* * * * *`.'
-                    type: string
-                sink:
-                    description: 'Sink is a reference to an object that will resolve to
-                        a uri to use as the sink.'
-                    type: object
-                    properties:
-                        ref:
-                            description: 'Ref points to an Addressable.'
-                            type: object
-                            properties:
-                                apiVersion:
-                                    description: 'API version of the referent.'
-                                    type: string
-                                kind:
-                                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                                    type: string
-                                name:
-                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                    type: string
-                                namespace:
-                                    description: 'Namespace of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
-                                        This is optional field, it gets defaulted to the
-                                        object holding it if left out.'
-                                    type: string
-                        uri:
-                            description: 'URI can be an absolute URL(non-empty scheme and
-                                non-empty host) pointing to the target or a relative URI.
-                                Relative URIs will be resolved using the base URI retrieved
-                                from Ref.'
-                            type: string
-                timezone:
-                    description: 'Timezone modifies the actual time relative to the specified
-                        timezone. Defaults to the system time zone. More general information
-                        about time zones: https://www.iana.org/time-zones List of valid
-                        timezone values: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
-                    type: string
-          status:
-              type: object
-              description: 'PingSourceStatus defines the observed state of PingSource (from the controller).'
-              properties:
-                  annotations:
-                      description: 'Annotations is additional Status fields for the Resource
-                          to save some additional State as well as convey more information
-                          to the user. This is roughly akin to Annotations on any k8s resource,
-                          just the reconciler conveying richer information outwards.'
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                  ceAttributes:
-                      description: 'CloudEventAttributes are the specific attributes that
-                          the Source uses as part of its CloudEvents.'
-                      type: array
-                      items:
-                          type: object
-                          properties:
-                              source:
-                                  description: 'Source is the CloudEvents source attribute.'
-                                  type: string
-                              type:
-                                  description: 'Type refers to the CloudEvent type attribute.'
-                                  type: string
-                  conditions:
-                      description: 'Conditions the latest available observations of a resource''s
-                          current state.'
-                      type: array
-                      items:
-                          type: object
-                          required:
-                            - type
-                            - status
-                          properties:
-                              lastTransitionTime:
-                                  description: 'LastTransitionTime is the last time the condition
-                                      transitioned from one status to another. We use VolatileTime
-                                      in place of metav1.Time to exclude this from creating
-                                      equality.Semantic differences (all other things held
-                                      constant).'
-                                  type: string
-                              message:
-                                  description: 'A human readable message indicating details
-                                      about the transition.'
-                                  type: string
-                              reason:
-                                  description: 'The reason for the condition''s last transition.'
-                                  type: string
-                              severity:
-                                  description: 'Severity with which to treat failures of
-                                      this type of condition. When this is not specified,
-                                      it defaults to Error.'
-                                  type: string
-                              status:
-                                  description: 'Status of the condition, one of True, False,
-                                      Unknown.'
-                                  type: string
-                              type:
-                                  description: 'Type of condition.'
-                                  type: string
-                  observedGeneration:
-                      description: 'ObservedGeneration is the "Generation" of the Service
-                          that was last processed by the controller.'
-                      type: integer
-                      format: int64
-                  sinkUri:
-                      description: 'SinkURI is the current active sink URI that has been
-                          configured for the Source.'
-                      type: string
-    additionalPrinterColumns:
-    - name: Sink
-      type: string
-      jsonPath: .status.sinkUri
-    - name: Schedule
-      type: string
-      jsonPath: .spec.schedule
-    - name: Age
-      type: date
-      jsonPath: .metadata.creationTimestamp
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type=='Ready')].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
-  - <<: *version
-    name: v1beta2
-    served: true
-    storage: true
     schema:
       openAPIV3Schema:
         type: object
@@ -332,6 +176,22 @@ spec:
                 description: 'SinkURI is the current active sink URI that has been
                           configured for the Source.'
                 type: string
+    additionalPrinterColumns:
+    - name: Sink
+      type: string
+      jsonPath: .status.sinkUri
+    - name: Schedule
+      type: string
+      jsonPath: .spec.schedule
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type=='Ready')].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
   names:
     categories:
     - all

config/core/resources/sinkbindings.yaml

@@ -25,37 +25,11 @@ metadata:
 spec:
   group: sources.knative.dev
   versions:
-    - &version
-      name: v1beta1
+    - name: v1
       served: true
-      storage: false
+      storage: true
       subresources:
         status: {}
-      schema:
-        openAPIV3Schema:
-          type: object
-          # this is a work around so we don't need to flush out the
-          # schema for each version at this time
-          #
-          # see issue: https://github.com/knative/serving/issues/912
-          x-kubernetes-preserve-unknown-fields: true
-      additionalPrinterColumns:
-        - name: Sink
-          type: string
-          jsonPath: ".status.sinkUri"
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-        - name: Ready
-          type: string
-          jsonPath: ".status.conditions[?(@.type=='Ready')].status"
-        - name: Reason
-          type: string
-          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
-    - <<: *version
-      name: v1
-      served: true
-      storage: true
       schema:
         openAPIV3Schema:
           type: object
@@ -241,6 +215,19 @@ spec:
                     description: 'SinkURI is the current active sink URI that has been
                         configured for the Source.'
                     type: string
+      additionalPrinterColumns:
+        - name: Sink
+          type: string
+          jsonPath: ".status.sinkUri"
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+        - name: Ready
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Ready')].status"
+        - name: Reason
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
   names:
     categories:
       - all