From 7151e779d345d0b9be334a3157c546bb36cf9fb0 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 3 Jul 2020 09:47:30 -0700 Subject: [PATCH] remove the v1alpha1 api versions all together --- .../300-in-memory-channel.yaml | 10 +- config/core/resources/broker.yaml | 10 +- config/core/resources/channel.yaml | 94 +------------------ config/core/resources/parallel.yaml | 10 +- config/core/resources/sequence.yaml | 10 +- config/core/resources/subscription.yaml | 10 +- config/core/resources/trigger.yaml | 18 +--- 7 files changed, 21 insertions(+), 141 deletions(-) diff --git a/config/channels/in-memory-channel/300-in-memory-channel.yaml b/config/channels/in-memory-channel/300-in-memory-channel.yaml index c407d96225a..53b32383dba 100644 --- a/config/channels/in-memory-channel/300-in-memory-channel.yaml +++ b/config/channels/in-memory-channel/300-in-memory-channel.yaml @@ -24,9 +24,9 @@ spec: group: messaging.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} schema: @@ -50,10 +50,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true - << : *version name: v1 served: true diff --git a/config/core/resources/broker.yaml b/config/core/resources/broker.yaml index d736fb2a302..5500a04cfa2 100644 --- a/config/core/resources/broker.yaml +++ b/config/core/resources/broker.yaml @@ -24,9 +24,9 @@ spec: group: eventing.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} schema: @@ -50,10 +50,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true - << : *version name: v1 served: true diff --git a/config/core/resources/channel.yaml b/config/core/resources/channel.yaml index 8e1198aeb80..ad9555ef272 100644 --- a/config/core/resources/channel.yaml +++ b/config/core/resources/channel.yaml @@ -25,85 +25,11 @@ spec: group: messaging.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - channelTemplate: - description: "Channel implementation which dictates the durability guarantees of events. If not specified then the default channel is used. More information: https://knative.dev/docs/eventing/channels/default-channels." - type: object - properties: - apiVersion: - type: string - description: "API version of the channel implementation." - minLength: 1 - kind: - type: string - description: "Kind of the channel implementation to use (InMemoryChannel, KafkaChannel, etc.)." - minLength: 1 - spec: - type: object - description: "Spec defines the Spec to use for each channel created. Passed in verbatim to the Channel CRD as Spec section." - required: - - apiVersion - - kind - subscribable: - type: object - properties: - subscribers: - type: array - description: "Events received on the channel are forwarded to its subscribers." - items: - type: object - x-kubernetes-preserve-unknown-fields: true - required: - - uid - properties: - ref: - type: object - description: "a reference to a Kubernetes object from which to retrieve the target URI." - x-kubernetes-preserve-unknown-fields: true - required: - - namespace - - name - - uid - properties: - apiVersion: - type: string - kind: - type: string - name: - type: string - minLength: 1 - namespace: - type: string - minLength: 1 - uid: - type: string - minLength: 1 - uid: - type: string - description: "Used to understand the origin of the subscriber." - minLength: 1 - subscriberURI: - type: string - description: "Endpoint for the subscriber." - minLength: 1 - replyURI: - type: string - description: "Endpoint for the reply." - minLength: 1 - status: - type: object - x-kubernetes-preserve-unknown-fields: true additionalPrinterColumns: - name: Ready type: string @@ -117,10 +43,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true schema: openAPIV3Schema: type: object @@ -135,16 +57,6 @@ spec: name: v1 served: true storage: false - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - x-kubernetes-preserve-unknown-fields: true - status: - type: object - x-kubernetes-preserve-unknown-fields: true names: kind: Channel plural: channels diff --git a/config/core/resources/parallel.yaml b/config/core/resources/parallel.yaml index ce4297fbd5b..4d484f8c43e 100644 --- a/config/core/resources/parallel.yaml +++ b/config/core/resources/parallel.yaml @@ -23,9 +23,9 @@ spec: group: flows.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} schema: @@ -49,10 +49,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true - <<: *version name: v1 served: true diff --git a/config/core/resources/sequence.yaml b/config/core/resources/sequence.yaml index 37b6a88f550..c87ad634670 100644 --- a/config/core/resources/sequence.yaml +++ b/config/core/resources/sequence.yaml @@ -23,9 +23,9 @@ spec: group: flows.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} schema: @@ -49,10 +49,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true - <<: *version name: v1 served: true diff --git a/config/core/resources/subscription.yaml b/config/core/resources/subscription.yaml index ee2cca18f53..a426d6ce886 100644 --- a/config/core/resources/subscription.yaml +++ b/config/core/resources/subscription.yaml @@ -22,9 +22,9 @@ spec: group: messaging.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + storage: true subresources: status: {} schema: @@ -45,10 +45,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true - <<: *version name: v1 served: true diff --git a/config/core/resources/trigger.yaml b/config/core/resources/trigger.yaml index 3968fe1b60e..f3514e53cd0 100644 --- a/config/core/resources/trigger.yaml +++ b/config/core/resources/trigger.yaml @@ -23,19 +23,11 @@ spec: group: eventing.knative.dev versions: - &version - name: v1alpha1 - served: false - storage: false + name: v1beta1 + served: true + 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: Ready type: string @@ -52,10 +44,6 @@ spec: - name: Age type: date jsonPath: .metadata.creationTimestamp - - << : *version - name: v1beta1 - served: true - storage: true schema: openAPIV3Schema: type: object